[Tutti-commits] r1168 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/frequency species species/frequency

10 Sep 2013

Author: tchemit
Date: 2013-09-10 18:33:34 +0200 (Tue, 10 Sep 2013)
New Revision: 1168

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1168

Log:
fixes #3213: [MENSURATION] manque information sur l'esp?\195?\168ce en cours de saisie

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
===================================================================

--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -25,9 +25,16 @@
  */
 
 import com.google.common.collect.Sets;
+import fr.ifremer.tutti.persistence.entities.data.SampleCategory;
 import fr.ifremer.tutti.persistence.entities.referential.Species;
 import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI;
 import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI;
 import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler;
 import fr.ifremer.tutti.ui.swing.util.TabHandler;
 import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
@@ -280,6 +287,32 @@
         );
     }
 
+    public void editSpeciesFrequencies(SpeciesBatchRowModel editRow,
+                                       SpeciesFrequencyCellComponent.FrequencyCellEditor editor) {
+
+        SpeciesFrequencyUI frequencyEditor = ui.getSpeciesTabFrequencyEditor();
+
+        frequencyEditor.getHandler().editBatch(editRow, editor);
+
+        // open frequency editor
+        setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+
+        // update title
+        StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle());
+
+        title.append(" - ").append(decorate(editRow.getSpecies()));
+
+        for (SampleCategory<?> sampleCategory : editRow) {
+            if (sampleCategory.getCategoryValue() != null) {
+                title.append(" - ");
+                title.append(decorate(sampleCategory.getCategoryValue()));
+            }
+        }
+
+        title.append(" - ").append(_("tutti.editSpeciesFrequencies.title"));
+        ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString());
+    }
+
     public void setSpeciesSelectedCard(String card) {
         JPanel panel = ui.getSpeciesTabPanel();
         CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout();
@@ -309,8 +342,8 @@
 
                 } else if (EDIT_FREQUENCY_CARD.equals(card)) {
                     tuttiUi = ui.getSpeciesTabFrequencyEditor();
-                    titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel();
-                    title = n_("tutti.editSpeciesFrequencies.title");
+//                    titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel();
+//                    title = _("tutti.editSpeciesFrequencies.title");
                 }
 
                 if (tuttiUi != null) {
@@ -323,6 +356,32 @@
         }
     }
 
+    public void editBenthosFrequencies(BenthosBatchRowModel editRow,
+                                       BenthosFrequencyCellComponent.FrequencyCellEditor editor) {
+
+        BenthosFrequencyUI frequencyEditor = ui.getBenthosTabFrequencyEditor();
+
+        frequencyEditor.getHandler().editBatch(editRow, editor);
+
+        // open frequency editor
+        setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+
+        // update title
+        StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle());
+
+        title.append(" - ").append(decorate(editRow.getSpecies()));
+
+        for (SampleCategory<?> sampleCategory : editRow) {
+            if (sampleCategory.getCategoryValue() != null) {
+                title.append(" - ");
+                title.append(decorate(sampleCategory.getCategoryValue()));
+            }
+        }
+
+        title.append(" - ").append(_("tutti.editBenthosFrequencies.title"));
+        ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString());
+    }
+
     public void setBenthosSelectedCard(String card) {
         JPanel panel = ui.getBenthosTabPanel();
         CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout();
@@ -352,8 +411,8 @@
 
                 } else if (EDIT_FREQUENCY_CARD.equals(card)) {
                     tuttiUi = ui.getBenthosTabFrequencyEditor();
-                    titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel();
-                    title = n_("tutti.editBenthosFrequencies.title");
+//                    titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel();
+//                    title = n_("tutti.editBenthosFrequencies.title");
                 }
 
                 if (tuttiUi != null) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -32,7 +32,7 @@
  * @author tchemit <chemit@codelutin.com>
  * @since 2.4
  */
-public interface SampleCategoryAble<E extends SampleCategoryAble> {
+public interface SampleCategoryAble<E extends SampleCategoryAble> extends Iterable<SampleCategory<?>> {
 
     Integer getCategoryIndex(Integer id);
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -47,8 +47,10 @@
 import org.nuiton.util.beans.BinderFactory;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -289,6 +291,11 @@
         return result;
     }
 
+    @Override
+    public Iterator<SampleCategory<?>> iterator() {
+        return Arrays.asList(categories).iterator();
+    }
+
     //------------------------------------------------------------------------//
     //-- Species category                                                   --//
     //------------------------------------------------------------------------//

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -100,8 +100,8 @@
         }
 
         // collect of rows to remove from model
