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

r2296 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 29, 2009

May 29, 2009

Author: chatellier Date: 2009-05-29 13:56:11 +0000 (Fri, 29 May 2009) New Revision: 2296 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java Log: Don't use fqn class name Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:55:35 UTC (rev 2295) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:56:11 UTC (rev 2296) @@ -55,7 +55,7 @@ public boolean allIsSaved() { boolean canExit = true; - for (fr.ifremer.isisfish.ui.SaveVerifier s : verifiers) { + for (SaveVerifier s : verifiers) { int reponse = s.checkEdit(); // return false, if at least one verifier

1 0

r2295 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 29, 2009

May 29, 2009

Author: chatellier Date: 2009-05-29 13:55:35 +0000 (Fri, 29 May 2009) New Revision: 2295 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java Log: Return false, if at least one verifier return cancel option Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:48:35 UTC (rev 2294) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:55:35 UTC (rev 2295) @@ -24,37 +24,48 @@ import javax.swing.JOptionPane; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - /** * WelcomeSaveVerifier. * * @author letellier - * @version $Revision: 2088 $ + * @version $Revision$ * - * Last update: $Date: 2009-04-08 12:24:31 +0200 (mer. 08 avril 2009) $ - * by : $Author: chatellier $ + * Last update: $Date$ + * by : $Author$ */ public class WelcomeSaveVerifier { + /** Save verifier list. */ protected List<SaveVerifier> verifiers = new ArrayList<SaveVerifier>(); - public void addSaveVerifier(InputSaveVerifier inputVerifier) { - verifiers.add(inputVerifier); + /** + * Add new verifier to manage. + * + * @param saveVerifier new verifier + */ + public void addSaveVerifier(SaveVerifier saveVerifier) { + verifiers.add(saveVerifier); } + /** + * Check that all 'input' opened interface has no non-saved modification. + * + * @return <tt>true> if interface can be closed + */ public boolean allIsSaved() { - boolean exit = true; - int responce = JOptionPane.CANCEL_OPTION; + boolean canExit = true; + for (fr.ifremer.isisfish.ui.SaveVerifier s : verifiers) { - responce = s.checkEdit(); + int reponse = s.checkEdit(); + + // return false, if at least one verifier + // return cancel option + if (reponse == JOptionPane.CANCEL_OPTION) { + canExit = false; + } } - //boolean exit = checkEdit(event, component); - if (responce == JOptionPane.OK_OPTION) { - } else if (responce == JOptionPane.CANCEL_OPTION) { - exit = false; - } - return exit; + + return canExit; } } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision

1 0

r2294 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 29, 2009

May 29, 2009

Author: chatellier Date: 2009-05-29 13:48:35 +0000 (Fri, 29 May 2009) New Revision: 2294 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: There is no 'OK' option, it's YES ! 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-05-29 13:46:15 UTC (rev 2293) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-29 13:48:35 UTC (rev 2294) @@ -140,7 +140,7 @@ responce = askUser(_("isisfish.message.page.modified")); if (responce == JOptionPane.NO_OPTION) { topiaCancel(); - } else if (responce == JOptionPane.OK_OPTION) { + } else if (responce == JOptionPane.YES_OPTION) { topiaSave(); } }

1 0

r2293 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 29, 2009

May 29, 2009

Author: chatellier Date: 2009-05-29 13:46:15 +0000 (Fri, 29 May 2009) New Revision: 2293 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java Log: Add documentation on SaveVerifier. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2009-05-29 13:32:33 UTC (rev 2292) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2009-05-29 13:46:15 UTC (rev 2293) @@ -20,9 +20,28 @@ package fr.ifremer.isisfish.ui; /** + * Isis interface modification verifier. + * + * Check that unsaved datas need to be saved. + * + * @author letellier + * + * @version $Revision$ * - * @author letellier + * Last update: $Date$ + * by : $Author$ */ public interface SaveVerifier { + + /** + * Tell verifier to check for unsaved modification. + * + * Then return user choice ({@link javax.swing.JOptionPane} type). + * + * @return user JOptionPane response + * @see javax.swing.JOptionPane#YES_OPTION + * @see javax.swing.JOptionPane#NO_OPTION + * @see javax.swing.JOptionPane#CANCEL_OPTION + */ public int checkEdit(); } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision

1 0

r2292 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 29, 2009

May 29, 2009

Author: chatellier Date: 2009-05-29 13:32:33 +0000 (Fri, 29 May 2009) New Revision: 2292 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Ajout d'une bordure avec les noms des mois pour les strategies Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-05-28 17:24:56 UTC (rev 2291) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-05-29 13:32:33 UTC (rev 2292) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.types.Month; +import org.apache.commons.lang.StringUtils; public void refresh() { getVerifier().setSaveButton(save); @@ -51,60 +38,69 @@ strategyOctober.init(9); strategyNovember.init(10); strategyDecember.init(11); - getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); + getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, + strategyApril, strategyMay, strategyJune, + strategyJuly, strategyAugust, strategySeptember, + strategyOctober, strategyNovember, strategyDecember); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> <row> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyJanuary' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyJanuary' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.january")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyFebuary' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyFebuary' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.february")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyMarch' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyMarch' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.march")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyApril' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyApril' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.april")))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyMay' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyMay' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.may")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyJune' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyJune' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.june")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyJuly' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyJuly' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.july")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyAugust' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyAugust' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.august")))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategySeptember' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategySeptember' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.september")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyOctober' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyOctober' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.october")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyNovember' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyNovember' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.november")))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3'> - <StrategyOneMonthInfoUI id='strategyDecember' constructorParams='this'/> + <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <StrategyOneMonthInfoUI id='strategyDecember' constructorParams='this' + border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.december")))}' /> </cell> </row> </Table> - -  <Table constraints='BorderLayout.SOUTH'> <row> <cell fill='horizontal' weightx='0.5'> 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-05-28 17:24:56 UTC (rev 2291) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-05-29 13:32:33 UTC (rev 2292) @@ -1,7 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -40,38 +26,32 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfoImpl id='strategyMonthInfo' javaBean='null'/> <script><![CDATA[ - -import fr.ifremer.isisfish.entities.StrategyMonthInfo; import fr.ifremer.isisfish.entities.StrategyMonthInfoImpl; import fr.ifremer.isisfish.entities.Strategy; import fr.ifremer.isisfish.entities.StrategyImpl; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; import jaxx.runtime.swing.editor.NumberEditor; -import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -MatrixPanelListener matrixListener = null; +protected MatrixPanelListener matrixListener; -int month = 0; -PropertyChangeListener listener = null; +protected int month = 0; +protected PropertyChangeListener listener; addPropertyChangeListener("strategyMonthInfo", 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(""); numberOfTrips.setText(""); fieldStrategyMonthInfoMinInactivityDays.setModelText(""); fieldStrategyMonthInfoProportion.setMatrix(null); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); + fieldStrategyMonthInfoProportion.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -82,47 +62,54 @@ } } }); + public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); - if (getBean() != null){ + if (getBean() != null) { Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); - if (monthInfos.length != 0){ + if (monthInfos.length != 0) { setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]); getVerifier().addCurrentEntity(getStrategyMonthInfo()); } } - if (getStrategyMonthInfo() != null){ + if (getStrategyMonthInfo() != null) { numberOfTrips.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); fieldStrategyMonthInfoProportion.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); fieldStrategyMonthInfoMinInactivityDays.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); ActionListener[] listeners = fieldStrategyMonthInfoTripType.getActionListeners(); - for (ActionListener listener : listeners){ + for (ActionListener listener : listeners) { fieldStrategyMonthInfoTripType.removeActionListener(listener); } jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true); - for (ActionListener listener : listeners){ + for (ActionListener listener : listeners) { fieldStrategyMonthInfoTripType.addActionListener(listener); } - setMatrix(); + setProportionMetierMatrix(); fieldStrategyMonthInfoMinInactivityDays.init(); } matrixListener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null){ + public void matrixChanged(MatrixPanelEvent event) { + if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); } } }; fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); } -public void init(int m){ + +public void init(int m) { month = m; } -protected void setMatrix(){ - fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()); + +protected void setProportionMetierMatrix() { + if (getStrategyMonthInfo().getProportionMetier() != null) { + fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getProportionMetier().copy()); + } + else { + fieldStrategyMonthInfoProportion.setMatrix(null); + } } ]]></script> <Table id='body'>

1 0

r2291 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 28, 2009

May 28, 2009

Author: chatellier Date: 2009-05-28 17:24:56 +0000 (Thu, 28 May 2009) New Revision: 2291 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Remove NumberEditor (bindings are not working) 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-05-28 15:06:54 UTC (rev 2290) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-05-28 17:24:56 UTC (rev 2291) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationGroupImpl id='populationGroup' javaBean='null'/> <Boolean id='popGroupNotNull' javaBean='false'/> @@ -47,67 +33,73 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import org.codelutin.math.matrix.AbstractMatrixND; import org.codelutin.math.matrix.MatrixND; -import jaxx.runtime.swing.editor.NumberEditor; addPropertyChangeListener("populationGroup", 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(""); fieldPopulationGroupMeanWeight.setText(""); fieldPopulationGroupPrice.setText(""); - fieldPopulationGroupReproductionRate.setModelText(""); - fieldPopulationGroupAge.setModelText(""); - fieldPopulationGroupMinLength.setModelText(""); - fieldPopulationGroupMaxLength.setModelText(""); + fieldPopulationGroupReproductionRate.setText(""); + fieldPopulationGroupAge.setText(""); + fieldPopulationGroupMinLength.setText(""); + fieldPopulationGroupMaxLength.setText(""); fieldPopulationGroupComment.setText(""); fieldPopulationGroupNaturalDeathRate.setMatrix(null); setPopGroupNotNull(false); } 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(){ - if (!isActif()){ +public void refresh() { + if (!isActif()) { setPopGroupNotNull(false); } getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - if (getBean() != null){ - if (getBean().getPopulationGroup() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), getPopulationGroup(), true); + if (getBean() != null) { + if (getBean().getPopulationGroup() != null) { + jaxx.runtime.SwingUtil.fillComboBox(populationGroupPopulationGroupComboBox, getBean().getPopulationGroup(), getPopulationGroup(), true); } } } -protected void setMatrix(){ - fieldPopulationGroupNaturalDeathRate.setMatrix(((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())); + +protected void setNaturalDeathRateMatrix() { + Population population = getBean(); + AbstractMatrixND naturalDeathRateMatrix = (AbstractMatrixND)population.getNaturalDeathRateMatrix(); + + // TODO what is this code for ??? + MatrixND naturalDeathRateMatrix2 = naturalDeathRateMatrix.getSubMatrixOnSemantic(0, getPopulationGroup()); + fieldPopulationGroupNaturalDeathRate.setMatrix(naturalDeathRateMatrix2); } -protected void groupChanged(){ - if (fieldPopulationGroupPopulationGroup.getSelectedItem() != null){ - setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem()); - getVerifier().addCurrentEntity(getPopulationGroup()); - setMatrix(); + +/** + * Called on PopulationGroup combo box selection. + */ +protected void populationGroupChanged() { + PopulationGroup selectedPopulationGroup = (PopulationGroup)populationGroupPopulationGroupComboBox.getSelectedItem(); + if (selectedPopulationGroup != null) { + setPopulationGroup((PopulationGroupImpl)selectedPopulationGroup); + getVerifier().addCurrentEntity(selectedPopulationGroup); + setNaturalDeathRateMatrix(); + + // init number editor (not working on bindings) + /*fieldPopulationGroupReproductionRate.init(); + fieldPopulationGroupAge.init(); + fieldPopulationGroupMinLength.init(); + fieldPopulationGroupMaxLength.init();*/ + setPopGroupNotNull(true); - if (getPopulationGroup() != null){ - fieldPopulationGroupReproductionRate.init(); - fieldPopulationGroupAge.init(); - fieldPopulationGroupMinLength.init(); - fieldPopulationGroupMaxLength.init(); - } } - else{ + else { setPopGroupNotNull(false); } - - } - ]]> </script> <Table id='body'> @@ -116,7 +108,7 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='groupChanged()' enabled='{isActif()}'/> + <JComboBox id='populationGroupPopulationGroupComboBox' onActionPerformed='populationGroupChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -124,7 +116,8 @@ <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()}' decorator='boxed'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' + editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -132,7 +125,8 @@ <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'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' + editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -150,13 +144,13 @@ <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldPopulationGroupReproductionRate' constructorParams='this' +  + <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/--> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> </cell> </row> <row> @@ -164,13 +158,13 @@ <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldPopulationGroupAge' constructorParams='this' +  + <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/--> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> </cell> </row> <row> @@ -178,24 +172,24 @@ <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <NumberEditor id='fieldPopulationGroupMinLength' constructorParams='this' +  + <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' toolTipText="minimum length" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/--> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> </cell> <cell fill='both' weightx='0.5'> - <NumberEditor id='fieldPopulationGroupMaxLength' constructorParams='this' +  + <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' toolTipText="maximum length" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/--> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> </cell> </row> <row>

1 0

r2290 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . actions
by bpoussin＠users.labs.libre-entreprise.org May 28, 2009

May 28, 2009

Author: bpoussin Date: 2009-05-28 15:06:54 +0000 (Thu, 28 May 2009) New Revision: 2290 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java Log: ajout de l'aide pour la ligne de commande Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-27 17:01:22 UTC (rev 2289) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-28 15:06:54 UTC (rev 2290) @@ -840,7 +840,7 @@ * * Set it protected to force getOption() call. */ - protected static enum Option { + public static enum Option { COMPILATION_DIRECTORY("compilation.directory", _("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), JAVADOC_DIRECTORY("javadoc.directory", _("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-05-27 17:01:22 UTC (rev 2289) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-05-28 15:06:54 UTC (rev 2290) @@ -29,6 +29,7 @@ import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.vcs.VCS; +import java.util.Arrays; /** * @@ -51,6 +52,16 @@ static public void help() { System.out.println("Usage: isis-fish [-h]"); + System.out.println("Options (set with --option <key> <value>:"); + for (IsisConfig.Option o : IsisConfig.Option.values()) { + System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.description); + } + + System.out.println("Actions:"); + for (IsisConfig.Action a : IsisConfig.Action.values()) { + System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); + } + System.exit(0); } public void chekoutMavenFile() throws Exception {

1 0

r2289 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 17:01:22 +0000 (Wed, 27 May 2009) New Revision: 2289 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Log: Switch la matric a chaque clic spacialise/non spacialise Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 16:37:08 UTC (rev 2288) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 17:01:22 UTC (rev 2289) @@ -67,8 +67,8 @@ lengthChangeMatrix = popInfo.unspacializeLengthChangeMatrix(lengthChangeMatrix); } else { lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); - popInfo.setLengthChangeMatrix(lengthChangeMatrix); } + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } } catch(Exception eee) { if (log.isErrorEnabled()) {

1 0

r2288 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 16:37:08 +0000 (Wed, 27 May 2009) New Revision: 2288 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Log: Fix switch to non spacialized event triggered at UI init. Improve jaxx code. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 14:54:20 UTC (rev 2287) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 16:37:08 UTC (rev 2288) @@ -1,13 +1,30 @@ - + + <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='populationSeasonInfo' javaBean='null'/> <Boolean id='popSeasonInfoNotNull' javaBean='false'/> - <Boolean id='ageGroupType' javaBean='false'/> <script><![CDATA[ @@ -19,57 +36,66 @@ import org.codelutin.math.matrix.gui.MatrixPanelListener; import jaxx.runtime.swing.ErrorDialogUI; -protected MatrixPanelListener listener = null; +protected MatrixPanelListener matrixPanelListener; -listener = new MatrixPanelListener() { - +matrixPanelListener = new MatrixPanelListener() { @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + public void matrixChanged(MatrixPanelEvent event) { + if (getPopulationSeasonInfo() != null && matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { + // must be a copy for fire event + MatrixND lengthChangeMatrix = matrixPanelPopulationSeasonLengthChange.getMatrix().copy(); + getPopulationSeasonInfo().setLengthChangeMatrix(lengthChangeMatrix); } } }; -public void refresh(){ - fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); + +public void refresh() { + matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener); } -public void spacialized(){ - getPopulationSeasonInfo().setSimpleLengthChangeMatrix(labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()); + +/** + * Called on spacialized radio button change. + */ +protected void spacializedActionPerformed() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + boolean spacializedSelection = radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected(); + popInfo.setSimpleLengthChangeMatrix(spacializedSelection); try { - MatrixND mat = popInfo.getLengthChangeMatrix(); - if (mat != null){ + MatrixND lengthChangeMatrix = popInfo.getLengthChangeMatrix(); + if (lengthChangeMatrix != null) { if (popInfo.getSimpleLengthChangeMatrix()) { - mat = popInfo.unspacializeLengthChangeMatrix(mat); + lengthChangeMatrix = popInfo.unspacializeLengthChangeMatrix(lengthChangeMatrix); } else { - mat = popInfo.spacializeLengthChangeMatrix(mat); - popInfo.setLengthChangeMatrix(mat); + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } } - }catch(Exception eee){ - log.error("Can't (un)spacialize Matrix Change Of Group", eee); + } catch(Exception eee) { + if (log.isErrorEnabled()) { + log.error("Can't (un)spacialize Matrix Change Of Group", eee); + } ErrorDialogUI.showError(eee); } } -public void computeMatrixChangeOfGroup(){ +protected void computeMatrixChangeOfGroup() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); - MatrixND mat = popInfo.computeLengthChangeMatrix(); - if(!popInfo.getSimpleLengthChangeMatrix()){ - mat = popInfo.spacializeLengthChangeMatrix(mat); + MatrixND lengthChangeMatrix = popInfo.computeLengthChangeMatrix(); + if (!popInfo.getSimpleLengthChangeMatrix()){ + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } - popInfo.setLengthChangeMatrix(mat); + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } -public void showSpacializedMatrixChangeOfGroup(){ +protected void showSpacializedMatrixChangeOfGroup() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); - MatrixND mat = popInfo.getLengthChangeMatrix(); - if(popInfo.getSimpleLengthChangeMatrix()){ - mat = popInfo.spacializeLengthChangeMatrix(mat); + MatrixND lengthChangeMatrix = popInfo.getLengthChangeMatrix(); + if (popInfo.getSimpleLengthChangeMatrix()){ + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } JAXXMatrixEditor panel = new JAXXMatrixEditor(false, 800, 300); - panel.setMatrix(mat); - JOptionPane.showMessageDialog(null, panel, _("isisfish.message.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); + panel.setMatrix(lengthChangeMatrix); + JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); } ]]></script> @@ -79,19 +105,20 @@ <Panel/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="labelPopulationSeasonGroupChangeLengthNoSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + <JRadioButton id="radioPopulationSeasonGroupChangeLengthNoSpacialized" + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - text="isisfish.populationSeasons.noSpacialized" decorator='boxed' - enabled='{isPopSeasonInfoNotNull()}' onItemStateChanged='spacialized()' - visible='{isAgeGroupType()}'/> + enabled='{isPopSeasonInfoNotNull()}' + text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="labelPopulationSeasonGroupChangeLengthSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + <JRadioButton id="radioPopulationSeasonGroupChangeLengthSpacialized" + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - text="isisfish.populationSeasons.spacialized" enabled='{isPopSeasonInfoNotNull()}' - visible='{isAgeGroupType()}' decorator='boxed'/> + enabled='{isPopSeasonInfoNotNull()}' + text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> <row> @@ -103,8 +130,8 @@ enabled='{isPopSeasonInfoNotNull()}' onActionPerformed='computeMatrixChangeOfGroup()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="labelPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" - enabled='{labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' + <JButton id="buttonPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" + enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' onActionPerformed='showSpacializedMatrixChangeOfGroup()' visible='{isAgeGroupType()}'/> </cell> @@ -114,10 +141,11 @@ <Panel/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' - visible='{isAgeGroupType()}'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='matrixPanelPopulationSeasonLengthChange' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' + enabled='{isPopSeasonInfoNotNull()}' + _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> </Table>

1 0

r2287 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 14:54:20 +0000 (Wed, 27 May 2009) New Revision: 2287 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Remove space in i18n key Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-27 14:26:59 UTC (rev 2286) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-27 14:54:20 UTC (rev 2287) @@ -218,7 +218,7 @@ libLogLevel, simThread.getName()); } catch (Exception e) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.add.logger.simulation ", e)); + log.warn(_("isisfish.error.add.logger.simulation", e)); } } try {

1 0