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

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

June 9, 2009

Author: chatellier Date: 2009-06-09 09:07:35 +0000 (Tue, 09 Jun 2009) New Revision: 2348 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Fix buttons activation and fields reset on cancel Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-08 17:02:31 UTC (rev 2347) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-09 09:07:35 UTC (rev 2348) @@ -31,14 +31,13 @@ import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.types.TimeUnit; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.ListSelectionEvent; import jaxx.runtime.swing.Item; -addPropertyChangeListener("bean", new PropertyChangeListener() { +addPropertyChangeListener("effortDescription", 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"); - fieldEffortDescriptionFishingOperation.setText(""); fieldEffortDescriptionFishingOperationDuration.setText(""); fieldEffortDescriptionGearsNumberPerOperation.setText(""); @@ -52,12 +51,31 @@ fieldEffortDescriptionOtherRunningCost.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"); + } } }); +fieldEffortDescriptionMetierList.addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + // active le bouton seulement si l'interface est active + // dans le cas de sensitivity par exemple + if(isActif()) { + buttonEffortDescriptionAdd.setEnabled(fieldEffortDescriptionMetierList.getSelectedIndex() != -1); + } + } +}); + +fieldEffortDescriptionEffortDescriptionList.addListSelectionListener(new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + // active le bouton seulement si l'interface est active + // dans le cas de sensitivity par exemple + if(isActif()) { + removeEffortDescriptionButton.setEnabled(fieldEffortDescriptionEffortDescriptionList.getSelectedIndex() != -1); + } + } +}); + @Override public void refresh() { SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class); @@ -76,7 +94,7 @@ getVerifier().setCancelButton(cancel); } -protected void setEffortDescriptionEffortDescriptionList(){ +protected void setEffortDescriptionEffortDescriptionList() { if (getBean().getPossibleMetiers() != null){ java.util.List<Item> items = new ArrayList<Item>(); for (EffortDescription e : getBean().getPossibleMetiers()){ @@ -85,7 +103,7 @@ fieldEffortDescriptionEffortDescriptionList.setItems(items); } } -protected void add(){ +protected void addEffortDescription() { Object value = fieldEffortDescriptionMetierList.getSelectedValue(); if (value != null){ Metier m = (Metier)value; @@ -93,7 +111,7 @@ setEffortDescriptionEffortDescriptionList(); } } -protected void remove(){ +protected void removeEffortDescription() { Object value = fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); if (value != null) { EffortDescription e = (EffortDescription)value; @@ -104,10 +122,11 @@ protected void effortDescriptionChanged() { EffortDescriptionImpl selectedEffort = (EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); setEffortDescription(selectedEffort); - getVerifier().addCurrentEntity(getEffortDescription()); - - /* NumberEditor is not working + if (getEffortDescription() != null) { + getVerifier().addCurrentEntity(getEffortDescription()); + + /* NumberEditor is not working fieldEffortDescriptionFishingOperation.init(); fieldEffortDescriptionGearsNumberPerOperation.init(); fieldEffortDescriptionCrewSize.init(); @@ -117,8 +136,8 @@ fieldEffortDescriptionCrewShareRate.init(); fieldEffortDescriptionRepairAndMaintenanceGearCost.init(); fieldEffortDescriptionLandingCosts.init(); - fieldEffortDescriptionOtherRunningCost.init(); - }*/ + fieldEffortDescriptionOtherRunningCost.init();*/ + } } ]]> </script> @@ -135,7 +154,7 @@ <Table> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id="buttonEffortDescriptionAdd" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="buttonEffortDescriptionAdd" text="isisfish.common.add" onActionPerformed='addEffortDescription()' enabled='false'/> </cell> </row> <row> @@ -311,7 +330,7 @@ <JButton id='cancel' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}' decorator='boxed'/> + <JButton id='removeEffortDescriptionButton' text="isisfish.common.remove" onActionPerformed='removeEffortDescription()' enabled='false' decorator='boxed'/> </cell> </row> </Table>

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 17:02:31 +0000 (Mon, 08 Jun 2009) New Revision: 2347 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx Log: Fix grid spaces Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-08 16:43:00 UTC (rev 2346) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-08 17:02:31 UTC (rev 2347) @@ -92,7 +92,7 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <Table> <row> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <InputOneEquationUI id='reproductionEquation' constructorParams='this' lblText='{_("isisfish.populationRecruitment.reproductionEquation")}' bean='{getBean()}' nameEquation='Reproduction' methodGet='ReproductionEquation' methodSet='EquationReproductionEquation' @@ -118,7 +118,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/> </cell> - <cell fill='both' weightx='1.0'> + <cell fill='both' weightx='1.0' weighty='0.5'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> @@ -136,7 +136,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationRecruitment.comments" enabled='{isActif()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='0.5'> + <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> <JTextArea id="fieldPopulationRecruitmentComment" text='{getBean().getRecruitmentComment()}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())'

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 16:43:00 +0000 (Mon, 08 Jun 2009) New Revision: 2346 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx Log: Make refresh() to work. Remove number editor. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-06-08 16:42:38 UTC (rev 2345) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-06-08 16:43:00 UTC (rev 2346) @@ -28,30 +28,33 @@ import jaxx.runtime.swing.editor.NumberEditor; setButtonTitle(_("isisfish.input.continuePopulations")); + 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"); fieldSpeciesName.setText(""); fieldSpeciesScientificName.setText(""); fieldSpeciesCodeRubbin.setText(""); - fieldSpeciesCEE.setModelText(0 + ""); + fieldSpeciesCEE.setText(""); fieldSpeciesComment.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"); } } }); public void refresh() { Species species = (Species)getVerifier().getEntity(Species.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((SpeciesImpl) species); - if (getBean() != null){ + + if (getBean() != null) { setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations"); - fieldSpeciesCEE.init(); + // Number Editor is not working + //fieldSpeciesCEE.init(); } } @@ -104,13 +107,13 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <NumberEditor id='fieldSpeciesCEE' constructorParams='this' +  + <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/> </cell> </row> <row>

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 16:42:38 +0000 (Mon, 08 Jun 2009) New Revision: 2345 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx Log: Put buttons on the same line 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-06-08 16:14:53 UTC (rev 2344) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-06-08 16:42:38 UTC (rev 2345) @@ -60,8 +60,6 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='save'/> </cell> - </row> - <row> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel'/> </cell>

1 0

r2344 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 16:14:53 +0000 (Mon, 08 Jun 2009) New Revision: 2344 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Fix jaxx compilation problem (du to refactoring) 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-06-08 16:01:45 UTC (rev 2343) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-06-08 16:14:53 UTC (rev 2344) @@ -161,8 +161,8 @@ 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()); + if (origine.getMetierSeasonInfo() != null){ + ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.setMetierSeasonSelected(true); ui.setActif(true); } @@ -381,9 +381,9 @@ 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); + if (origine.getMetierSeasonInfo() != null){ + ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); + ui.getMetierSeasonInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>)value); ui.setMetierSeasonSelected(true); ui.setActif(true); } @@ -473,7 +473,7 @@ result = ((SelectivityEditorUI)c).getBean().getPopulationSelectivity(); } else if (c instanceof MetierSeasonInfoSpeciesEditorUI){ - result = ((MetierSeasonInfoSpeciesEditorUI)c).getMetierInfo().getSpeciesTargetSpecies(); + result = ((MetierSeasonInfoSpeciesEditorUI)c).getMetierSeasonInfo().getSpeciesTargetSpecies(); } else if (result instanceof PopulationZonesEditorUI){ result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix();

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 16:01:45 +0000 (Mon, 08 Jun 2009) New Revision: 2343 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx Log: Fix all population refresh() methods (using setBean(null) tips) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -56,11 +56,16 @@ @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + if (getBean() != null) { // TODO : Selection equation - if (getBean() != null){ - if (getBean().getPopulationGroup() != null){ + if (getBean() != null) { + if (getBean().getPopulationGroup() != null) { jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); } setTableAgeLengthModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -30,10 +30,9 @@ import org.codelutin.math.matrix.gui.MatrixPanelListener; MatrixPanelListener listener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){ + public void matrixChanged(MatrixPanelEvent event) { + if (getBean() != null && fieldPopulationCapturability.getMatrix() != null) { getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy()); } } @@ -57,13 +56,20 @@ @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + if (getBean() != null){ - if (getBean().getCapturability() != null){ + if (getBean().getCapturability() != null) { fieldPopulationCapturability.removeMatrixPanelListener(listener); fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy()); } } + + // TODO add only once, not at all refresh fieldPopulationCapturability.addMatrixListener(listener); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -31,7 +31,12 @@ @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -56,11 +56,16 @@ @Override public void refresh() { - if (!isActif()) { + //if (!isActif()) { setPopGroupNotNull(false); - } + //} Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + if (getBean() != null) { if (getBean().getPopulationGroup() != null) { jaxx.runtime.SwingUtil.fillComboBox(populationGroupPopulationGroupComboBox, getBean().getPopulationGroup(), getPopulationGroup(), true); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -61,27 +61,37 @@ remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); } }); + public void init(PopulationSeasonInfo pi){ + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setPopInfo(null); setPopInfo((PopulationSeasonInfoImpl)pi); - populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().clone()); + populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().copy()); } + @Override public void refresh(){ Population population = getVerifier().getEntity(Population.class); + + // setBean(null); useless here setBean((PopulationImpl) population); + refreshPanel(); } + @Override public void setActionButtons() { } - public void refreshPanel(){ + + public void refreshPanel() { setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); remove.setEnabled(false); setAddButton(); - + // TODO add listener only once populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { @Override public void matrixChanged(MatrixPanelEvent arg0) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -31,13 +31,19 @@ import fr.ifremer.isisfish.entities.PopulationImpl; public void init(PopulationSeasonInfo pi) { + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setPopInfo(null); setPopInfo((PopulationSeasonInfoImpl)pi); } @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // setBean(null); is useless here setBean((PopulationImpl) population); + getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -70,9 +70,13 @@ } }); -public void init(PopulationSeasonInfo pi){ +public void init(PopulationSeasonInfo pi) { + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setPopInfo(null); setPopInfo((PopulationSeasonInfoImpl)pi); - populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone()); + + populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().copy()); } @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -70,15 +70,21 @@ } }; -public void init(PopulationSeasonInfo pi){ +public void init(PopulationSeasonInfo pi) { + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setPopInfo(null); setPopInfo((PopulationSeasonInfoImpl)pi); - populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone()); + + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); } @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + // setBean(null); is useless here setBean((PopulationImpl) population); + refreshPanel(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -48,13 +48,19 @@ @Override public void refresh() { - getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + if (getBean() != null) { setFieldPopulationMigrationSeasonChooserModel(); } useEquationChanged(); + + getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); } @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -61,6 +61,10 @@ @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(reproductionEquation); @@ -71,6 +75,8 @@ // chatellier : number editor is not working //fieldPopulationMonthGapBetweenReproRecrutement.init(); } + + // TODO add only once fieldPopulationRecruitmentDistribution.addMatrixListener(listener); } 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-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -51,6 +51,7 @@ @Override public void refresh() { + // TODO add only once matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -121,6 +121,10 @@ } Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); // Model instanciation Modified: 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 2009-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -1,4 +1,22 @@ - + <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -17,26 +35,12 @@ import org.codelutin.math.matrix.gui.MatrixPanelListener; MatrixPanelListener listener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { + public void matrixChanged(MatrixPanelEvent event) { 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"); - } - } -}); - @Override public void refresh(){ setPopulationZonesPresenceModel(); @@ -137,8 +141,6 @@ ]]> </script> <Table id='body'> - - <row> <cell fill='horizontal' weightx='0.3'> <JLabel text="isisfish.populationZones.selectPopulationAreas" enabled='{isActif()}'/> @@ -173,8 +175,8 @@ </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> + <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> </cell> </row> </Table> 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-06-08 15:38:38 UTC (rev 2342) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-06-08 16:01:45 UTC (rev 2343) @@ -31,7 +31,12 @@ @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PopulationImpl) population); + getVerifier().addCurrentPanel(popZones); }

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 15:38:38 +0000 (Mon, 08 Jun 2009) New Revision: 2342 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Bad commit (restore delete attribute) 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-06-08 15:37:31 UTC (rev 2341) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-08 15:38:38 UTC (rev 2342) @@ -34,6 +34,8 @@ import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.TripType; +protected MatrixPanelListener matrixListener; + protected int month = 0; matrixListener = new MatrixPanelListener() {

1 0

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

June 8, 2009

Author: chatellier Date: 2009-06-08 15:37:31 +0000 (Mon, 08 Jun 2009) New Revision: 2341 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Add only one matrix listener on UI (it's enough) 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-06-08 15:36:09 UTC (rev 2340) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-08 15:37:31 UTC (rev 2341) @@ -34,69 +34,60 @@ import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.TripType; -protected MatrixPanelListener matrixListener; - protected int month = 0; -protected PropertyChangeListener listener; -fieldStrategyMonthInfoProportion.addPropertyChangeListener(new PropertyChangeListener() { +matrixListener = new MatrixPanelListener() { @Override - public void propertyChange(PropertyChangeEvent evt) { - if (fieldStrategyMonthInfoProportion.getMatrix() != null) { - if (fieldStrategyMonthInfoProportion.getMatrix() != null) { - getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); - } + public void matrixChanged(MatrixPanelEvent event) { + if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { + log.debug("Matrix modified : " + fieldStrategyMonthInfoProportion.getMatrix()); + getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); } } -}); +}; +fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); @Override public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); - // add null before, for second to be considered as a changed event - // otherwize, setBean has no effect - setBean(null); + // don't use setBean(null) here setBean((StrategyImpl)strategy); if (getBean() != null) { Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); if (monthInfos.length != 0) { + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setStrategyMonthInfo(null); setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]); getVerifier().addCurrentEntity(getStrategyMonthInfo()); - } - } - 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) { - fieldStrategyMonthInfoTripType.removeActionListener(listener); - } - jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true); - for (ActionListener listener : listeners) { - fieldStrategyMonthInfoTripType.addActionListener(listener); - } - setProportionMetierMatrix(); - //fieldStrategyMonthInfoMinInactivityDays.setText( - } - else { - // don't put in addPropertyChangeListener - // if called after, remove content :( - numberOfTrips.setText(""); - fieldStrategyMonthInfoMinInactivityDays.setText(""); - fieldStrategyMonthInfoProportion.setMatrix(null); - } - matrixListener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent event) { - if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { - getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); + + 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) { + fieldStrategyMonthInfoTripType.removeActionListener(listener); + } + jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true); + for (ActionListener listener : listeners) { + fieldStrategyMonthInfoTripType.addActionListener(listener); + } + setProportionMetierMatrix(); } + else { + // don't put in addPropertyChangeListener + // if called after, remove content :( + numberOfTrips.setText(""); + fieldStrategyMonthInfoMinInactivityDays.setText(""); + fieldStrategyMonthInfoProportion.setMatrix(null); + } } - }; - fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); + } + //fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); } @Override

