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

r3309 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 12:59:19 +0000 (Mon, 02 May 2011) New Revision: 3309 Log: Remove all getOldValue on bean listener (don't work) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) @@ -57,7 +57,7 @@ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { MetierListModel metierModel = (MetierListModel)fieldEffortDescriptionMetierList.getModel(); - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { metierModel.setMetiers(null); } if (evt.getNewValue() != null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) @@ -49,7 +49,7 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { fieldPopulationBasicsName.setText(""); fieldPopulationBasicsGeographicID.setText(""); fieldPopulationBasicsNbClasses.setText(""); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) @@ -51,7 +51,7 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { populationMigrationMigrationTable.setMatrix(null); } if (evt.getNewValue() != null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) @@ -44,7 +44,7 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { fieldPopulationMonthGapBetweenReproRecrutement.setText(""); fieldPopulationRecruitmentComment.setText(""); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-05-02 12:59:19 UTC (rev 3309) @@ -48,7 +48,7 @@ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { fieldTripTypeName.setText(""); fieldTripTypeDuration.setText(""); fieldTripTypeMinTimeBetweenTrip.setText("");

1 0

r3308 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 08:48:23 +0000 (Mon, 02 May 2011) New Revision: 3308 Log: Hack for equation activation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-05-02 08:45:04 UTC (rev 3307) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-05-02 08:48:23 UTC (rev 3308) @@ -153,7 +153,7 @@ <cell columns="2" fill='both' weightx='1.0' weighty='0.5'> <InputOneEquationUI id="strategyInactivity" constructorParams='this' text='isisfish.strategy.inactivity' - active="{isActive() && getBean().getInactivityEquationUsed()}" + active="{isActive() && getBean() != null && bean.getInactivityEquationUsed()}" bean='{getBean()}' formuleCategory='Inactivity' beanProperty='InactivityEquation' clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}' decorator='boxed' _sensitivityBean='{Strategy.class}' _sensitivityMethod='"Inactivity"'/>

1 0

