Author: chatellier Date: 2009-04-20 08:49:22 +0000 (Mon, 20 Apr 2009) New Revision: 2122 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/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Log: Fix unused import, undocumented commented code... 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-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,47 +15,30 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> - - - <!-- - + Gear - +--> + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +// constructor code getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); + +// refresh public void refresh() { - if (isSens()){ + if (isSens()) { gearTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { gearTab.addChangeListener(new InputTabbedPaneListener()); } - getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); + getVerifier().addCurrentPanel(selectivityUI, gearTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> - <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,21 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + *##%*/ --> -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> - <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> @@ -45,8 +31,6 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -106,9 +90,10 @@ } return result; } -protected void useEquationChanged(){ - if (getPopInfo() != null) +protected void useEquationChanged() { + if (getPopInfo() != null) { getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected()); + } if (fieldUseEquationMigration.isSelected()){ ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation"); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,20 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> @@ -39,29 +25,17 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> - <script> - <![CDATA[ - + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; import javax.swing.table.DefaultTableModel; import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.entities.Equation; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierImpl; +// TODO why it's commented ? to remove ? addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -98,8 +72,9 @@ public void mouseExited(MouseEvent e) { } }); -public void refresh(){ - if (getBean() != null){ + +public void refresh() { + if (getBean() != null) { setSelectivityTableModel(); fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); } @@ -107,16 +82,17 @@ remove.setEnabled(false); } + protected void setSelectivityTableModel() { DefaultTableModel model = new DefaultTableModel() { @Override - public boolean isCellEditable(int row, int column) { - boolean result = false; - if (column > 0) { - result =true; - } - return result; + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0) { + result =true; } + return result; + } }; Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); java.util.List<Population> populations = new ArrayList<Population>(); @@ -134,15 +110,18 @@ EquationTableEditor cellEditor = new EquationTableEditor(); selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); } + protected void add() { getAction().addSelectivity((Population)getPopulation(), selectivityEquation.getEditor().getText(), getBean()); setSelectivityTableModel(); } + protected void remove() { getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0))); setSelectivityTableModel(); } -protected DefaultComboBoxModel getSelectivityPopulationModel(){ + +protected DefaultComboBoxModel getSelectivityPopulationModel() { java.util.List<Species> species = getRegion().getSpecies(); DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); if (species != null) { @@ -157,13 +136,13 @@ } return selectivityPopulationModel; } -protected void selectivityChanged(){ + +protected void selectivityChanged() { setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); add.setEnabled(isSelectivityPopulationSelected()); } - ]]> - </script> + ]]></script> <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='1.0'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 07:54:12 UTC (rev 2121) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-04-20 08:49:22 UTC (rev 2122) @@ -1,7 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,39 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> + *##%*/ --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/> - <script> - <![CDATA[ - -import java.util.logging.Level; -import java.util.logging.Logger; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierImpl; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; + <script><![CDATA[ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; -import fr.ifremer.isisfish.entities.Species; +// TODO why it's commented ? to remove ? addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -61,17 +38,17 @@ } } }); + +// refresh public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); - getVerifier().addCurrentPanel(editor); } - ]]> - </script> + ]]></script> <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='1.0'>