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); }