Author: jflesch
Date: 2006-07-22 23:50:41 +0000 (Sat, 22 Jul 2006)
New Revision: 9728

Added:
   trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java
Modified:
   trunk/apps/Thaw/src/thaw/core/Config.java
   trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
   trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
   trunk/apps/Thaw/src/thaw/i18n/thaw.properties
   trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
   trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
   trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
   trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
   trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
   trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
   trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
Log:
Split UI in two modes: Advanced and non-advanced

Modified: trunk/apps/Thaw/src/thaw/core/Config.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Config.java   2006-07-22 23:46:29 UTC (rev 
9727)
+++ trunk/apps/Thaw/src/thaw/core/Config.java   2006-07-22 23:50:41 UTC (rev 
9728)
@@ -299,6 +299,7 @@
                setValue("maxSimultaneousInsertions", "-1");
                setValue("maxUploadSpeed", "-1");
                setValue("thawId", "thaw_"+Integer.toString((new 
Random()).nextInt(1000)));
+               setValue("advancedMode", "false");
        }

 }

Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -30,15 +30,19 @@
        private JButton okButton;
        private JButton cancelButton;

+       private ThawConfigPanel thawConfigPanel;
        private NodeConfigPanel nodeConfigPanel;
        private PluginConfigPanel pluginConfigPanel;

        private Core core;