1 0

r2340 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . metier
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 15:36:09 +0000 (Mon, 08 Jun 2009) New Revision: 2340 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx Log: Metrier (zone and season) refactoring. Replace generic cell editor by specific tale model. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-08 15:35:11 UTC (rev 2339) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-08 15:36:09 UTC (rev 2340) @@ -22,15 +22,12 @@  <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierSeasonInfo' 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 fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Metier; @@ -38,14 +35,11 @@ import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesModel; 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; tableTargetSpecies.addMouseListener(new MouseAdapter() { @Override @@ -56,21 +50,20 @@ @Override public void refresh() { - - if (log.isDebugEnabled()) { - log.debug("Refresh called in ui : " + this); - } - getVerifier().addCurrentPanel(targetFactor); - if (getBean() != null){ + if (getBean() != null) { setTableTargetSpeciesModel(); } - else{ + else { setTargetSpeciesModel(); } setTargetSpeciesModel(); remove.setEnabled(false); setAddButton(); + + // is actif is not working for targetFactor + // maybe set to true by addCurrentPanel + targetFactor.setActif(targetSpeciesSelected); } @Override @@ -78,7 +71,7 @@ } -protected void setTargetSpeciesModel(){ +protected void setTargetSpeciesModel() { DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); java.util.List<Species> species = getRegion().getSpecies(); if (species != null){ @@ -89,47 +82,28 @@ } 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) { - java.util.List<GenericCell> species = new ArrayList <GenericCell>(); - java.util.List<Equation> equations = new ArrayList <Equation>(); - java.util.List<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(_("isisfish.metierSeasonInfoSpecies.species"), species.toArray()); - model.addColumn(_("isisfish.metierSeasonInfoSpecies.targetFactor"), equations.toArray()); - model.addColumn(_("isisfish.metierSeasonInfoSpecies.mainSpecies"), primaryCatch.toArray()); + +protected void setTableTargetSpeciesModel() { + if (getMetierSeasonInfo() != null) { + java.util.List<TargetSpecies> targetSpecies = new ArrayList<TargetSpecies>(); + for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { + getVerifier().addCurrentEntity(oneTargetSpecies); + targetSpecies.add(oneTargetSpecies); } + MetierSeasonInfoTargetSpeciesModel model = new MetierSeasonInfoTargetSpeciesModel(targetSpecies); tableTargetSpecies.setModel(model); - EquationTableEditor cellEditor = new EquationTableEditor(); - tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); + tableTargetSpecies.setDefaultRenderer(Equation.class, model); + tableTargetSpecies.setDefaultEditor(Equation.class, new EquationTableEditor()); } } + protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (getMetierInfo() != null && species != null) { + if (getMetierSeasonInfo() != null && species != null) { Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), - (MetierSeasonInfo)getMetierInfo(), + getMetierSeasonInfo(), (Species)species, selectedFormule.getName(), targetFactor.getEditor().getText(), @@ -137,25 +111,28 @@ setTableTargetSpeciesModel(); } } + protected void remove() { if (isMetierSeasonSelected()) { - Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray(); + Object[] targetSpecies = getMetierSeasonInfo().getSpeciesTargetSpecies().toArray(); Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; if (o != null) { TargetSpecies ts = (TargetSpecies)o; - getAction().removeTargetSpecies(getMetierInfo(), ts); + getAction().removeTargetSpecies(getMetierSeasonInfo(), ts); setTableTargetSpeciesModel(); } } } + protected void targetSpeciesChanged() { setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); setTableTargetSpeciesModel(); setAddButton(); } + protected void setAddButton() { - add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected()); + add.setEnabled(isMetierSeasonSelected() && isTargetSpeciesSelected()); } ]]></script> <Table id='body'> @@ -164,16 +141,16 @@ <Table> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isMetierSeasonSelected()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isMetierSeasonSelected()}'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='targetFactor' constructorParams='this' - actif='{isActif()}' + actif='{isTargetSpeciesSelected()}' lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' bean='{getBean()}' nameEquation='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' @@ -185,7 +162,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/> + <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isTargetSpeciesSelected()}'/> </cell> </row> </Table> @@ -196,19 +173,19 @@ <Table> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isMetierSeasonSelected()}'/> </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()}'/> + <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isMetierSeasonSelected()}'/> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='false'/> </cell> </row> </Table> 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-06-08 15:35:11 UTC (rev 2339) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-06-08 15:36:09 UTC (rev 2340) @@ -23,9 +23,9 @@  <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierInfo' javaBean='null'/> + <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierSeasonInfo' javaBean='null'/> - <Boolean id='metierSeasonSelected' javaBean='false'/> + <Boolean id='metierSeasonInfoSelected' javaBean='false'/> <script><![CDATA[ import fr.ifremer.isisfish.entities.Metier; @@ -62,23 +62,26 @@ protected void setSeasonModel(){ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); - if (metierSeasonInfo != null){ + if (metierSeasonInfo != null) { seasonModel.addElement(new GenericCell(" ", null, null)); for (MetierSeasonInfo m : metierSeasonInfo){ seasonModel.addElement(new GenericCell(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, MetierSeasonInfo.class)); } } fieldMetierSeasonInfo.setModel(seasonModel); + + // fix refresh() problem false, because first is null + setMetierSeasonInfoSelected(false); } -protected void metierSeasonChanged(){ - setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() != null); - if (isMetierSeasonSelected()){ +protected void metierSeasonInfoChanged() { + setMetierSeasonInfoSelected(((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue() != null); + if (isMetierSeasonInfoSelected()) { MetierSeasonInfoImpl msii = (MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); if (log.isDebugEnabled()) { log.debug("Metier season changed : " + msii); } - setMetierInfo(msii); - getVerifier().addCurrentEntity(getMetierInfo()); + setMetierSeasonInfo(msii); + getVerifier().addCurrentEntity(getMetierSeasonInfo()); } metierSeasonInfoSpeciesEditor.refresh(); } @@ -92,13 +95,13 @@ <JLabel text="isisfish.metierSeasonInfoSpecies.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonInfoChanged()' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <MetierSeasonInfoSpeciesEditorUI id='metierSeasonInfoSpeciesEditor' constructorParams='this' - bean='{getBean()}' metierInfo='{getMetierInfo()}' metierSeasonSelected='{getMetierSeasonSelected()}' + bean='{getBean()}' metierSeasonInfo='{getMetierSeasonInfo()}' metierSeasonSelected='{isMetierSeasonInfoSelected()}' actif='{isActif()}' decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-06-08 15:35:11 UTC (rev 2339) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-06-08 15:36:09 UTC (rev 2340) @@ -22,7 +22,6 @@  <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierSeasonInfo' javaBean='null'/> <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> @@ -96,9 +95,9 @@ log.debug("Refresh called in ui : " + this); } - if (!isActif()) { - setMetierSeasonInfoNotNull(false); - } + //if (!isActif()) { + setMetierSeasonInfoNotNull(false); + //} Metier metier = getVerifier().getEntity(Metier.class); // don't add setBean(null) here : useless @@ -239,7 +238,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo().getSeasonZoneComment()}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> +  + <JTextArea id="fieldMetierSeasonZoneComment" text='{jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-06-08 15:36:09 UTC (rev 2340) @@ -0,0 +1,243 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.input.metier; + +import static org.codelutin.i18n.I18n._; + +import java.awt.Checkbox; +import java.awt.Component; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.event.TableModelListener; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableModel; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.TargetSpecies; + +/** + * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}. + * + * Columns : + * <li>target species name</li> + * <li>target species equation</li> + * <li>target species primaryCatch</li> + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 8 juin 2009 $ + * By : $Author: chatellier $ + */ +public class MetierSeasonInfoTargetSpeciesModel extends AbstractTableModel implements TableCellRenderer { + + /** Log. */ + private static Log log = LogFactory.getLog(MetierSeasonInfoTargetSpeciesModel.class); + + /** serialVersionUID. */ + private static final long serialVersionUID = 3169786638868209920L; + + /** Columns names. */ + public final static String[] COLUMN_NAMES = { + _("isisfish.metierSeasonInfoSpecies.species"), + _("isisfish.metierSeasonInfoSpecies.targetFactor"), + _("isisfish.metierSeasonInfoSpecies.mainSpecies") }; + + protected List<TargetSpecies> targetSpeciesList; + + /** + * Empty constructor. + */ + public MetierSeasonInfoTargetSpeciesModel() { + this(null); + } + + /** + * Constructor with data. + * + * @param targetSpeciesList initial target species + */ + public MetierSeasonInfoTargetSpeciesModel( + List<TargetSpecies> targetSpeciesList) { + super(); + this.targetSpeciesList = targetSpeciesList; + } + + /** + * Set target species list. + * + * @param targetSpeciesList the targetSpecies to set + */ + public void setTargetSpecies(List<TargetSpecies> targetSpeciesList) { + this.targetSpeciesList = targetSpeciesList; + } + + /* + * @see javax.swing.table.TableModel#getColumnCount() + */ + @Override + public int getColumnCount() { + return COLUMN_NAMES.length; + } + + /* + * @see javax.swing.table.TableModel#getRowCount() + */ + @Override + public int getRowCount() { + int rows = 0; + if (targetSpeciesList != null) { + rows = targetSpeciesList.size(); + } + return rows; + } + + /* + * @see javax.swing.table.TableModel#getValueAt(int, int) + */ + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + + Object result = null; + + TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); + switch (columnIndex) { + case 0: + result = targetSpecies.getSpecies().getName(); + break; + case 1: + result = targetSpecies.getTargetFactorEquation(); + break; + case 2: + result = targetSpecies.getPrimaryCatch(); + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnClass(int) + */ + @Override + public Class<?> getColumnClass(int columnIndex) { + + Class<?> result = null; + + switch (columnIndex) { + case 0: + result = String.class; + break; + case 1: + result = Equation.class; + break; + case 2: + result = Boolean.class; + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnName(int) + */ + @Override + public String getColumnName(int columnIndex) { + return COLUMN_NAMES[columnIndex]; + } + + /* + * @see javax.swing.table.TableModel#isCellEditable(int, int) + */ + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex > 0; + } + + /* + * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) + */ + @Override + public void setValueAt(Object value, int rowIndex, int columnIndex) { + + if (log.isDebugEnabled()) { + log.debug("Cell edition (column " + columnIndex + ") = " + value); + } + + TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); + switch (columnIndex) { + case 1: + Equation eq = (Equation)value; + // two events for event to be fired + targetSpecies.setTargetFactorEquation(null); + targetSpecies.setTargetFactorEquation(eq); + break; + case 2: + Boolean bValue = (Boolean)value; + targetSpecies.setPrimaryCatch(bValue); + break; + default: + throw new IndexOutOfBoundsException("Can't edit column " + columnIndex); + } + + } + + /* + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) + */ + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + + Component c = null; + switch (column) { + case 0: + c = new JLabel(value.toString()); + break; + case 1: + Equation equation = (Equation)value; + c = new JButton(equation.getName() + "(" + equation.getCategory() + ")"); + break; + case 2: + Boolean bValue = (Boolean)value; + c = new JCheckBox(); + ((Checkbox)c).setState(bValue); + break; + default: + throw new IndexOutOfBoundsException("No such column " + column); + } + return c; + } + +}

