- Isis-fish-commits - mailman.cloud.codelutin.com

r1989 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/simulator/sensitivity java/fr/ifremer/isisfish/ui/sensitivity resources/i18n
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 17:22:24 +0000 (Tue, 17 Mar 2009) New Revision: 1989 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Input factor cardinality Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-17 17:22:24 UTC (rev 1989) @@ -207,4 +207,9 @@ return f; } + + @Override + public String toString(){ + return name; + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-17 17:22:24 UTC (rev 1989) @@ -40,6 +40,9 @@ import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; public ComboBoxModel getSensitivityModel(){ java.util.List<Item> items = new ArrayList<Item>(); @@ -101,18 +104,142 @@ } } +public void setFactorCardinalityModel(){ + DefaultTableModel model = new DefaultTableModel(){ + @Override + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0){ + result =true; + } + return result; + } + }; + java.util.List<Factor<? extends Serializable>> factors = getSimulAction().getFactors(); + + java.util.List<Factor<? extends Serializable>> factorsContinue = new ArrayList<Factor<? extends Serializable>>(); + java.util.List<String> incs = new ArrayList<String>(); + for (Factor f : factors){ + Domain domain = f.getDomain(); + if (ContinuousDomain.class.isInstance(domain)){ + ContinuousDomain continuousDomain = (ContinuousDomain)domain; + factorsContinue.add(f); + incs.add(continuousDomain.getCardinality() + ""); + } + } + model.addColumn("Factor", factorsContinue.toArray()); + model.addColumn("Cardinality", incs.toArray()); + + factorCardinality.setModel(model); + factorCardinality.getModel().addTableModelListener(new TableModelListener() { + @Override + public void tableChanged(TableModelEvent e) { + int row = e.getFirstRow(); + TableModel model = (TableModel)e.getSource(); + Factor f = (Factor) model.getValueAt(row, 0); + ((ContinuousDomain)f.getDomain()).setCardinality(Integer.parseInt((String)model.getValueAt(row, 1))); + } + }); +} +protected DefaultComboBoxModel getExportModel(){ + DefaultComboBoxModel model = new DefaultComboBoxModel(); + return model; +} +protected void exportListSelected(){ +} +protected void add(){ +} +protected void remove(){ +} +protected void clear(){ +} ]]> </script> <row> - <cell columns="2" fill="horizontal" weightx="1.0"> + <cell fill="horizontal"> + <JLabel text="isisfish.sensitivity.select"/> + </cell> + <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSensitivitySelect" model='{getSensitivityModel()}' onActionPerformed='sensChanged()'/> </cell> </row> <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> <JScrollPane> <JTable id="simulSensitivityParam" rowHeight='24'/> </JScrollPane> </cell> </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> + <JScrollPane> + <JTable id="factorCardinality" rowHeight='24'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1" weighty="0.5"> + <Table> + <row> + <cell fill="both" weightx="1" weighty="1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.sensitivity.export"/> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JComboBox id="export" model='{getExportModel()}'/> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="exportList" selectionMode="0" onMouseClicked='exportListSelected()'/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weighty="1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text=" " minimumSize='{new Dimension(2,15)}' preferredSize='{new Dimension(2,15)}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="remove" text="isisfish.common.remove" enabled="false" onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="clear" text="isisfish.common.clear" enabled="false" onActionPerformed='clear()'/> + </cell> + </row> + <row> + <cell fill='both' weighty="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1" weighty="0.3"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="exportParams" rowHeight='24'/> + </JScrollPane> + </cell> + </row> </Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-17 17:22:24 UTC (rev 1989) @@ -152,6 +152,7 @@ FactorTreeModel model = new FactorTreeModel(root); factors.setModel(model); factors.setCellRenderer(new FactorTreeCellRenderer()); + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFactorCardinalityModel(); } ]]> </script> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-17 17:22:24 UTC (rev 1989) @@ -858,8 +858,10 @@ isisfish.sensWizardPanels.validate=Validate isisfish.sensWizardPanels.values=Values isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.export=Export isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results +isisfish.sensitivity.select=Method isisfish.sensitivity.title=Factors input isisfish.sensitivityChooser.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-17 17:22:24 UTC (rev 1989) @@ -858,8 +858,10 @@ isisfish.sensWizardPanels.validate=Valider isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.export=Export isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats +isisfish.sensitivity.select=M\u00E9thode isisfish.sensitivity.title=S\u00E9lection des facteurs isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH

1 0

r1988 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: chatellier Date: 2009-03-17 16:35:51 +0000 (Tue, 17 Mar 2009) New Revision: 1988 Modified: isis-fish/trunk/pom.xml Log: Use 0.14-SNAPSHOT for SDoc background color on nimbus Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-17 16:18:50 UTC (rev 1987) +++ isis-fish/trunk/pom.xml 2009-03-17 16:35:51 UTC (rev 1988) @@ -351,7 +351,7 @@ <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3</lutinutil.version> <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.13</lutinwidget.version> + <lutinwidget.version>0.14-SNAPSHOT</lutinwidget.version> <generator.version>0.64</generator.version> <lutinj2r.version>0.2</lutinj2r.version> <jrst.version>0.8.4</jrst.version>

1 0

r1987 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 16:18:50 +0000 (Tue, 17 Mar 2009) New Revision: 1987 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Bug PopulationGroup fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-17 15:54:53 UTC (rev 1986) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-17 16:18:50 UTC (rev 1987) @@ -296,6 +296,10 @@ topiaChanged(); } }); + TopiaEntity entity = getEntity(currentEntity.getClass()); + if (entity != null){ + currentEntities.remove(entity); + } this.currentEntities.add(currentEntity); setPanelsActifs(); } 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-03-17 15:54:53 UTC (rev 1986) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-17 16:18:50 UTC (rev 1987) @@ -117,7 +117,7 @@ <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -125,7 +125,7 @@ <JLabel text="isisfish.populationGroup.price" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Price"'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </cell> </row> <row>

1 0