-        Set<BenthosBatchRowModel> rowToRemove =
-                Sets.newHashSet(selectedBatch);
+        Set<BenthosBatchRowModel> rowToRemove = Sets.newHashSet();
+        rowToRemove.add(selectedBatch);
 
         handler.collectChildren(selectedBatch, rowToRemove);
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -27,7 +27,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI;
@@ -155,13 +154,17 @@
                 log.debug("Will edit frequencies for row: " + rowIndex);
             }
 
-            EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
-            BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor();
+            EditCatchesUI parent =
+                    SwingUtil.getParentContainer(ui, EditCatchesUI.class);
 
-            frequencyEditor.getHandler().editBatch(editRow, this);
+            parent.getHandler().editBenthosFrequencies(editRow, this);
 
-            // open frequency editor
-            parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+//            BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor();
+//
+//            frequencyEditor.getHandler().editBatch(editRow, this);
+//
+//            // open frequency editor
+//            parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
         }
 
         public void validateEdition(BenthosFrequencyUIModel frequencyModel) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css	2013-09-10 16:33:34 UTC (rev 1168)
@@ -37,26 +37,6 @@
   _help: {"tutti.editBenthosFrequencies.help"};
 }
 
-#batchSpeciesLabel {
-  text: "tutti.editBenthosFrequencies.batchSpecies";
-}
-
-#batchSpecies {
-  text: { handler.decorateSpecies(model.getBatch()) };
-  editable: false;
-  enabled: false;
-}
-
-#batchCategoryLabel {
-  text: "tutti.editBenthosFrequencies.batchCategory";
-}
-
-#batchCategory {
-  text: { handler.decorateCategory(model.getBatch()) };
-  editable: false;
-  enabled: false;
-}
-
 #stepLabel {
   text: "tutti.editBenthosFrequencies.field.step";
   toolTipText: "tutti.editBenthosFrequencies.field.step.tip";

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx	2013-09-10 16:33:34 UTC (rev 1168)
@@ -91,31 +91,6 @@
   <JPanel id='configurationPanel' layout='{new BorderLayout()}'
           constraints='BorderLayout.NORTH'>
 
-    <Table constraints='BorderLayout.NORTH' fill='both'>
-      <row>
-        <cell anchor='west'>
-          <JLabel id='batchSpeciesLabel'/>
-        </cell>
-        <cell weightx='1'>
-          <JTextField id='batchSpecies'/>
-        </cell>
-      </row>
-      <row>
-        <cell anchor='west'>
-          <JLabel id='batchCategoryLabel'/>
-        </cell>
-        <cell weightx='1'>
-          <JTextField id='batchCategory'/>
-        </cell>
-      </row>
-      <row>
-        <cell columns='2'>
-          <JSeparator/>
-        </cell>
-      </row>
-    </Table>
-
-    <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
       <VBox id='modePanel' constraints='BorderLayout.WEST'
             verticalAlignment='{SwingConstants.CENTER}'>
         <JRadioButton id='simpleModeButton'
@@ -185,8 +160,8 @@
           <JLabel id='simpleCountingModeLabel'
                   constraints='BorderLayout.CENTER'/>
         </JPanel>
-      </JPanel>
     </JPanel>
+
     <Table id="lengthstepSettingsBlock" fill='both'
            constraints='BorderLayout.SOUTH'>
       <row>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -639,15 +639,6 @@
         closeUI(ui);
     }
 
-    public String decorateSpecies(BenthosBatchRowModel object) {
-        return object == null ? "" : decorate(object.getSpecies());
-    }
-
-    public String decorateCategory(BenthosBatchRowModel object) {
-        return object == null ? "" :
-               decorate(object.getFinestCategory().getCategoryDef()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
-    }
-
     //------------------------------------------------------------------------//
     //-- Internal methods                                                   --//
     //------------------------------------------------------------------------//

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -100,8 +100,8 @@
         }
 
         // collect of rows to remove from model
-        Set<SpeciesBatchRowModel> rowToRemove =
-                Sets.newHashSet(selectedBatch);
+        Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet();
+        rowToRemove.add(selectedBatch);
 
         handler.collectChildren(selectedBatch, rowToRemove);
 

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -47,8 +47,10 @@
 import org.nuiton.util.beans.BinderFactory;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -446,7 +448,7 @@
     }
 
     @Override