+       private boolean advancedMode = false;

        public ConfigWindow(Core core) {
                this.core = core;

+               advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();
+
                configWin = new 
JFrame(I18n.getMessage("thaw.config.windowName"));

                tabs = new JTabbedPane();
@@ -54,11 +58,10 @@

                nodeConfigPanel = new NodeConfigPanel(this, core);
                pluginConfigPanel = new PluginConfigPanel(this, core);
+               thawConfigPanel = new ThawConfigPanel(this, core);

-               tabs.add(I18n.getMessage("thaw.common.node"), 
nodeConfigPanel.getPanel());
-               tabs.add(I18n.getMessage("thaw.common.plugins"), 
pluginConfigPanel.getPanel());
+               addTabs();

-
                BorderLayout borderLayout = new BorderLayout();
                borderLayout.setVgap(20);
                borderLayout.setVgap(20);
@@ -82,6 +85,21 @@


        /**
+        * Remove them and re-add them.
+        */
+       private void addTabs() {
+               tabs.remove( thawConfigPanel.getPanel() );
+               tabs.remove( nodeConfigPanel.getPanel() );
+               tabs.remove( pluginConfigPanel.getPanel() );
+
+               tabs.add("Thaw", thawConfigPanel.getPanel());
+               tabs.add(I18n.getMessage("thaw.common.node"), 
nodeConfigPanel.getPanel());
+               if(advancedMode)
+                       tabs.add(I18n.getMessage("thaw.common.plugins"), 
pluginConfigPanel.getPanel());
+       }
+
+
+       /**
         * Make [dis]appear the config window.
         */
        public void setVisible(boolean v) {
@@ -129,7 +147,7 @@
         * Called when apply button is pressed.
         */
        public void actionPerformed(ActionEvent e) {
-               if(e.getSource() == okButton) {
+               if(e.getSource() == okButton && !core.canDisconnect()) {
                        int ret = 
JOptionPane.showOptionDialog((java.awt.Component)null,
                                                                       
I18n.getMessage("thaw.warning.isWritingSoApplyLater"),
                                                                       
I18n.getMessage("thaw.warning.title"),
@@ -152,11 +170,16 @@
                }

                if(e.getSource() == okButton) {
+                       advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();
+
                        /* should reinit the whole connection correctly */
                        core.getPluginManager().stopPlugins();
                        core.initNodeConnection();
                        core.getPluginManager().loadPlugins();
                        core.getPluginManager().runPlugins();
+
+                       /* reinit config win */
+                       addTabs();
                }
        }


Modified: trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java  2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/core/NodeConfigPanel.java  2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -66,6 +66,8 @@
                        nodeConfigPanel.add(paramFields[i]);
                }

+               
setVisibility(Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue());
+
                configWindow.addObserver(this);
        }

@@ -73,12 +75,22 @@
                return nodeConfigPanel;
        }

+       private void setVisibility(boolean advancedMode) {
+               for(int i= 2; i < paramNames.length;i++) {
+                       paramLabels[i].setVisible(advancedMode);
+                       paramFields[i].setVisible(advancedMode);
+               }
+
+       }
+

        public void update(Observable o, Object arg) {
                if(arg == core.getConfigWindow().getOkButton()) {
                        for(int i=0;i < paramNames.length;i++) {
                                core.getConfig().setValue(configNames[i], 
paramFields[i].getText());
                        }
+
+                       
setVisibility(Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue());
                }



Added: trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java  2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/core/ThawConfigPanel.java  2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -0,0 +1,64 @@
+package thaw.core;
+
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JCheckBox;
+
+import java.util.Observer;
+import java.util.Observable;
+
+import thaw.i18n.I18n;
+
+/**
+ * Creates and manages the panel containing all the things to configure 
related to Thaw and only Thaw.
+ */
+public class ThawConfigPanel implements Observer {
+       private Core core;
+       private JPanel thawConfigPanel = null;
+
+       private JCheckBox advancedModeBox = null;
+
+       private boolean advancedMode;
+
+       public ThawConfigPanel(ConfigWindow configWindow, Core core) {
+               this.core = core;
+
+               if(core.getConfig().getValue("advancedMode") == null)
+                       core.getConfig().setValue("advancedMode", "false");
+
+               advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();
+               
+
+               thawConfigPanel = new JPanel();
+               thawConfigPanel.setLayout(new GridLayout(15, 1));
+
+               advancedModeBox = new 
JCheckBox(I18n.getMessage("thaw.config.advancedMode"), advancedMode);
+
+               thawConfigPanel.add(advancedModeBox);
+
+               configWindow.addObserver(this);
+       }
+
+
+       public JPanel getPanel() {
+               return thawConfigPanel;
+       }
+
+
+       public void update(Observable o, Object arg) {
+               if(arg == core.getConfigWindow().getOkButton()) {
+                       advancedMode = advancedModeBox.isSelected();
+                       core.getConfig().setValue("advancedMode", 
Boolean.toString(advancedMode));
+               }
+
+               if(arg == core.getConfigWindow().getCancelButton()) {
+                       advancedModeBox.setSelected(advancedMode);
+               }
+       }
+
+}
+

Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties       2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties       2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -85,7 +85,9 @@

 thaw.config.maxUploadSpeed=Maximum upload speed in KB/s (-1 = unlimited)

+thaw.config.advancedMode=Advanced mode

+
 ## Plugins
 thaw.plugin.insert.fileToInsert=File to insert
 thaw.plugin.insert.filesToInsert=File(s) to insert

Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties    2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties    2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -85,6 +85,8 @@

 thaw.config.maxUploadSpeed=Vitesse maximum d'envoi en Ko/s (-1 = illimit?)

+thaw.config.advancedMode=Mode avanc?
+
 ##?Plugins
 thaw.plugin.insert.fileToInsert=Fichier ? ins?rer
 thaw.plugin.insert.filesToInsert=Fichier(s) ? ins?rer
@@ -111,7 +113,7 @@
 thaw.plugin.fetch.keyList=Liste de cl?s (une cl? par ligne)
 thaw.plugin.fetch.loadKeyListFromFile=Charger les cl?s d'un fichier ...
 thaw.plugin.fetch.destinationDirectory=R?pertoire de destination
-thaw.plugin.fetch.chooseDestination=Choisissez la destination ...
+thaw.plugin.fetch.chooseDestination=Choisir la destination ...
 thaw.plugin.fetch.pasteFromClipboard=Coller depuis le presse-papier

 thaw.plugin.console.console=Console

Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java  2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java  2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -32,7 +32,8 @@

                Logger.info(this, "Starting plugin \"InsertPlugin\" ...");

-               insertPanel = new InsertPanel(this);
+               insertPanel = new InsertPanel(this,
+                                             
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue());

                
core.getMainWindow().addTab(I18n.getMessage("thaw.common.insertion"), 
insertPanel.getPanel());


Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java  2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -34,6 +34,8 @@
        private long lastChange = 0;
        private boolean folded = false;

+       private boolean advancedMode = false;
+
        public QueueWatcher() {

        }
@@ -61,25 +63,31 @@
                if(queuePanels[1].getPanel() != null)
                        panel.add(queuePanels[1].getPanel());

+               advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();
+               
+               if(advancedMode) {
+                       mainPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, 
detailPanel.getPanel(), panel);
+                       
+                       if(core.getConfig().getValue("detailPanelFolded") == 
null
+                          || ((new 
Boolean(core.getConfig().getValue("detailPanelFolded"))).booleanValue()) == 
true) {
+                               folded = true;
+                               detailPanel.getPanel().setVisible(false);
+                               mainPanel.setDividerLocation(1);
+                       } else {
+                               folded = false;
+                               detailPanel.getPanel().setVisible(true);
+                               mainPanel.setDividerLocation(DIVIDER_LOCATION);
+                       }
+                       
+                       mainPanel.addPropertyChangeListener(this);
+                       mainPanel.setOneTouchExpandable(true);

-               mainPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, 
detailPanel.getPanel(), panel);
+                       
core.getMainWindow().addTab(I18n.getMessage("thaw.common.status"), mainPanel);
+               } else {

-               if(core.getConfig().getValue("detailPanelFolded") == null
-                  || ((new 
Boolean(core.getConfig().getValue("detailPanelFolded"))).booleanValue()) == 
true) {
-                       folded = true;
-                       detailPanel.getPanel().setVisible(false);
-                       mainPanel.setDividerLocation(1);
-               } else {
-                       folded = false;
-                       detailPanel.getPanel().setVisible(true);
-                       mainPanel.setDividerLocation(DIVIDER_LOCATION);
+                       
core.getMainWindow().addTab(I18n.getMessage("thaw.common.status"), panel);
                }
-
-               mainPanel.addPropertyChangeListener(this);
-               mainPanel.setOneTouchExpandable(true);
-
-               
core.getMainWindow().addTab(I18n.getMessage("thaw.common.status"), mainPanel);
-
+                       
                if(core.getQueueManager() != null)
                    core.getQueueManager().addObserver(this);
                else {
@@ -99,7 +107,10 @@

                core.getConfig().setValue("detailPanelFolded", ((new 
Boolean(folded)).toString()));

-               core.getMainWindow().removeTab(mainPanel);
+               if(advancedMode)
+                       core.getMainWindow().removeTab(mainPanel);
+               else
+                       core.getMainWindow().removeTab(panel);

                return true;
        }

Modified: trunk/apps/Thaw/src/thaw/plugins/StatusBar.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/StatusBar.java     2006-07-22 23:46:29 UTC 
(rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/StatusBar.java     2006-07-22 23:50:41 UTC 
(rev 9728)
@@ -15,9 +15,12 @@
        private boolean running = true;
        private Thread refresher;

+       private boolean advancedMode = false;

        public boolean run(Core core) {
                this.core = core;
+
+               advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();

                running = true;
                refresher = new Thread(this);
@@ -93,19 +96,26 @@

                total = finished + failed + running + pending;

-               core.getMainWindow().setStatus("Thaw "+Main.VERSION
-                                              + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.globalProgression") + " "
-                                              + Integer.toString(progressDone) 
+ "/" + Integer.toString(progressTotal)
-                                              + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.finished")+ " "
-                                              + Integer.toString(finished) + 
"/" + Integer.toString(total)
-                                              + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.failed") + " "
-                                              + Integer.toString(failed) + "/" 
+ Integer.toString(total)
-                                              + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.running") + " "
-                                              + Integer.toString(running) + 
"/" + Integer.toString(total)
-                                              + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.pending") + " "
-                                              + Integer.toString(pending) + 
"/" + Integer.toString(total)
-                                              );
+               String status = "Thaw "+Main.VERSION;

+               if(advancedMode) {
+                       status = status
+                               + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.globalProgression") + " "
+                               + Integer.toString(progressDone) + "/" + 
Integer.toString(progressTotal);
+               }
+
+               status = status
+                       + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.finished")+ " "
+                       + Integer.toString(finished) + "/" + 
Integer.toString(total)
+                       + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.failed") + " "
+                       + Integer.toString(failed) + "/" + 
Integer.toString(total)
+                       + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.running") + " "
+                       + Integer.toString(running) + "/" + 
Integer.toString(total)
+                       + SEPARATOR + 
I18n.getMessage("thaw.plugin.statistics.pending") + " "
+                       + Integer.toString(pending) + "/" + 
Integer.toString(total);
+                       
+               core.getMainWindow().setStatus(status);
+
        }



Modified: trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java        
2006-07-22 23:46:29 UTC (rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/fetchPlugin/FetchPanel.java        
2006-07-22 23:50:41 UTC (rev 9728)
@@ -63,10 +63,14 @@
        private Core core;
        private FetchPlugin fetchPlugin;

+       private boolean advancedMode;
+
        public FetchPanel(Core core, FetchPlugin fetchPlugin) {
                this.core = core;
                this.fetchPlugin = fetchPlugin;

+               advancedMode = 
Boolean.valueOf(core.getConfig().getValue("advancedMode")).booleanValue();
+
                mainPanel = new JPanel();
                mainPanel.setLayout(new BorderLayout(20, 20));

@@ -103,10 +107,17 @@
                filePanel.add(buttonPanel, BorderLayout.SOUTH);


+               /* below panel */
+
+               
                belowPanel = new JPanel();
-               belowPanel.setLayout(new GridLayout(2, 2, 10, 10));
+               if(advancedMode)
+                       belowPanel.setLayout(new GridLayout(2, 2, 10, 10));
+               else
+                       belowPanel.setLayout(new GridLayout(1, 2, 10, 10));


+
                /* PRIORITY */
                priorityPanel = new JPanel();
                priorityPanel.setLayout(new GridLayout(2, 1, 5, 5));
@@ -161,11 +172,17 @@
                dstChoosePanel.add(destinationField);
                dstChoosePanel.add(destinationButton);

-               belowPanel.add(priorityPanel);
-               //belowPanel.add(persistencePanel);
-               belowPanel.add(queuePanel);
+               if(advancedMode) {
+                       belowPanel.add(priorityPanel);
+                       //belowPanel.add(persistencePanel);
+                       belowPanel.add(queuePanel);
+               }
+
                belowPanel.add(dstChoosePanel);

+               if(!advancedMode) {
+                       belowPanel.add(new JPanel());
+               }

                centeredPart.add(filePanel, BorderLayout.CENTER);
                centeredPart.add(belowPanel, BorderLayout.SOUTH);

Modified: trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java      
2006-07-22 23:46:29 UTC (rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/insertPlugin/InsertPanel.java      
2006-07-22 23:50:41 UTC (rev 9728)
@@ -26,6 +26,8 @@
 import thaw.plugins.InsertPlugin;
 import thaw.fcp.*;

+
+
 public class InsertPanel implements ActionListener, ItemListener, Observer {
        private final static int MIN_PRIORITY = 6;

@@ -35,7 +37,6 @@

        private JPanel subPanel; /* because we won't use the whole space */

-
        private JLabel browseLabel;
        private JTextField selectedFiles; /* TODO: it was planned to support 
directory insertion */
        private JButton browseButton;
@@ -70,18 +71,23 @@
        private int keyType;
        private FCPClientPut lastInsert = null;

-       public InsertPanel(InsertPlugin insertPlugin) {
+       private boolean advancedMode = false;
+
+       public InsertPanel(InsertPlugin insertPlugin, boolean advancedMode) {
                this.insertPlugin = insertPlugin;

+               this.advancedMode = advancedMode;
+
                globalPanel = new JPanel();

                mainPanel = new JPanel();
                mainPanel.setLayout(new BorderLayout(10, 10));

-               subPanel = new JPanel();
+               if(advancedMode) {
+                       subPanel = new JPanel();
+                       subPanel.setLayout(new GridLayout(3,2, 20, 20));
+               }

-               subPanel.setLayout(new GridLayout(3,2, 20, 20));
-

                // FILE SELECTION

@@ -96,7 +102,10 @@
                browseButton.addActionListener(this);
                subSubPanel.add(browseButton);

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);
+               else
+                       mainPanel.add(subSubPanel, BorderLayout.CENTER);


                // KEY TYPE SELECTION
@@ -118,7 +127,8 @@
                        subSubPanel.add(keyRadioButtons[i]);
                }

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);


                /* GLOBAL */
@@ -137,7 +147,8 @@
                
globalSelecter.setSelectedItem(I18n.getMessage("thaw.common.true"));
                subSubPanel.add(globalSelecter);

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);



@@ -159,7 +170,8 @@
                nameField.setEditable(true);
                subSubPanel.add(nameField);

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);


                setRevAndNameVisible(false);
@@ -186,7 +198,8 @@
                
prioritySelecter.setSelectedItem(I18n.getMessage("thaw.plugin.priority.p3"));
                subSubPanel.add(prioritySelecter);

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);



@@ -207,13 +220,14 @@
                privateKeyField.setEditable(true);
                subSubPanel.add(privateKeyField);

-               subPanel.add(subSubPanel);
+               if(advancedMode)
+                       subPanel.add(subSubPanel);

                setKeysVisible(false);

+               if(advancedMode)
+                       mainPanel.add(subPanel, BorderLayout.CENTER);

-               mainPanel.add(subPanel, BorderLayout.CENTER);
-
                letsGoButton = new 
JButton(I18n.getMessage("thaw.plugin.insert.insertAction"));
                letsGoButton.setPreferredSize(new Dimension(200, 40));

@@ -221,7 +235,10 @@

                mainPanel.add(letsGoButton, BorderLayout.SOUTH);

-               mainPanel.setSize(400, 400);
+               if(advancedMode)
+                       mainPanel.setSize(400, 400);
+               else
+                       mainPanel.setSize(150, 250);

                globalPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 10, 
10));


Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java      
2006-07-22 23:46:29 UTC (rev 9727)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/DetailPanel.java      
2006-07-22 23:50:41 UTC (rev 9728)
@@ -36,7 +36,6 @@
        private JTextField key        = new JTextField();
        private JTextField path       = new JTextField();
        private JTextField priority   = new JTextField();