r1986 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity resources
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 15:54:53 +0000 (Tue, 17 Mar 2009) New Revision: 1986 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 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/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/resources/sensitivity.properties Log: Factor of Sensitivity is done 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-03-17 15:41:44 UTC (rev 1985) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-17 15:54:53 UTC (rev 1986) @@ -57,7 +57,7 @@ <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.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/></tab> + <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Added: 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 (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-03-17 15:54:53 UTC (rev 1986) @@ -0,0 +1,215 @@ + +<fr.ifremer.isisfish.ui.input.InputContentUI> + +  + <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/> + + <fr.ifremer.isisfish.entities.PopulationImpl id='population' javaBean='null'/> + + <Boolean id='selectivityPopulationSelected' javaBean='false'/> + + <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; + +addPropertyChangeListener("bean", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + // remove previous binding on getBean() + //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } + if (evt.getNewValue() != null) { + // add binding on getBean() + //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } + } +}); + +selectivityTable.addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(selectivityTable.getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); +public void refresh(){ + if (getBean() != null){ + setSelectivityTableModel(); + fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); + } + getVerifier().addCurrentPanel(selectivityEquation); + + 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; + } + }; + Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); + java.util.List<Population> populations = new ArrayList<Population>(); + java.util.List<Equation> equations = new ArrayList<Equation>(); + if (selectivity != null){ + for (Selectivity s : selectivity){ + populations.add(s.getPopulation()); + equations.add(s.getEquation()); + } + } + model.addColumn("Population", populations.toArray()); + model.addColumn("Equation", equations.toArray()); + + selectivityTable.setModel(model); + 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(){ + java.util.List<Species> species = getRegion().getSpecies(); + DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); + if (species != null){ + selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); + for (Species s : species){ + if (s.getPopulation() != null){ + for (Population p : s.getPopulation()){ + selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); + } + } + } + } + return selectivityPopulationModel; +} +protected void selectivityChanged(){ + setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); + setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); + add.setEnabled(isSelectivityPopulationSelected()); +} + ]]> + </script> + <Table id='body'> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='selectivityEquation' constructorParams='this' + lblText='{_("isisfish.selectivity.equation")}' + bean='{getBean()}' nameEquation='Selectivity' actif='{isActif()}' + clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' + decorator='boxed' _bean='{GearImpl.class}' _method='""'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> 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-03-17 15:41:44 UTC (rev 1985) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-17 15:54:53 UTC (rev 1986) @@ -35,28 +35,19 @@  <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/> - <Boolean id='selectivityPopulationSelected' javaBean='false'/> - <script> <![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Gear; -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; +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; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -70,103 +61,15 @@ } } }); - -selectivityTable.addMouseListener(new MouseListener() { - - @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override - public void mouseReleased(MouseEvent e) { - remove.setEnabled(selectivityTable.getSelectedRow() != -1); - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } -}); public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); - if (getBean() != null){ - fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); - setSelectivityTableModel(); - } - getVerifier().addCurrentPanel(selectivityEquation); - - remove.setEnabled(false); - setAddButton(); + getVerifier().addCurrentPanel(editor); } -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; - } - }; - Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); - java.util.List<Population> populations = new ArrayList<Population>(); - java.util.List<Equation> equations = new ArrayList<Equation>(); - if (selectivity != null){ - for (Selectivity s : selectivity){ - populations.add(s.getPopulation()); - equations.add(s.getEquation()); - } - } - model.addColumn("Population", populations.toArray()); - model.addColumn("Equation", equations.toArray()); - - selectivityTable.setModel(model); - EquationTableEditor cellEditor = new EquationTableEditor(); - selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); -} -protected DefaultComboBoxModel getSelectivityPopulationModel(){ - java.util.List<Species> species = getRegion().getSpecies(); - DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); - if (species != null){ - selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); - for (Species s : species){ - if (s.getPopulation() != null){ - for (Population p : s.getPopulation()){ - selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); - } - } - } - } - return selectivityPopulationModel; -} -protected void add(){ - getAction().addSelectivity((Population) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue(), selectivityEquation.getEditor().getText(), getBean()); - setSelectivityTableModel(); -} -protected void remove(){ - getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0))); - setSelectivityTableModel(); -} -protected void selectivityChanged(){ - setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); - setAddButton(); -} -protected void setAddButton(){ - add.setEnabled(getSelectivityPopulationSelected()); -} ]]> </script> <Table id='body'> @@ -174,46 +77,18 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <Table> <row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}'/> - </cell> - </row> - <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <InputOneEquationUI id='selectivityEquation' constructorParams='this' - lblText='{_("isisfish.selectivity.equation")}' - bean='{getBean()}' nameEquation='Selectivity' - clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' - decorator='boxed' _bean='{GearImpl.class}' _method='""'/> + <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' + decorator='boxed' _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/> </cell> </row> </Table> </cell> </row> <row> - <cell fill='both' weightx='1.0' weighty='1.0'> + <cell fill='horizontal' weightx='1.0'> <Table> <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> - </cell> - </row> - <row> <cell fill='horizontal' weightx='1.0'> <JButton id='save'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 15:41:44 UTC (rev 1985) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 15:54:53 UTC (rev 1986) @@ -19,6 +19,7 @@ package fr.ifremer.isisfish.ui.sensitivity; import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; @@ -49,6 +50,7 @@ import org.codelutin.math.matrix.gui.MatrixPanelEditor; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; +import fr.ifremer.isisfish.ui.input.SelectivityEditorUI; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -124,6 +126,14 @@ result = ipResult; } else if (result instanceof RangeOfValuesUI){ result = new JTextField(""); + } else if (result instanceof SelectivityEditorUI){ + SelectivityEditorUI origine = (SelectivityEditorUI)c; + SelectivityEditorUI ui = new SelectivityEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); + ui.setBean(origine.getBean()); + ui.setActif(true); + ui.refresh(); + ui.setActif(true); + result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){ MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c; MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); @@ -300,6 +310,15 @@ ipResult.setLabelRenderer(Month.MONTH); ipResult.setModel(ip.getModel().clone()); result = ipResult; + } else if (result instanceof SelectivityEditorUI){ + SelectivityEditorUI origine = (SelectivityEditorUI)c; + SelectivityEditorUI ui = new SelectivityEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); + ui.setBean(origine.getBean()); + ui.getBean().setPopulationSelectivity((Collection<Selectivity>) value); + ui.setActif(true); + ui.refresh(); + ui.setActif(true); + result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){ MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c; MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); @@ -383,6 +402,9 @@ } else if (c instanceof IntervalPanel){ // ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName))); + } else if (c instanceof SelectivityEditorUI){ + result = ((SelectivityEditorUI)c).getBean().getPopulationSelectivity(); + } else if (c instanceof MetierSeasonInfoSpeciesEditorUI){ result = ((MetierSeasonInfoSpeciesEditorUI)c).getMetierInfo().getSpeciesTargetSpecies(); Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-17 15:41:44 UTC (rev 1985) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-17 15:54:53 UTC (rev 1986) @@ -16,14 +16,12 @@ Gear.StandardisationFactor Gear.ParameterName Gear.PossibleValue -Gear.PopulationSelectivity Metier.GearParameterValue Metier.Interval Metier.Zone MetierSeasonInfo.SpeciesTargetSpecies Population.GeographicId Population.PlusGroup -Population.Capturability Population.MappingZoneReproZoneRecru Population.Growth Population.GrowthReverse

1 0

r1985 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: chatellier Date: 2009-03-17 15:41:44 +0000 (Tue, 17 Mar 2009) New Revision: 1985 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java Log: Fix bug were a population cannot be delete. Seams to be resaved by species Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-03-17 15:11:59 UTC (rev 1984) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-03-17 15:41:44 UTC (rev 1985) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * PopulationImpl.java - * - * Created: 11 janv. 2006 20:16:27 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.entities; import static org.codelutin.i18n.I18n._; @@ -57,30 +45,47 @@ import fr.ifremer.isisfish.equation.PopulationReproductionEquation; import fr.ifremer.isisfish.types.Month; - /** + * PopulationImpl. + * + * Created: 11 janv. 2006 20:16:27 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class PopulationImpl extends PopulationAbstract { + /** Logger for this class. */ + private static final Log log = LogFactory.getLog(PopulationImpl.class); + + /** serialVersionUID */ + private static final long serialVersionUID = 1L; + /** - * Logger for this class + * Overwrite delete. + * @throws TopiaException */ - private static final Log log = LogFactory.getLog(PopulationImpl.class); + @Override + public void delete() throws TopiaException { + // chatellier 20090317 fix hibernate exeception + // object will be resaved ... + // FIXME should be fixed on topia maybe ? + this.getSpecies().getPopulation().remove(this); - /** */ - private static final long serialVersionUID = 1L; + super.delete(); + } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString() */ @Override public String toString() { return getName(); } - + /** * override to change name of equation * @see fr.ifremer.isisfish.entities.PopulationAbstract#setName(java.lang.String) @@ -90,7 +95,7 @@ super.setName(value); updateEquationName(); } - + private void updateEquationName() { Equation eq = null; eq = getGrowth(); @@ -118,21 +123,22 @@ eq.setName(getName()); } } - + public void setEquationReproductionEquation(String content) { try { Equation eq = getReproductionEquation(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("Reproduction"); eq.setJavaInterface(PopulationReproductionEquation.class); eq.setLanguage(Language.JAVA); setReproductionEquation(eq); } - + eq.setName(getName()); // Fire @@ -143,25 +149,28 @@ eq.update(); fireOnPostWrite("content", _oldValue, content); - + } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); } } + public void setEquationGrowth(String content) { try { Equation eq = getGrowth(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create Growth equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("Growth"); eq.setJavaInterface(PopulationGrowth.class); eq.setLanguage(Language.JAVA); setGrowth(eq); } - + eq.setName(getName()); // Fire @@ -174,23 +183,26 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); + throw new IsisFishRuntimeException(_("isisfish.change.equation"), + eee); } } + public void setEquationGrowthReverse(String content) { try { Equation eq = getGrowthReverse(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("GrowthReverse"); eq.setJavaInterface(PopulationGrowthReverse.class); eq.setLanguage(Language.JAVA); setGrowthReverse(eq); } - + eq.setName(getName()); // Fire @@ -203,23 +215,26 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); } } + public void setEquationNaturalDeathRate(String content) { try { Equation eq = getNaturalDeathRate(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("NaturalDeathRate"); eq.setJavaInterface(PopulationNaturalDeathRate.class); eq.setLanguage(Language.JAVA); setNaturalDeathRate(eq); } - + eq.setName(getName()); // Fire @@ -232,23 +247,26 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); } } + public void setEquationMeanWeight(String content) { try { Equation eq = getMeanWeight(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("MeanWeight"); eq.setJavaInterface(PopulationMeanWeight.class); eq.setLanguage(Language.JAVA); setMeanWeight(eq); } - + eq.setName(getName()); // Fire @@ -261,23 +279,26 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); } } + public void setEquationPrice(String content) { try { Equation eq = getPrice(); - + if (eq == null) { - EquationDAO dao = IsisFishDAOHelper.getEquationDAO(getTopiaContext()); + EquationDAO dao = IsisFishDAOHelper + .getEquationDAO(getTopiaContext()); // create equation - eq = dao.create(); + eq = dao.create(); eq.setCategory("Price"); eq.setJavaInterface(PopulationPrice.class); eq.setLanguage(Language.JAVA); setPrice(eq); } - + eq.setName(getName()); // Fire @@ -290,13 +311,15 @@ fireOnPostWrite("content", _oldValue, content); } catch (TopiaException eee) { - throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); } } - - /* (non-Javadoc) + + /* * @see fr.ifremer.isisfish.entities.Population#getNaturalDeathBirth() */ + @Override public double getNaturalDeathBirth(Zone zone) { double result = 0; try { @@ -312,36 +335,38 @@ } return result; } - + /** * return Matrix [groups x zones] of Natural death rate * @return */ + @Override public MatrixND getNaturalDeathRateMatrix() { List<PopulationGroup> groups = getPopulationGroup(); List<Zone> zones = getPopulationZone(); - + MatrixND result = MatrixFactory.getInstance().create( - "Natural death rate", - new List[]{groups, zones}, - new String[]{"Groups", "Zones"}); - - for (MatrixIterator i=result.iterator(); i.hasNext();) { + "Natural death rate", new List[] { groups, zones }, + new String[] { "Groups", "Zones" }); + + for (MatrixIterator i = result.iterator(); i.hasNext();) { i.next(); - PopulationGroup group = (PopulationGroup)i.getSemanticsCoordinates()[0]; - Zone zone = (Zone)i.getSemanticsCoordinates()[1]; - + PopulationGroup group = (PopulationGroup) i + .getSemanticsCoordinates()[0]; + Zone zone = (Zone) i.getSemanticsCoordinates()[1]; + double value = group.getNaturalDeathRate(zone); i.setValue(value); } - + return result; } - + + @Override public PopulationSeasonInfo getPopulationSeasonInfo(Month month) { Collection<PopulationSeasonInfo> all = getPopulationSeasonInfo(); PopulationSeasonInfo result = null; - for(PopulationSeasonInfo psi : all) { + for (PopulationSeasonInfo psi : all) { if (psi.containsMonth(month)) { result = psi; break; @@ -349,13 +374,14 @@ } return result; } - + /** * Compute age of group with length * @param length length of group * @param group group * @return age in month */ + @Override public double getAge(double length, PopulationGroup group) { double result = 0; try { @@ -363,7 +389,7 @@ result = growth.evaluate("length", length, "group", group); } catch (Exception eee) { if (log.isWarnEnabled()) { - log.warn("Error in growth equation"); + log.warn("Error in get age"); } if (log.isDebugEnabled()) { log.debug("StackTrace", eee); @@ -371,13 +397,14 @@ } return result; } - + /** * Compute length of group with age * @param age age of group in month * @param group group * @return length of group */ + @Override public double getLength(double age, PopulationGroup group) { double result = 0; try { @@ -385,7 +412,7 @@ result = growth.evaluate("age", age, "group", group); } catch (Exception eee) { if (log.isWarnEnabled()) { - log.warn("Error in growth equation"); + log.warn("Error in get length"); } if (log.isDebugEnabled()) { log.debug("StackTrace", eee); @@ -393,47 +420,47 @@ } return result; } - -// /* (non-Javadoc) -// * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationSeasonInfo(fr.ifremer.isisfish.entities.PopulationSeasonInfo) -// */ -// @Override -// public void addPopulationSeasonInfo(PopulationSeasonInfo populationSeasonInfo) { -// super.addPopulationSeasonInfo(populationSeasonInfo); -// changeCapturability(); -// } -// -// /* (non-Javadoc) -// * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationGroup(fr.ifremer.isisfish.entities.PopulationGroup) -// */ -// @Override -// public void addPopulationGroup(PopulationGroup populationGroup) { -// super.addPopulationGroup(populationGroup); -// changeCapturability(); -// } -// protected void changeCapturability() { -// MatrixND mat = null; -// if (sizePopulationGroup() == 0 || sizePopulationSeasonInfo() == 0) { -// log.warn("Population doesn't have population group or population season info"); -// } else { -// List [] sems = new List[]{ -// getPopulationGroup(), -// getPopulationSeasonInfo(), -// }; -// mat = MatrixFactory.getInstance().create(_("isisfish.population.capturability"), sems, -// new String[]{_("isisfish.population.group"), _("isisfish.population.season")}); -// -// -// MatrixND oldMat = getCapturability(); -// if (oldMat != null) { -// mat.pasteSemantics(oldMat); -// } -// } -// setCapturability(mat); -// } - - /* (non-Javadoc) + // /* (non-Javadoc) + // * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationSeasonInfo(fr.ifremer.isisfish.entities.PopulationSeasonInfo) + // */ + // @Override + // public void addPopulationSeasonInfo(PopulationSeasonInfo populationSeasonInfo) { + // super.addPopulationSeasonInfo(populationSeasonInfo); + // changeCapturability(); + // } + // + // /* (non-Javadoc) + // * @see fr.ifremer.isisfish.entities.PopulationAbstract#addPopulationGroup(fr.ifremer.isisfish.entities.PopulationGroup) + // */ + // @Override + // public void addPopulationGroup(PopulationGroup populationGroup) { + // super.addPopulationGroup(populationGroup); + // changeCapturability(); + // } + + // protected void changeCapturability() { + // MatrixND mat = null; + // if (sizePopulationGroup() == 0 || sizePopulationSeasonInfo() == 0) { + // log.warn("Population doesn't have population group or population season info"); + // } else { + // List [] sems = new List[]{ + // getPopulationGroup(), + // getPopulationSeasonInfo(), + // }; + // mat = MatrixFactory.getInstance().create(_("isisfish.population.capturability"), sems, + // new String[]{_("isisfish.population.group"), _("isisfish.population.season")}); + // + // + // MatrixND oldMat = getCapturability(); + // if (oldMat != null) { + // mat.pasteSemantics(oldMat); + // } + // } + // setCapturability(mat); + // } + + /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#getCapturability() */ @Override @@ -441,24 +468,31 @@ MatrixND mat = super.getCapturability(); // check the validity if (sizePopulationGroup() == 0 || sizePopulationSeasonInfo() == 0) { - log.warn("Population doesn't have population group or population season info"); + log + .warn("Population doesn't have population group or population season info"); return null; } - List [] sems = new List[]{ - getPopulationGroup(), - getPopulationSeasonInfo(), - }; + List[] sems = new List[] { getPopulationGroup(), + getPopulationSeasonInfo(), }; if (mat == null) { log.debug("Capturability is null, create new matrix"); - mat = MatrixFactory.getInstance().create(n_("isisfish.population.capturability"), sems, - new String[]{n_("isisfish.population.group"), n_("isisfish.population.season")}); + mat = MatrixFactory.getInstance().create( + n_("isisfish.population.capturability"), + sems, + new String[] { n_("isisfish.population.group"), + n_("isisfish.population.season") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old - } else if (!Arrays.equals(mat.getSemantics(), sems)){ - log.debug("Capturability has changed, create new matrix and copy old: " + mat.getSemantics() + " " + sems); - MatrixND newmat = MatrixFactory.getInstance().create(n_("isisfish.population.capturability"), sems, - new String[]{n_("isisfish.population.group"), n_("isisfish.population.season")}); + } else if (!Arrays.equals(mat.getSemantics(), sems)) { + log + .debug("Capturability has changed, create new matrix and copy old: " + + mat.getSemantics() + " " + sems); + MatrixND newmat = MatrixFactory.getInstance().create( + n_("isisfish.population.capturability"), + sems, + new String[] { n_("isisfish.population.group"), + n_("isisfish.population.season") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -467,35 +501,39 @@ return mat; } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#getMappingZoneReproZoneRecru() */ @Override public MatrixND getMappingZoneReproZoneRecru() { if (sizeReproductionZone() == 0 || sizeRecruitmentZone() == 0) { - log.warn("Population doesn't have zone reproduction or zone recruitment"); - return null; + log + .warn("Population doesn't have zone reproduction or zone recruitment"); + return null; } MatrixND mat = super.getMappingZoneReproZoneRecru(); - List [] sems = new List[]{ - getReproductionZone(), - getRecruitmentZone(), - }; + List[] sems = new List[] { getReproductionZone(), getRecruitmentZone(), }; if (mat == null) { - mat = MatrixFactory.getInstance().create(n_("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[]{n_("isisfish.population.reproduction"), n_("isisfish.population.recruitment")}); + mat = MatrixFactory.getInstance().create( + n_("isisfish.population.mappingZoneReproZoneRecru"), + sems, + new String[] { n_("isisfish.population.reproduction"), + n_("isisfish.population.recruitment") }); // we don't call setMappingZoneReproZoneRecru because is better to create a valid // matrix when MappingZoneReproZoneRecru is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { - MatrixND newmat = MatrixFactory.getInstance().create(n_("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[]{n_("isisfish.population.reproduction"), n_("isisfish.population.recruitment")}); + MatrixND newmat = MatrixFactory.getInstance().create( + n_("isisfish.population.mappingZoneReproZoneRecru"), + sems, + new String[] { n_("isisfish.population.reproduction"), + n_("isisfish.population.recruitment") }); newmat.paste(mat); mat = newmat; } return mat; } - + /** * convertie une matrice N 2D en une matrice N 1D strucutre pour les * calcules. @@ -509,15 +547,16 @@ MatrixND result = MatrixFactory.getInstance().create( n_("isisfish.population.matrixAbundance1D"), - new int[]{1, maxX * maxY}); - - for(int x=0; x<maxX; x++){ - for(int y=0; y<maxY; y++){ - result.setValue(0, x*maxY+y, N.getValue(x, y)); + new int[] { 1, maxX * maxY }); + + for (int x = 0; x < maxX; x++) { + for (int y = 0; y < maxY; y++) { + result.setValue(0, x * maxY + y, N.getValue(x, y)); } } return result; } + /** * a partir d'une matrice N structure selon l'ecriture matricielle * en classe puis en zone, construit une matrice 2D en Classe(X) @@ -532,25 +571,24 @@ MatrixND result = MatrixFactory.getInstance().create( n_("isisfish.population.matrixAbundance"), - new List[]{groups, zones}, - new String[]{n_("isisfish.population.groups"), n_("isisfish.population.zones")}); + new List[] { groups, zones }, + new String[] { n_("isisfish.population.groups"), + n_("isisfish.population.zones") }); try { int c = 0; int z = 0; - for(MatrixIterator mi=N.iterator(); mi.next();){ - result.setValue(c,z, mi.getValue()); - if (z+1 == nbZone){ + for (MatrixIterator mi = N.iterator(); mi.next();) { + result.setValue(c, z, mi.getValue()); + if (z + 1 == nbZone) { c++; } - z = (z+1)%nbZone; + z = (z + 1) % nbZone; } - } catch(MatrixException eee) { + } catch (MatrixException eee) { log.warn("MatrixException", eee); } return result; - } - + } + } - -

1 0

r1984 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 15:11:59 +0000 (Tue, 17 Mar 2009) New Revision: 1984 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Factor of MetierSeasonInfoSpecies is done Added: 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 (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-03-17 15:11:59 UTC (rev 1984) @@ -0,0 +1,248 @@ + + +<fr.ifremer.isisfish.ui.input.InputContentUI> + +  + <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> + + <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierInfo' javaBean='null'/> + + <Boolean id='metierSeasonSelected' javaBean='false'/> + + <Boolean id='targetSpeciesSelected' javaBean='false'/> + + <script><![CDATA[ +import com.l2fprod.common.swing.renderer.BooleanCellRenderer; +import java.util.logging.Level; +import java.util.logging.Logger; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.MetierImpl; +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; +import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import org.codelutin.topia.persistence.TopiaEntity; +import javax.swing.table.DefaultTableModel; +import fr.ifremer.isisfish.entities.Species; +import org.codelutin.topia.TopiaContext; +import javax.swing.table.TableCellEditor; + +addPropertyChangeListener("bean", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + // remove previous binding on getBean() + //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); + } + if (evt.getNewValue() != null) { + // add binding on getBean() + //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") + } + } +}); + +tableTargetSpecies.addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(tableTargetSpecies.getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); + public void refresh() { + getVerifier().addCurrentPanel(targetFactor); + if (getBean() != null){ + setTableTargetSpeciesModel(); + } + else{ + setTargetSpeciesModel(); + } + setTargetSpeciesModel(); + remove.setEnabled(false); + setAddButton(); +} +protected void setTargetSpeciesModel(){ + DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); + java.util.List<Species> species = getRegion().getSpecies(); + if (species != null){ + fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); + for (Species s : species){ + fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class)); + } + } + fieldTargetSpecies.setModel(fieldTargetSpeciesModel); +} +protected void setTableTargetSpeciesModel(){ + DefaultTableModel model = new DefaultTableModel(){ + @Override + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0){ + result =true; + } + return result; + } + }; + if (getMetierInfo() != null){ + Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)getMetierInfo()).getSpeciesTargetSpecies(); + if (targetSpecies != null){ + ArrayList <GenericCell> species = new ArrayList <GenericCell>(); + ArrayList <Equation> equations = new ArrayList <Equation>(); + ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); + for (TargetSpecies t : targetSpecies){ + Species s = t.getSpecies(); + Equation e = t.getTargetFactorEquation(); + Boolean b = t.getPrimaryCatch(); + species.add(new GenericCell(s.getName(),s,Species.class)); + equations.add(e); + primaryCatch.add(b); + } + model.addColumn("Species", species.toArray()); + model.addColumn("Target factor", equations.toArray()); + model.addColumn("Main species for the metier", primaryCatch.toArray()); + } + tableTargetSpecies.setModel(model); + EquationTableEditor cellEditor = new EquationTableEditor(); + tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); + } +} +protected void add(){ + Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); + if (getMetierInfo() != null && species != null){ + getContextValue(InputAction.class).addTargetSpecies( + getBean(), + (MetierSeasonInfo)getMetierInfo(), + (Species)species, + targetFactor.getEditor().getText(), + fieldPrimaryCatch.isSelected()); + setTableTargetSpeciesModel(); + } +} +protected void remove(){ + if (isMetierSeasonSelected()){ + Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray(); + + Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; + if (o != null){ + TargetSpecies ts = (TargetSpecies)o; + getAction().removeTargetSpecies(getMetierInfo(), ts); + setTableTargetSpeciesModel(); + } + } +} +protected void targetSpeciesChanged(){ + setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); + setTableTargetSpeciesModel(); + setAddButton(); +} +protected void setAddButton(){ + add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected()); +} + ]]></script> + <Table id='body'> + <row> + <cell fill='both' weightx='1.0' weighty='0.5'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='targetFactor' constructorParams='this' + actif='{isActif()}' + lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' + bean='{getBean()}' nameEquation='TargetFactor' + clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' + decorator='boxed' _bean='{MetierImpl.class}' _method='""'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='0.5'> + <Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isActif()}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-17 14:39:41 UTC (rev 1983) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-17 15:11:59 UTC (rev 1984) @@ -39,28 +39,15 @@ <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierInfo' javaBean='null'/> <Boolean id='metierSeasonSelected' javaBean='false'/> - - <Boolean id='targetSpeciesSelected' javaBean='false'/> <script><![CDATA[ -import com.l2fprod.common.swing.renderer.BooleanCellRenderer; import java.util.logging.Level; import java.util.logging.Logger; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; -import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.codelutin.topia.persistence.TopiaEntity; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.entities.Species; -import org.codelutin.topia.TopiaContext; -import javax.swing.table.TableCellEditor; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -75,54 +62,20 @@ } }); -tableTargetSpecies.addMouseListener(new MouseListener() { - - @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override - public void mouseReleased(MouseEvent e) { - remove.setEnabled(tableTargetSpecies.getSelectedRow() != -1); - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } -}); public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); - getVerifier().addCurrentPanel(targetFactor); + getVerifier().addCurrentPanel(editor); if (getBean() != null){ - if (fieldMetierSeasonInfo.getSelectedIndex() <= 0){ - setSeasonModel(); - } - else { - setTableTargetSpeciesModel(); - } - if (fieldTargetSpecies.getSelectedIndex() <= 0){ - setTargetSpeciesModel(); - } - setTableTargetSpeciesModel(); + setSeasonModel(); } else{ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); fieldMetierSeasonInfo.setModel(seasonModel); - setTargetSpeciesModel(); } - remove.setEnabled(false); - setAddButton(); + } protected void setSeasonModel(){ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); @@ -135,95 +88,14 @@ } fieldMetierSeasonInfo.setModel(seasonModel); } -protected void setTargetSpeciesModel(){ - DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); - java.util.List<Species> species = getRegion().getSpecies(); - if (species != null){ - fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); - for (Species s : species){ - fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class)); - } - } - fieldTargetSpecies.setModel(fieldTargetSpeciesModel); -} -protected void setTableTargetSpeciesModel(){ - DefaultTableModel model = new DefaultTableModel(){ - @Override - public boolean isCellEditable(int row, int column) { - boolean result = false; - if (column > 0){ - result =true; - } - return result; - } - }; - Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); - if (season != null){ - Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)season).getSpeciesTargetSpecies(); - if (targetSpecies != null){ - ArrayList <GenericCell> species = new ArrayList <GenericCell>(); - ArrayList <Equation> equations = new ArrayList <Equation>(); - ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); - for (TargetSpecies t : targetSpecies){ - Species s = t.getSpecies(); - Equation e = t.getTargetFactorEquation(); - Boolean b = t.getPrimaryCatch(); - species.add(new GenericCell(s.getName(),s,Species.class)); - equations.add(e); - primaryCatch.add(b); - } - model.addColumn("Species", species.toArray()); - model.addColumn("Target factor", equations.toArray()); - model.addColumn("Main species for the metier", primaryCatch.toArray()); - } - tableTargetSpecies.setModel(model); - EquationTableEditor cellEditor = new EquationTableEditor(); - tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); - } -} -protected void add(){ - Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); - Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (season != null && species != null){ - getContextValue(InputAction.class).addTargetSpecies( - getBean(), - (MetierSeasonInfo)season, - (Species)species, - targetFactor.getEditor().getText(), - fieldPrimaryCatch.isSelected()); - setTableTargetSpeciesModel(); - } -} -protected void remove(){ - if (isMetierSeasonSelected()){ - Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray(); - - Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; - if (o != null){ - TargetSpecies ts = (TargetSpecies)o; - getAction().removeTargetSpecies(getMetierInfo(), ts); - setTableTargetSpeciesModel(); - } - } -} protected void metierSeasonChanged(){ setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() != null); if (isMetierSeasonSelected()){ setMetierInfo((MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue()); getVerifier().addCurrentEntity(getMetierInfo()); } - setTargetSpeciesModel(); - setTableTargetSpeciesModel(); - setAddButton(); + editor.refresh(); } -protected void targetSpeciesChanged(){ - setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); - setTableTargetSpeciesModel(); - setAddButton(); -} -protected void setAddButton(){ - add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected()); -} ]]></script> <Table id='body'> <row> @@ -238,54 +110,18 @@ </cell> </row> <row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/> - </cell> - </row> - <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <InputOneEquationUI id='targetFactor' constructorParams='this' - lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' - bean='{getBean()}' nameEquation='TargetFactor' - clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' - decorator='boxed' _bean='{MetierImpl.class}' _method='""'/> + <MetierSeasonInfoSpeciesEditorUI id='editor' constructorParams='this' bean='{getBean()}' metierInfo='{getMetierInfo()}' metierSeasonSelected='{getMetierSeasonSelected()}' actif='{isActif()}' + decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/> </cell> </row> - <row> - <cell fill='horizontal'> - <JPanel/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/> - </cell> - </row> </Table> </cell> </row> <row> - <cell fill='both' weightx='1.0' weighty='0.5'> + <cell fill='horizontal' weightx='1.0'> <Table> <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> - </cell> - </row> - <row> <cell fill='horizontal' weightx='0.5'> <JButton id='save'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-17 14:39:41 UTC (rev 1983) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-17 15:11:59 UTC (rev 1984) @@ -59,7 +59,7 @@ <JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' > <tab title='{_("isisfish.metier.title")}'><MetierTabUI id="metierTabUI" constructorParams='this'/></tab> <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this' decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/></tab> + <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 14:39:41 UTC (rev 1983) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 15:11:59 UTC (rev 1984) @@ -19,11 +19,14 @@ package fr.ifremer.isisfish.ui.sensitivity; import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.entities.TargetSpecies; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI; @@ -47,6 +50,7 @@ import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -120,6 +124,17 @@ result = ipResult; } else if (result instanceof RangeOfValuesUI){ result = new JTextField(""); + } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){ + MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c; + MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); + ui.setBean(origine.getBean()); + if (origine.getMetierInfo() != null){ + ui.setMetierInfo(origine.getMetierInfo()); + ui.setMetierSeasonSelected(true); + ui.setActif(true); + } + ui.refresh(); + result = ui; } else if (result instanceof PopulationZonesEditorUI){ PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c; PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); @@ -285,6 +300,18 @@ ipResult.setLabelRenderer(Month.MONTH); ipResult.setModel(ip.getModel().clone()); result = ipResult; + } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){ + MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c; + MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier())); + ui.setBean(origine.getBean()); + if (origine.getMetierInfo() != null){ + ui.setMetierInfo(origine.getMetierInfo()); + ui.getMetierInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>)value); + ui.setMetierSeasonSelected(true); + ui.setActif(true); + } + ui.refresh(); + result = ui; } else if (result instanceof PopulationZonesEditorUI){ PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c; PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); @@ -356,6 +383,12 @@ } else if (c instanceof IntervalPanel){ // ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName))); + } else if (c instanceof MetierSeasonInfoSpeciesEditorUI){ + result = ((MetierSeasonInfoSpeciesEditorUI)c).getMetierInfo().getSpeciesTargetSpecies(); + + } else if (result instanceof PopulationZonesEditorUI){ + result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix(); + } else if (c instanceof RangeOfValuesUI){ } else if (c instanceof PopulationMigrationMigrationUI){

1 0

r1983 - in isis-fish/trunk: . src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: chatellier Date: 2009-03-17 14:39:41 +0000 (Tue, 17 Mar 2009) New Revision: 1983 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml Log: Correct regression du to topia "order-by" change Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/pom.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -346,7 +346,7 @@  <jaxx.version>1.3-SNAPSHOT</jaxx.version> - <topia.version>2.1.3</topia.version> + <topia.version>2.1.4-SNAPSHOT</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3</lutinutil.version> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -14,7 +14,7 @@ <key column="possibleMetiers"/> <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="metierSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> + <bag name="metierSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> <key column="metier"/> <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -47,11 +47,11 @@ <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationGroup" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> + <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> + <bag name="populationSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -11,7 +11,7 @@ <property name="inactivityEquationUsed" type="boolean" access="field" column="inactivityEquationUsed" node="inactivityEquationUsed"/> <many-to-one name="inactivityEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="inactivityEquation" cascade="delete" node="inactivityEquation/@topiaId" embed-xml="false" /> <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false" /> - <bag name="strategyMonthInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> + <bag name="strategyMonthInfo" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> <key column="strategy"/> <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> </bag>

1 0

r1982 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 14:14:48 +0000 (Tue, 17 Mar 2009) New Revision: 1982 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 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/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx Log: Factor of PopulationZone is done 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-03-17 13:33:34 UTC (rev 1981) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-17 14:14:48 UTC (rev 1982) @@ -72,7 +72,7 @@ <PopulationEquationUI id='populationEquationUI' constructorParams='this'/> </tab> <tab title='{_("isisfish.populationZones.title")}'> - <PopulationZonesUI id='populationZoneUI' constructorParams='this' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> + <PopulationZonesUI id='populationZoneUI' constructorParams='this'/> </tab> <tab title='{_("isisfish.populationSeasons.title")}'> <PopulationSeasonsUI id='populationSeasonsUI' constructorParams='this'/> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-03-17 14:14:48 UTC (rev 1982) @@ -0,0 +1,172 @@ + +<fr.ifremer.isisfish.ui.input.InputContentUI> + +  + <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + + <script><![CDATA[ + +import jaxx.runtime.swing.JAXXList; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationImpl; +import org.codelutin.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import org.codelutin.math.matrix.gui.MatrixPanelEvent; +import org.codelutin.math.matrix.gui.MatrixPanelListener; + +MatrixPanelListener listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + fieldPopulationMappingZoneReproZoneRecruChanged(); + } +}; + +addPropertyChangeListener("bean", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + // remove previous binding on getBean() + //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } + if (evt.getNewValue() != null) { + // add binding on getBean() + //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } + } +}); + +public void refresh(){ + setPopulationZonesPresenceModel(); + setFieldPopulationZonesReproductionModel(); + setFieldPopulationZonesRecruitmentModel(); + fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener); + setFieldPopulationMappingZoneReproZoneRecru(); + fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); +} +protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ + getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix()); +} +protected void setFieldPopulationMappingZoneReproZoneRecru(){ + if (getBean() != null){ + if (getBean().getMappingZoneReproZoneRecru() != null){ + fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy()); + } + } +} +protected void setPopulationZonesPresenceModel(){ + if (getBean() != null){ + setModel(getBean().getPopulationZone(), populationZonesPresence); + } +} +protected void setFieldPopulationZonesReproductionModel(){ + if (getBean() != null){ + setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction); + } +} +protected void setFieldPopulationZonesRecruitmentModel(){ + if (getBean() != null){ + setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); + } +} +protected void setModel(java.util.List<Zone> selected, JAXXList componant){ + DefaultListModel model = new DefaultListModel(); + java.util.List<Zone> zones = getRegion().getZone(); + java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>(); + if (zones != null){ + for (Zone z : zones){ + GenericCell cell = new GenericCell(z.getName(), z, Zone.class); + model.addElement(cell); + if (selected != null){ + if (selected.contains(z)){ + selectedZones.add(cell); + } + } + } + } + componant.setModel(model); + if (selectedZones.size() > 0){ + java.util.List <Integer> indicesList = new ArrayList<Integer>(); + for (GenericCell c : selectedZones){ + indicesList.add(model.indexOf(c)); + } + int[] indices = new int[indicesList.size()]; + int cnt = 0; + for (Integer i : indicesList){ + indices[cnt]=i; + cnt ++; + } + componant.setSelectedIndices(indices); + } +} +protected void presenceChanged(){ + getBean().setPopulationZone(getSelectedValue(populationZonesPresence)); + setFieldPopulationMappingZoneReproZoneRecru(); +} +protected void reproductionChanged(){ + getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction)); + setFieldPopulationMappingZoneReproZoneRecru(); +} +protected void recruitementChanged(){ + getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment)); + setFieldPopulationMappingZoneReproZoneRecru(); +} +protected java.util.List<Zone> getSelectedValue(JAXXList componant){ + Object[] selected = componant.getSelectedValues(); + java.util.List<Zone> selectedZone = new ArrayList<Zone>(); + if (selected != null){ + for (Object i : selected){ + GenericCell cell = (GenericCell)i; + if (cell.getValue() != null){ + selectedZone.add((Zone)cell.getValue()); + } + } + } + return selectedZone; +} + ]]> + </script> + <Table id='body'> + + + <row> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectPopulationAreas" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectSpawningAreas" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectRecruitmentAreas" enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="populationZonesPresence" onMouseClicked='presenceChanged()' enabled='{isActif()}'/> + </JScrollPane> + </cell> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="fieldPopulationZonesReproduction" onMouseClicked='reproductionChanged()' enabled='{isActif()}'/> + </JScrollPane> + </cell> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="fieldPopulationZonesRecruitment" onMouseClicked='recruitementChanged()' enabled='{isActif()}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='3' anchor='west'> + <JLabel text="isisfish.populationZones.betweenSpawningRecruitmentAreas" enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-17 13:33:34 UTC (rev 1981) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-17 14:14:48 UTC (rev 1982) @@ -38,172 +38,26 @@ <script><![CDATA[ -import jaxx.runtime.swing.JAXXList; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import org.codelutin.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.codelutin.math.matrix.gui.MatrixPanelEvent; -import org.codelutin.math.matrix.gui.MatrixPanelListener; -MatrixPanelListener listener = new MatrixPanelListener() { - - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - fieldPopulationMappingZoneReproZoneRecruChanged(); - } -}; - -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - } -}); - public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - setPopulationZonesPresenceModel(); - setFieldPopulationZonesReproductionModel(); - setFieldPopulationZonesRecruitmentModel(); - fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener); - setFieldPopulationMappingZoneReproZoneRecru(); - fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); + getVerifier().addCurrentPanel(popZones); } -protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ - getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix().copy()); -} -protected void setFieldPopulationMappingZoneReproZoneRecru(){ - if (getBean() != null){ - if (getBean().getMappingZoneReproZoneRecru() != null){ - fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy()); - } - } -} -protected void setPopulationZonesPresenceModel(){ - if (getBean() != null){ - setModel(getBean().getPopulationZone(), populationZonesPresence); - } -} -protected void setFieldPopulationZonesReproductionModel(){ - if (getBean() != null){ - setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction); - } -} -protected void setFieldPopulationZonesRecruitmentModel(){ - if (getBean() != null){ - setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); - } -} -protected void setModel(java.util.List<Zone> selected, JAXXList componant){ - DefaultListModel model = new DefaultListModel(); - java.util.List<Zone> zones = getRegion().getZone(); - java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>(); - if (zones != null){ - for (Zone z : zones){ - GenericCell cell = new GenericCell(z.getName(), z, Zone.class); - model.addElement(cell); - if (selected != null){ - if (selected.contains(z)){ - selectedZones.add(cell); - } - } - } - } - componant.setModel(model); - if (selectedZones.size() > 0){ - java.util.List <Integer> indicesList = new ArrayList<Integer>(); - for (GenericCell c : selectedZones){ - indicesList.add(model.indexOf(c)); - } - int[] indices = new int[indicesList.size()]; - int cnt = 0; - for (Integer i : indicesList){ - indices[cnt]=i; - cnt ++; - } - componant.setSelectedIndices(indices); - } -} -protected void presenceChanged(){ - getBean().setPopulationZone(getSelectedValue(populationZonesPresence)); - setFieldPopulationMappingZoneReproZoneRecru(); -} -protected void reproductionChanged(){ - getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction)); - setFieldPopulationMappingZoneReproZoneRecru(); -} -protected void recruitementChanged(){ - getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment)); - setFieldPopulationMappingZoneReproZoneRecru(); -} -protected java.util.List<Zone> getSelectedValue(JAXXList componant){ - Object[] selected = componant.getSelectedValues(); - java.util.List<Zone> selectedZone = new ArrayList<Zone>(); - if (selected != null){ - for (Object i : selected){ - GenericCell cell = (GenericCell)i; - if (cell.getValue() != null){ - selectedZone.add((Zone)cell.getValue()); - } - } - } - return selectedZone; -} ]]> </script> <Table id='body'> <row> - <cell fill='horizontal' weightx='0.3'> - <JLabel text="isisfish.populationZones.selectPopulationAreas" enabled='{isActif()}'/> + <cell fill='both' weightx='1.0' weighty='1'> + <PopulationZonesEditorUI id='popZones' constructorParams='this' bean='{getBean()}' actif='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> </cell> - <cell fill='horizontal' weightx='0.3'> - <JLabel text="isisfish.populationZones.selectSpawningAreas" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='0.3'> - <JLabel text="isisfish.populationZones.selectRecruitmentAreas" enabled='{isActif()}'/> - </cell> </row> <row> - <cell fill='both' weightx='0.3' weighty='0.5'> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="populationZonesPresence" onMouseClicked='presenceChanged()' enabled='{isActif()}'/> - </JScrollPane> - </cell> - <cell fill='both' weightx='0.3' weighty='0.5'> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesReproduction" onMouseClicked='reproductionChanged()' enabled='{isActif()}'/> - </JScrollPane> - </cell> - <cell fill='both' weightx='0.3' weighty='0.5'> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesRecruitment" onMouseClicked='recruitementChanged()' enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='3' anchor='west'> - <JLabel text="isisfish.populationZones.betweenSpawningRecruitmentAreas" enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell columns='3' fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <Table> <row> <cell fill='horizontal' weightx='0.5'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 13:33:34 UTC (rev 1981) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 14:14:48 UTC (rev 1982) @@ -27,6 +27,7 @@ import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI; +import fr.ifremer.isisfish.ui.input.PopulationZonesEditorUI; import fr.ifremer.isisfish.ui.widget.IntervalPanel; import java.lang.reflect.Method; import java.util.logging.Level; @@ -119,6 +120,13 @@ result = ipResult; } else if (result instanceof RangeOfValuesUI){ result = new JTextField(""); + } else if (result instanceof PopulationZonesEditorUI){ + PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c; + PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); + ui.setBean(origine.getBean()); + ui.setActif(true); + ui.refresh(); + result = ui; } else if (result instanceof PopulationMigrationMigrationUI){ PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c; PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction())); @@ -277,7 +285,15 @@ ipResult.setLabelRenderer(Month.MONTH); ipResult.setModel(ip.getModel().clone()); result = ipResult; - }else if (result instanceof PopulationMigrationMigrationUI){ + } else if (result instanceof PopulationZonesEditorUI){ + PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c; + PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); + ui.setBean(origine.getBean()); + ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix((MatrixND)value); + ui.setActif(true); + ui.refresh(); + result = ui; + } else if (result instanceof PopulationMigrationMigrationUI){ PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c; PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); @@ -314,7 +330,9 @@ Object result = null; if (c instanceof JTextComponent) { result = ((JTextComponent)c).getText(); - } else if (c instanceof JTable){ + } else if (c instanceof PopulationZonesEditorUI){ + result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix(); + } else if (c instanceof JTable){ // ((JTable) result).setText(BeanUtils.getProperty(e, fieldName)); } else if (c instanceof MatrixPanelEditor){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-17 13:33:34 UTC (rev 1981) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-17 14:14:48 UTC (rev 1982) @@ -102,7 +102,7 @@ } init(); } - if (!isContinueSelected()){ + if (!isContinueSelected() && EditorHelper.isRangeOfValue(cOrigine)){ int i = 0; for (String s : EditorHelper.getDiscretRangeOfValueValues(cOrigine, bean)){ JTextField text = new JTextField(s);

1 0

r1981 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by sletellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: sletellier Date: 2009-03-17 13:33:34 +0000 (Tue, 17 Mar 2009) New Revision: 1981 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx Log: Factor of range of value is done Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -115,7 +115,7 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this'/> + <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -91,7 +91,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"GearParameterValue"'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' editable='{false}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -50,7 +50,7 @@ <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -149,7 +149,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{false}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -56,7 +56,7 @@ }); -public void init(JTextField cMax, JTextField cMin, int inc){ +public void init(JTextField cMin, JTextField cMax){ continueMax = cMax; continueMin = cMin; continueMax.setEnabled(isContinueSelected()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-17 13:33:34 UTC (rev 1981) @@ -45,6 +45,11 @@ import org.codelutin.math.matrix.gui.MatrixPanelEditor; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.swing.JPanel; /** * @@ -113,12 +118,7 @@ ipResult.setModel(ip.getModel().clone()); result = ipResult; } else if (result instanceof RangeOfValuesUI){ - RangeOfValuesUI origine = (RangeOfValuesUI)c; - RangeOfValuesUI ui = new RangeOfValuesUI(new JAXXInitialContext().add(new InputAction())); - ui.setBean(e); - ui.setActif(true); - ui.refresh(); - result = ui; + result = new JTextField(""); } else if (result instanceof PopulationMigrationMigrationUI){ PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c; PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction())); @@ -175,7 +175,7 @@ continuousPanel = new DefaultContinuousPanel(); result = continuousPanel; } - continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEditor(c, e), 0); + continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEditor(c, e)); } catch (Exception ex) { Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); } @@ -216,7 +216,7 @@ continuousPanel = new DefaultContinuousPanel(); result = continuousPanel; } - continuousPanel.init(new JTextField(String.valueOf(domain.getMinBound())), new JTextField(String.valueOf(domain.getMaxBound())), domain.getCardinality()); + continuousPanel.init(new JTextField(String.valueOf(domain.getMinBound())), new JTextField(String.valueOf(domain.getMaxBound()))); } catch (Exception ex) { Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); } @@ -233,6 +233,8 @@ } else if (result instanceof JTable){ // ((JTable) result).setModel(((JTable)c).getModel()); + } else if (result instanceof RangeOfValuesUI){ + result = new JTextField(value.toString()); } else if (result instanceof MatrixPanelEditor){ MatrixPanelEditor ui = (MatrixPanelEditor) c; MatrixPanelEditor matrix = new MatrixPanelEditor(); @@ -336,17 +338,37 @@ } else if (c instanceof IntervalPanel){ // ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName))); - } else if (result instanceof PopulationMigrationMigrationUI){ + } else if (c instanceof RangeOfValuesUI){ + + } else if (c instanceof PopulationMigrationMigrationUI){ result = ((PopulationMigrationMigrationUI)c).getPopInfo().getMigrationMatrix(); - } else if (result instanceof PopulationMigrationEmigrationUI){ + } else if (c instanceof PopulationMigrationEmigrationUI){ result = ((PopulationMigrationEmigrationUI)c).getPopInfo().getEmigrationMatrix(); - } else if (result instanceof PopulationMigrationImmigrationUI){ + } else if (c instanceof PopulationMigrationImmigrationUI){ result = ((PopulationMigrationImmigrationUI)c).getPopInfo().getImmigrationMatrix(); } return result; } + public static boolean isRangeOfValue(JComponent c){ + if (c instanceof RangeOfValuesUI){ + return true; + } + return false; + } + public static boolean isContinue(JComponent c){ + if (c instanceof RangeOfValuesUI){ + RangeOfValuesUI ui = (RangeOfValuesUI)c; + if (ui.getFieldGearParamType().getSelectedItem().equals("Float")){ + String value = ui.getFieldGearParamPossibleValue().getText(); + if (value.matches("^\\ *[0-9]*\\ *\\-\\ *[0-9]*\\ *$")){ + return true; + } + } + } + return false; + } public static boolean canBeContinue(JComponent c, TopiaEntity e){ String fieldName = (String) c.getClientProperty("method"); if (c instanceof JTextComponent) { @@ -356,7 +378,12 @@ return true; } else if (c instanceof MatrixPanelEditor){ return true; - } + } else if (c instanceof RangeOfValuesUI){ + RangeOfValuesUI ui = (RangeOfValuesUI)c; + if (ui.getFieldGearParamType().getSelectedItem().equals("Float")){ + return true; + } + } return false; } public static boolean canBeContinue(JComponent c, Object o){ @@ -379,4 +406,57 @@ } return result; } + +// RangeOfValue + public static ContinuousPanelContainer getContinuousRangeOfValuePanel(JComponent cOrigine, TopiaEntity bean){ + DefaultContinuousPanel continuousPanel = new DefaultContinuousPanel(); + RangeOfValuesUI ui = (RangeOfValuesUI)cOrigine; + String value = ui.getFieldGearParamPossibleValue().getText(); + String min = "0"; + String max = "0"; + if (value.matches("^\\ *[0-9]*\\ *\\-\\ *[0-9]*\\ *$")){ + int first = 0; + if(value.startsWith("-")){ + first = 1; + } + first = value.indexOf("-"); + if (first != -1){ + min = value.substring(0, first); + max = value.substring(first+1); + } + } + continuousPanel.init(new JTextField(min), new JTextField(max)); + return continuousPanel; + } + public static List<String> getDiscretRangeOfValueValues(JComponent cOrigine, TopiaEntity bean){ + List<String> result = new ArrayList<String>(); + RangeOfValuesUI ui = (RangeOfValuesUI)cOrigine; + String value = ui.getFieldGearParamPossibleValue().getText(); + if (value.matches("^\\ *[0-9]*\\ *\\-\\ *[0-9]*\\ *$")){ + int first = 0; + if(value.startsWith("-")){ + first = 1; + } + first = value.indexOf("-"); + int min = 0; + int max = 0; + if (first != -1){ + min = Integer.valueOf(value.substring(0, first).trim()); + max = Integer.valueOf(value.substring(first+1).trim()); + } + for (int i = min;i <= max;i++){ + result.add(i + ""); + } + } else{ + if (value.indexOf(";") != -1){ + for (String s : value.split("\\;")){ + result.add(s); + } + } + else { + result.add(value); + } + } + return result; + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-17 09:44:29 UTC (rev 1980) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-17 13:33:34 UTC (rev 1981) @@ -36,8 +36,6 @@ <Boolean id='continueSelected' javaBean='false'/> - <Boolean id='tabVisible' javaBean='false'/> - <Boolean id='saveEnabled' javaBean='false'/> <Boolean id='existingValue' javaBean='false'/> @@ -92,10 +90,31 @@ factorName.setText(bean.toString() + "." + methodName); setContinuePossible(b); + boolean selected = EditorHelper.isContinue(cOrigine); + setContinueSelected(selected); + continueRadion.setSelected(selected); if (isContinuePossible()){ - continuousPanel = EditorHelper.getContinuousPanel(cOrigine, bean); + if (EditorHelper.isRangeOfValue(cOrigine)){ + continuousPanel = EditorHelper.getContinuousRangeOfValuePanel(cOrigine, bean); + } + else { + continuousPanel = EditorHelper.getContinuousPanel(cOrigine, bean); + } init(); } + if (!isContinueSelected()){ + int i = 0; + for (String s : EditorHelper.getDiscretRangeOfValueValues(cOrigine, bean)){ + JTextField text = new JTextField(s); + discretComponents.add(text); + tabPane.add(text, "Factor " + (i+1)); + i++; + } + } + if (continuousPanel != null){ + continuousPanel.setContinueSelected(selected); + } + setContinueSelected(EditorHelper.isContinue(cOrigine)); setSaveEnabled(!factorName.getText().equals("")); } @@ -136,14 +155,12 @@ } setContinuePossible(EditorHelper.canBeContinue(cOrigine, cache)); - setTabVisible(true); this.pack(); } setSaveEnabled(!factorName.getText().equals("")); } protected void init(){ continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); - setTabVisible(true); this.pack(); } protected JComponent getNewComponent(){ @@ -158,7 +175,6 @@ discretComponents.add(c); tabPane.add(c, "Factor " + (i+1)); } - setTabVisible(true); this.pack(); } protected FactorAction getFactorAction(){ @@ -194,7 +210,7 @@ </row> <row> <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='false' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> </cell> </row> <row> @@ -204,7 +220,7 @@ </row> <row> <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='discret' text='isisfish.factor.discret' selected='true' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + <JRadioButton id='discret' text='isisfish.factor.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> </cell> </row> <row> @@ -219,8 +235,8 @@ </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.5'> - <JTabbedPane id='tabPane' visible='{isTabVisible() && !isContinueSelected()}' enabled='{!isContinueSelected()}'/> + <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> </cell> </row> <row> @@ -229,7 +245,7 @@ </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.5'> + <cell columns='4' fill='both' weightx='1' weighty='1'> <JScrollPane> <JTextArea id='comment'/> </JScrollPane>

1 0

r1980 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/simulator resources/i18n
by chatellier＠users.labs.libre-entreprise.org 17 Mar '09

17 Mar '09

Author: chatellier Date: 2009-03-17 09:44:29 +0000 (Tue, 17 Mar 2009) New Revision: 1980 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: N'affiche pas les fichiers des resultats de l'analyse qui commence par "." Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-16 18:42:18 UTC (rev 1979) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-17 09:44:29 UTC (rev 1980) @@ -848,7 +848,7 @@ * * @param masterSensitivitySimulationName nom du prefix de toutes les simulations (without _) * - * @return les fichiers genere lors de la seconde passe + * @return les fichiers genere lors de la seconde passe (seulement ceux qui ne commence pas par ".") */ public List<File> runSensitivitySecondPass(String masterSensitivitySimulationName) { @@ -885,7 +885,7 @@ // FIXME take all files ? for(File exportFile : masterExportDirectory.listFiles()) { - if (exportFile.isFile()) { + if (exportFile.isFile() && !exportFile.getName().startsWith(".")) { result.add(exportFile); } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-16 18:42:18 UTC (rev 1979) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-17 09:44:29 UTC (rev 1980) @@ -858,6 +858,8 @@ isisfish.sensWizardPanels.validate=Validate isisfish.sensWizardPanels.values=Values isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.secondpass=Analyze results +isisfish.sensitivity.secondpass.title=Analyze results isisfish.sensitivity.title=Factors input isisfish.sensitivityChooser.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-16 18:42:18 UTC (rev 1979) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-17 09:44:29 UTC (rev 1980) @@ -858,6 +858,8 @@ isisfish.sensWizardPanels.validate=Valider isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats +isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats isisfish.sensitivity.title=S\u00E9lection des facteurs isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH

1 0