r3307 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: chatellier Date: 2011-05-02 08:45:04 +0000 (Mon, 02 May 2011) New Revision: 3307 Log: Fix field activation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-04-29 16:09:06 UTC (rev 3306) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-05-02 08:45:04 UTC (rev 3307) @@ -58,17 +58,7 @@ addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - fieldEffortDescriptionFishingOperation.setText(""); - fieldEffortDescriptionFishingOperationDuration.setText(""); - fieldEffortDescriptionGearsNumberPerOperation.setText(""); - fieldEffortDescriptionCrewSize.setText(""); - fieldEffortDescriptionUnitCostOfFishing.setText(""); - fieldEffortDescriptionFixedCrewSalary.setText(""); - fieldEffortDescriptionCrewFoodCost.setText(""); - fieldEffortDescriptionCrewShareRate.setText(""); - fieldEffortDescriptionRepairAndMaintenanceGearCost.setText(""); - fieldEffortDescriptionLandingCosts.setText(""); - fieldEffortDescriptionOtherRunningCost.setText(""); + setEffortDescription(null); } if (evt.getNewValue() != null) { EffortDescriptionListModel model = new EffortDescriptionListModel(); @@ -84,7 +74,17 @@ addPropertyChangeListener(PROPERTY_EFFORT_DESCRIPTION, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - + fieldEffortDescriptionFishingOperation.setText(""); + fieldEffortDescriptionFishingOperationDuration.setText(""); + fieldEffortDescriptionGearsNumberPerOperation.setText(""); + fieldEffortDescriptionCrewSize.setText(""); + fieldEffortDescriptionUnitCostOfFishing.setText(""); + fieldEffortDescriptionFixedCrewSalary.setText(""); + fieldEffortDescriptionCrewFoodCost.setText(""); + fieldEffortDescriptionCrewShareRate.setText(""); + fieldEffortDescriptionRepairAndMaintenanceGearCost.setText(""); + fieldEffortDescriptionLandingCosts.setText(""); + fieldEffortDescriptionOtherRunningCost.setText(""); } if (evt.getNewValue() != null) { // FIX non working binding in jaxx 2.4.1

1 0

r3306 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 16:09:06 +0000 (Fri, 29 Apr 2011) New Revision: 3306 Log: Fix non working binding Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-04-29 15:49:00 UTC (rev 3305) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-04-29 16:09:06 UTC (rev 3306) @@ -57,7 +57,7 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { fieldEffortDescriptionFishingOperation.setText(""); fieldEffortDescriptionFishingOperationDuration.setText(""); fieldEffortDescriptionGearsNumberPerOperation.setText(""); @@ -81,6 +81,19 @@ } } }); + addPropertyChangeListener(PROPERTY_EFFORT_DESCRIPTION, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + + } + if (evt.getNewValue() != null) { + // FIX non working binding in jaxx 2.4.1 + if (getEffortDescription().getFishingOperationDuration() == null) { + fieldEffortDescriptionFishingOperationDuration.setText(""); + } + } + } + }); } /*public void refresh() {

1 0

r3305 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 15:49:00 +0000 (Fri, 29 Apr 2011) New Revision: 3305 Log: Fix activation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-29 15:27:13 UTC (rev 3304) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-29 15:49:00 UTC (rev 3305) @@ -165,7 +165,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='technicalEfficiency' constructorParams='this' - text='isisfish.setOfVessels.technicalEfficiency' + text='isisfish.setOfVessels.technicalEfficiency' active='{isActive()}' bean='{getBean()}' formuleCategory='TechnicalEfficiency' beanProperty='TechnicalEfficiencyEquation' clazz='{fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class}' decorator='boxed' _sensitivityBean='{SetOfVessels.class}' _sensitivityMethod='"TechnicalEfficiencyEquation"'/>

1 0

r3304 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 15:27:13 +0000 (Fri, 29 Apr 2011) New Revision: 3304 Log: Fix NPE Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-29 15:04:24 UTC (rev 3303) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-29 15:27:13 UTC (rev 3304) @@ -186,9 +186,11 @@ ZoneListModel model = new ZoneListModel(allZones); metierZones.setModel(model); // restore selection - for (Zone zone : metierSeasonInfo.getZone()) { - int index = allZones.indexOf(zone); - metierZones.getSelectionModel().addSelectionInterval(index, index); + if (metierSeasonInfo.getZone() != null) { + for (Zone zone : metierSeasonInfo.getZone()) { + int index = allZones.indexOf(zone); + metierZones.getSelectionModel().addSelectionInterval(index, index); + } } for (ListSelectionListener listener : listeners) {

1 0

r3303 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 15:04:24 +0000 (Fri, 29 Apr 2011) New Revision: 3303 Log: Fix binding Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-04-29 15:04:04 UTC (rev 3302) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-04-29 15:04:24 UTC (rev 3303) @@ -248,13 +248,13 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='save' decorator='boxed' text="isisfish.common.save" - enabled="{validator.isValid() && validator.isChanged()}" + enabled="{changeModel.isValid() && changeModel.isChanged()}" onActionPerformed="getSaveVerifier().save();validator.setChanged(false);validatorGroup.setChanged(false)"/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' decorator='boxed' text="isisfish.common.cancel" - enabled="{validator.isChanged()}" + enabled="{changeModel.isChanged()}" onActionPerformed="getSaveVerifier().cancel()"/> </cell> </row>

1 0

r3302 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 15:04:04 +0000 (Fri, 29 Apr 2011) New Revision: 3302 Log: Fix OnValueChanged Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-04-29 13:13:17 UTC (rev 3301) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-04-29 15:04:04 UTC (rev 3302) @@ -28,17 +28,20 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Zone; - fr.ifremer.isisfish.ui.input.model.ZoneListModel; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - org.nuiton.math.matrix.gui.MatrixPanelListener; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Zone + fr.ifremer.isisfish.ui.input.model.ZoneListModel + org.nuiton.math.matrix.gui.MatrixPanelEvent + org.nuiton.math.matrix.gui.MatrixPanelListener + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + java.util.List java.util.ArrayList java.awt.Dimension </import> <script><![CDATA[ +protected boolean init = false; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -49,10 +52,12 @@ setFieldPopulationMappingZoneReproZoneRecru(); } if (evt.getNewValue() != null) { + init = true; setPopulationZonesPresenceModel(); setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); setFieldPopulationMappingZoneReproZoneRecru(); + init = false; } } }); @@ -62,7 +67,7 @@ getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix().clone()); } -/*public void refresh(){ +/*public void refresh() { setPopulationZonesPresenceModel(); setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); @@ -71,26 +76,26 @@ //fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); }*/ -protected void setFieldPopulationMappingZoneReproZoneRecru(){ - if (getBean() != null){ - if (getBean().getMappingZoneReproZoneRecru() != null){ +protected void setFieldPopulationMappingZoneReproZoneRecru() { + if (getBean() != null) { + if (getBean().getMappingZoneReproZoneRecru() != null) { fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy()); } } } -protected void setPopulationZonesPresenceModel(){ - if (getBean() != null){ +protected void setPopulationZonesPresenceModel() { + if (getBean() != null) { java.util.List<Zone> zones = getFisheryRegion().getZone(); setModel(zones, getBean().getPopulationZone(), populationZonesPresence); } } -protected void setFieldPopulationZonesReproductionModel(java.util.List<Zone> zones){ - if (getBean() != null){ +protected void setFieldPopulationZonesReproductionModel(List<Zone> zones) { + if (getBean() != null) { setModel(zones, getBean().getReproductionZone(), fieldPopulationZonesReproduction); } } -protected void setFieldPopulationZonesRecruitmentModel(java.util.List<Zone> zones){ - if (getBean() != null){ +protected void setFieldPopulationZonesRecruitmentModel(List<Zone> zones) { + if (getBean() != null) { setModel(zones, getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); } } @@ -99,7 +104,7 @@ * Change model of {@code associatedList} with all available zones, but keep * selection with {@code selectedZones}. */ -protected void setModel(java.util.List<Zone> availableZones, java.util.List<Zone> selectedZones, JList associatedList){ +protected void setModel(List<Zone> availableZones, List<Zone> selectedZones, JList associatedList) { ZoneListModel zoneModel = new ZoneListModel(availableZones); associatedList.setModel(zoneModel); @@ -111,27 +116,36 @@ } } } -protected void presenceChanged(){ - getBean().setPopulationZone(getSelectedValues(populationZonesPresence)); - setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); - setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); - setFieldPopulationMappingZoneReproZoneRecru(); + +protected void presenceChanged() { + if (!init) { + getBean().setPopulationZone(getSelectedValues(populationZonesPresence)); + setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); + setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); + setFieldPopulationMappingZoneReproZoneRecru(); + } } -protected void reproductionChanged(){ - getBean().setReproductionZone(getSelectedValues(fieldPopulationZonesReproduction)); - setFieldPopulationMappingZoneReproZoneRecru(); + +protected void reproductionChanged() { + if (!init) { + getBean().setReproductionZone(getSelectedValues(fieldPopulationZonesReproduction)); + setFieldPopulationMappingZoneReproZoneRecru(); + } } -protected void recruitementChanged(){ - getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesRecruitment)); - setFieldPopulationMappingZoneReproZoneRecru(); + +protected void recruitementChanged() { + if (!init) { + getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesRecruitment)); + setFieldPopulationMappingZoneReproZoneRecru(); + } } /** * Get selected values for components as list. */ -protected java.util.List<Zone> getSelectedValues(JList component){ +protected List<Zone> getSelectedValues(JList component) { Object[] selectedValues = component.getSelectedValues(); - java.util.List<Zone> selectedZone = new ArrayList<Zone>(); + List<Zone> selectedZone = new ArrayList<Zone>(); for (Object value : selectedValues) { selectedZone.add((Zone)value); }

1 0

r3301 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 13:13:17 +0000 (Fri, 29 Apr 2011) New Revision: 3301 Log: OnValueChanged !!! (ctrl+a marche pas) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-04-29 13:06:59 UTC (rev 3300) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-04-29 13:13:17 UTC (rev 3301) @@ -155,17 +155,17 @@ <row> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="populationZonesPresence" onMouseClicked='presenceChanged()' enabled='{isActive()}'/> + <JList id="populationZonesPresence" onValueChanged='presenceChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesReproduction" onMouseClicked='reproductionChanged()' enabled='{isActive()}'/> + <JList id="fieldPopulationZonesReproduction" onValueChanged='reproductionChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> <cell fill='both' weightx='0.3' weighty='0.5'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="fieldPopulationZonesRecruitment" onMouseClicked='recruitementChanged()' enabled='{isActive()}'/> + <JList id="fieldPopulationZonesRecruitment" onValueChanged='recruitementChanged()' enabled='{isActive()}'/> </JScrollPane> </cell> </row>

1 0

r3300 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org April 29, 2011

April 29, 2011

Author: chatellier Date: 2011-04-29 13:06:59 +0000 (Fri, 29 Apr 2011) New Revision: 3300 Log: Hack pour la creation des especes (probleme de mis ?\195?\160 jour de l'arbre) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-29 13:05:47 UTC (rev 3299) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-29 13:06:59 UTC (rev 3300) @@ -24,6 +24,7 @@ package fr.ifremer.isisfish.ui.input; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -84,7 +85,7 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeSelectionModel; -import fr.ifremer.isisfish.ui.input.tree.loadors.FisheryTreeNodeLoador; +import fr.ifremer.isisfish.ui.input.tree.loadors.PopulationsNodeLoador; import fr.ifremer.isisfish.ui.models.common.StringListModel; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.SensitivityInputHandler; @@ -543,7 +544,7 @@ inputContentUI.getSaveVerifier().addCurrentEntity(topiaEntity); } - inputContentUI.setBean((TopiaEntityContextable)topiaEntity); + inputContentUI.setBean(topiaEntity); inputContentUI.setActive(topiaEntity != null); // add initialized ui to panel @@ -687,7 +688,7 @@ } // must use loador to properly load species node - FisheryTreeNodeLoador typeNodeLoador = fisheryTreeHelper.getLoadorFor(nodeClass); + /*FisheryTreeNodeLoador typeNodeLoador = fisheryTreeHelper.getLoadorFor(nodeClass); FisheryTreeNode newNode = null; if (newNode != null) { newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); @@ -696,8 +697,17 @@ // FIXME echatellier 20110418 cas non résolu du node "population" // pour lequel on n'a pas le loador newNode = new FisheryTreeNode(nodeClass, topiaEntity.getTopiaId(), null, null); + }*/ + + // FIXME echatellier 20110429 Hack en dur pour population + FisheryTreeNode newNode = new FisheryTreeNode(nodeClass, topiaEntity.getTopiaId(), null, null); + fisheryTreeHelper.insertNode(selectedNode, newNode); + if (nodeClass.equals(Species.class)) { + FisheryTreeNode newPopNode = new FisheryTreeNode( + Population.class, n_("isisfish.input.tree.populations"), + null, new PopulationsNodeLoador((Species)topiaEntity)); + fisheryTreeHelper.insertNode(newNode, newPopNode); } - fisheryTreeHelper.insertNode(selectedNode, newNode); fisheryTreeHelper.selectNode(newNode); }

1 0