-       private JTextField attempt    = new JTextField();
        private JTextField identifier = new JTextField();
        private JTextField globalQueue= new JTextField();

@@ -60,7 +59,6 @@
                                        I18n.getMessage("thaw.common.key"),
                                        
I18n.getMessage("thaw.common.localPath"),
                                        I18n.getMessage("thaw.common.priority"),
-                                       I18n.getMessage("thaw.common.try")+" #",
                                        
I18n.getMessage("thaw.common.identifier"),
                                        
I18n.getMessage("thaw.common.globalQueue")
                };
@@ -92,9 +90,8 @@
                                case(5): field = key; 
key.setEditable(false);break;
                                case(6): field = path; path.setEditable(false); 
break;
                                case(7): field = priority; 
priority.setEditable(false); break;
-                               case(8): field = attempt; 
attempt.setEditable(false); break;
-                               case(9): field = identifier; 
identifier.setEditable(false); break;
-                               case(10): field = globalQueue; 
globalQueue.setEditable(false); break;
+                               case(8): field = identifier; 
identifier.setEditable(false); break;
+                               case(9): field = globalQueue; 
globalQueue.setEditable(false); break;
                                default: Logger.error(this, "Gouli goula ? ... 
is going to crash :p"); break;
                                }

@@ -163,7 +160,6 @@
                                identifier.setText(query.getIdentifier());
                        else
                                identifier.setText("N/A");
-                       attempt.setText(Integer.toString(query.getAttempt()));

                        if(query.getThawPriority() != -1)
                                
priority.setText(Integer.toString(query.getThawPriority()));
@@ -177,7 +173,6 @@
                        progress.setString("");
                        status.setText("");
                        identifier.setText("");
-                       attempt.setText("");
                        size.setText("");
                        priority.setText("");
                        key.setText("");


Reply via email to