-    public SpeciesBatchRowModel  getFirstAncestor(SampleCategory<?> entrySampleCategory) {
+    public SpeciesBatchRowModel getFirstAncestor(SampleCategory<?> entrySampleCategory) {
         SpeciesBatchRowModel result = this;
         if (getParentBatch() != null) {
             SpeciesBatchRowModel parentBatch = getParentBatch();
@@ -459,6 +461,11 @@
         return result;
     }
 
+    @Override
+    public Iterator<SampleCategory<?>> iterator() {
+        return Arrays.asList(categories).iterator();
+    }
+
     //------------------------------------------------------------------------//
     //-- AttachmentModelAware                                               --//
     //------------------------------------------------------------------------//

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -27,7 +27,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI;
@@ -155,13 +154,17 @@
                 log.debug("Will edit frequencies for row: " + rowIndex);
             }
 
-            EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
-            SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor();
+            EditCatchesUI parent =
+                    SwingUtil.getParentContainer(ui, EditCatchesUI.class);
 
-            frequencyEditor.getHandler().editBatch(editRow, this);
+            parent.getHandler().editSpeciesFrequencies(editRow, this);
 
-            // open frequency editor
-            parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+//            SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor();
+//
+//            frequencyEditor.getHandler().editBatch(editRow, this);
+//
+//            // open frequency editor
+//            parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
         }
 
         public void validateEdition(SpeciesFrequencyUIModel frequencyModel) {

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css	2013-09-10 16:33:34 UTC (rev 1168)
@@ -37,26 +37,6 @@
   _help: {"tutti.editSpeciesFrequencies.help"};
 }
 
-#batchSpeciesLabel {
-  text: "tutti.editSpeciesFrequencies.batchSpecies";
-}
-
-#batchSpecies {
-  text: { handler.decorateSpecies(model.getBatch()) };
-  editable: false;
-  enabled: false;
-}
-
-#batchCategoryLabel {
-  text: "tutti.editSpeciesFrequencies.batchCategory";
-}
-
-#batchCategory {
-  text: { handler.decorateCategory(model.getBatch()) };
-  editable: false;
-  enabled: false;
-}
-
 #stepLabel {
   text: "tutti.editSpeciesFrequencies.field.step";
   toolTipText: "tutti.editSpeciesFrequencies.field.step.tip";

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx	2013-09-10 16:33:34 UTC (rev 1168)
@@ -91,31 +91,6 @@
   <JPanel id='configurationPanel' layout='{new BorderLayout()}'
           constraints='BorderLayout.NORTH'>
 
-    <Table constraints='BorderLayout.NORTH' fill='both'>
-      <row>
-        <cell anchor='west'>
-          <JLabel id='batchSpeciesLabel'/>
-        </cell>
-        <cell weightx='1'>
-          <JTextField id='batchSpecies'/>
-        </cell>
-      </row>
-      <row>
-        <cell anchor='west'>
-          <JLabel id='batchCategoryLabel'/>
-        </cell>
-        <cell weightx='1'>
-          <JTextField id='batchCategory'/>
-        </cell>
-      </row>
-      <row>
-        <cell columns='2'>
-          <JSeparator/>
-        </cell>
-      </row>
-    </Table>
-
-    <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
       <VBox id='modePanel' constraints='BorderLayout.WEST'
             verticalAlignment='{SwingConstants.CENTER}'>
         <JRadioButton id='simpleModeButton'
@@ -185,8 +160,8 @@
           <JLabel id='simpleCountingModeLabel'
                   constraints='BorderLayout.CENTER'/>
         </JPanel>
-      </JPanel>
     </JPanel>
+
     <Table id="lengthstepSettingsBlock" fill='both'
            constraints='BorderLayout.SOUTH'>
       <row>

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java	2013-08-23 15:51:18 UTC (rev 1167)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java	2013-09-10 16:33:34 UTC (rev 1168)
@@ -638,15 +638,6 @@
         closeUI(ui);
     }
 
-    public String decorateSpecies(SpeciesBatchRowModel object) {
-        return object == null ? "" : decorate(object.getSpecies());
-    }
-
-    public String decorateCategory(SpeciesBatchRowModel object) {
-        return object == null ? "" :
-               decorate(object.getFinestCategory().getCategoryDef()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
-    }
-
     //------------------------------------------------------------------------//
     //-- Internal methods                                                   --//
     //------------------------------------------------------------------------//

    

[Tutti-commits] r1168 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/frequency species species/frequency

tchemit＠users.forge.codelutin.com