1 0

r2339 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 15:35:11 +0000 (Mon, 08 Jun 2009) New Revision: 2339 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java Log: Always set text even if NPE happen Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 15:34:02 UTC (rev 2338) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 15:35:11 UTC (rev 2339) @@ -20,22 +20,26 @@ import static org.codelutin.i18n.I18n._; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; - -import javax.swing.JButton; -import javax.swing.JTable; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; -import javax.swing.table.TableCellEditor; import java.awt.Component; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.EventObject; import java.util.HashSet; import java.util.Iterator; +import javax.swing.JButton; +import javax.swing.JTable; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; +import javax.swing.table.TableCellEditor; + +import org.codelutin.widget.SwingUtil; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; + /** * Equation table cell editor. * @@ -61,7 +65,9 @@ public EquationTableEditor() { addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - getFrame().setVisible(true); + Window editorFrame = getFrame(); + SwingUtil.center(editorFrame); + editorFrame.setVisible(true); } }); } @@ -87,11 +93,7 @@ boolean isSelected, int row, int column) { equation = (Equation) value; - String name = _("isisfish.common.empty"); - if (equation != null) { - name = equation.getName(); - } - this.setText(name); + this.setText(equation.getName()); try { getFrame().setEquation(equation.getCategory(), equation.getName(), equation.getJavaInterface(), equation.getContent());

1 0