Author: chatellier Date: 2009-06-09 11:52:58 +0000 (Tue, 09 Jun 2009) New Revision: 2350 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java Log: Add some comment and various fix Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-09 11:52:58 UTC (rev 2350) @@ -31,7 +31,7 @@ // (depends on sensitivity can't be done on constructor) installChangeListener(gearTab); - getVerifier().addCurrentPanel(selectivityUI, gearTabUI); + getVerifier().addCurrentPanel(gearTabUI, selectivityUI); } @Override @@ -40,8 +40,8 @@ gearTabUI.setActionButtons(); } ]]></script> - <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> + <JPanel layout='{new BorderLayout()}'> + <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> <tab title='{_("isisfish.gear.title")}'> <GearTabUI id="gearTabUI" constructorParams='this'/> </tab> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-06-09 11:52:58 UTC (rev 2350) @@ -64,8 +64,11 @@ ui.refresh(); // method only called for tabbed UI - // oterwize save.cancel buttons are active in last + // otherwise save.cancel buttons are active in last // refreshed ui + if (log.isDebugEnabled()) { + log.debug("Activating action buttons on " + ui); + } ui.setActionButtons(); cacheSelectedIndex = pane.getSelectedIndex(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-09 11:52:58 UTC (rev 2350) @@ -86,10 +86,14 @@ protected void setTableTargetSpeciesModel() { if (getMetierSeasonInfo() != null) { java.util.List<TargetSpecies> targetSpecies = new ArrayList<TargetSpecies>(); + // move collection to list + // and add all entity to verifier for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { getVerifier().addCurrentEntity(oneTargetSpecies); targetSpecies.add(oneTargetSpecies); } + + // set table model MetierSeasonInfoTargetSpeciesModel model = new MetierSeasonInfoTargetSpeciesModel(targetSpecies); tableTargetSpecies.setModel(model); tableTargetSpecies.setDefaultRenderer(Equation.class, model); @@ -114,6 +118,7 @@ protected void remove() { if (isMetierSeasonSelected()) { + // TODO change delete selected truc from model Object[] targetSpecies = getMetierSeasonInfo().getSpeciesTargetSpecies().toArray(); Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-09 11:52:58 UTC (rev 2350) @@ -85,7 +85,7 @@ // TODO what is this code for ??? MatrixND naturalDeathRateMatrix2 = naturalDeathRateMatrix.getSubMatrixOnSemantic(0, getPopulationGroup()); - fieldPopulationGroupNaturalDeathRate.setMatrix(naturalDeathRateMatrix2); + fieldPopulationGroupNaturalDeathRate.setMatrix(naturalDeathRateMatrix2.copy()); } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-09 11:52:58 UTC (rev 2350) @@ -49,7 +49,7 @@ ]]> </script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="populationTab" name="Populations" constraints='BorderLayout.CENTER'> + <JTabbedPane id="populationTab" constraints='BorderLayout.CENTER'> <tab title='{_("isisfish.populationBasics.title")}'> <PopulationBasicsUI id='populationBasicsUI' constructorParams='this'/> </tab> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-06-09 09:08:10 UTC (rev 2349) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-06-09 11:52:58 UTC (rev 2350) @@ -28,15 +28,12 @@ import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JTable; -import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.TargetSpecies; @@ -50,10 +47,10 @@ * <li>target species primaryCatch</li> * * @author chatellier - * @version $Revision: 1.0 $ + * @version $Revision$ * - * Last update : $Date: 8 juin 2009 $ - * By : $Author: chatellier $ + * Last update : $Date$ + * By : $Author$ */ public class MetierSeasonInfoTargetSpeciesModel extends AbstractTableModel implements TableCellRenderer { Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision