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

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

29 Apr '11

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 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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 29 Apr '11

29 Apr '11

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

r3299 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 13:05:47 +0000 (Fri, 29 Apr 2011) New Revision: 3299 Log: Suppression des PCL des entites (dans un cas, c'est incoh?\195?\169rent : population des especes) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-29 13:02:44 UTC (rev 3298) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-04-29 13:05:47 UTC (rev 3299) @@ -84,6 +84,19 @@ /** Map entity key to {@link TopiaEntity}. */ protected HashMap<String, TopiaEntityContextable> currentEntities = new HashMap<String, TopiaEntityContextable>(); + /** Intance unique de PCL pour pouvoir être ajouter et supprimé au bon moment. */ + protected PropertyChangeListener entityPCL = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("PropertyChanged : " + + evt.getPropertyName() + + " New Value : " + evt.getNewValue()); + } + topiaChanged(); + } + }; + public InputContentUI<?> getInputContentUI() { return inputContentUI; } @@ -185,7 +198,7 @@ } /** - * Create new {@link type} entity. + * Create new {@code type} entity. * * @param type */ @@ -319,6 +332,8 @@ return response; } + + /** * Add entity to check for modification. * @@ -335,26 +350,7 @@ public void addCurrentEntity(TopiaEntityContextable currentEntity, String key) { if (currentEntity != null) { editable = true; - currentEntity - .addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("PropertyChanged : " - + evt.getPropertyName() - + " New Value : " + evt.getNewValue()); - } - topiaChanged(); - } - }); - // chatellier 20090602 , pas sur du code suivant - // plutot ne rien faire, si une autre entite de la meme - // clé est ajoutée, elle sera ecrasée - //TopiaEntity entity = getEntity(currentEntity.getClass()); - //if (entity != null) { - // currentEntities.remove(entity); - //} - + currentEntity.addPropertyChangeListener(entityPCL); this.currentEntities.put(key, currentEntity); } } @@ -381,6 +377,13 @@ * Reset state. */ public void reset() { + // il faut absolument supprimer les property change listener + // sinon, lors de la selection d'une espece, à la creation + // d'une population, le PCL est declanché, et l'abre + // croit qu'il y a eu une modification et il boucle + for (TopiaEntity entity : currentEntities.values()) { + entity.removePropertyChangeListener(entityPCL); + } currentEntities.clear(); noModif(); }

1 0

r3298 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 13:02:44 +0000 (Fri, 29 Apr 2011) New Revision: 3298 Log: Corrige un probleme de suppression de population Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-04-29 09:21:11 UTC (rev 3297) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-04-29 13:02:44 UTC (rev 3298) @@ -70,10 +70,10 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /* + /** * Overwrite delete. * @throws TopiaException - * + */ @Override public void delete() throws TopiaException { // chatellier 20090317 fix hibernate exception @@ -82,7 +82,7 @@ this.getSpecies().getPopulation().remove(this); super.delete(); - }*/ + } /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString()

1 0

r3297 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input input/tree sensitivity
by chatellier＠users.labs.libre-entreprise.org 29 Apr '11

29 Apr '11

Author: chatellier Date: 2011-04-29 09:21:11 +0000 (Fri, 29 Apr 2011) New Revision: 3297 Log: Fix NPE 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/tree/FisheryTreeRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.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 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -161,8 +161,6 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); fisheryTreeHelper.setDataProvider(dataProvider); TreeModel fisheryTreeModel = fisheryTreeHelper.createTreeModel(fisheryRegion); - // fix strange region switch error - //inputUI.getFisheryRegionTree().setCellRenderer(null); inputUI.getFisheryRegionTree().setModel(fisheryTreeModel); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); inputUI.getFisheryRegionTree().setSelectionModel(new FisheryTreeSelectionModel(inputUI)); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-29 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -86,43 +86,49 @@ TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext(); try { TopiaEntity entity = topiaContext.findByTopiaId(node.getId()); - - if (FisheryRegion.class.isAssignableFrom(entity.getClass())) { - stringValue = ((FisheryRegion)entity).getName(); + + // il arrive que ca bug + // lorsqu'un renderer essaye de rendre quelque chose qui n'existe plus + // cela arrive notement sur le changement de region + // lorsqu'une est deja chargée + if (entity != null) { + if (FisheryRegion.class.isAssignableFrom(entity.getClass())) { + stringValue = ((FisheryRegion)entity).getName(); + } + else if (Cell.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Cell)entity).getName(); + } + else if (Gear.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Gear)entity).getName(); + } + else if (Metier.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Metier)entity).getName(); + } + else if (Population.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Population)entity).getName(); + } + else if (Port.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Port)entity).getName(); + } + else if (SetOfVessels.class.isAssignableFrom(entity.getClass())) { + stringValue = ((SetOfVessels)entity).getName(); + } + else if (Species.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Species)entity).getName(); + } + else if (Strategy.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Strategy)entity).getName(); + } + else if (TripType.class.isAssignableFrom(entity.getClass())) { + stringValue = ((TripType)entity).getName(); + } + else if (VesselType.class.isAssignableFrom(entity.getClass())) { + stringValue = ((VesselType)entity).getName(); + } + else if (Zone.class.isAssignableFrom(entity.getClass())) { + stringValue = ((Zone)entity).getName(); + } } - else if (Cell.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Cell)entity).getName(); - } - else if (Gear.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Gear)entity).getName(); - } - else if (Metier.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Metier)entity).getName(); - } - else if (Population.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Population)entity).getName(); - } - else if (Port.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Port)entity).getName(); - } - else if (SetOfVessels.class.isAssignableFrom(entity.getClass())) { - stringValue = ((SetOfVessels)entity).getName(); - } - else if (Species.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Species)entity).getName(); - } - else if (Strategy.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Strategy)entity).getName(); - } - else if (TripType.class.isAssignableFrom(entity.getClass())) { - stringValue = ((TripType)entity).getName(); - } - else if (VesselType.class.isAssignableFrom(entity.getClass())) { - stringValue = ((VesselType)entity).getName(); - } - else if (Zone.class.isAssignableFrom(entity.getClass())) { - stringValue = ((Zone)entity).getName(); - } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't get entity for id " + node.getId(), eee); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-29 09:19:23 UTC (rev 3296) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-04-29 09:21:11 UTC (rev 3297) @@ -114,8 +114,6 @@ FisheryDataProvider dataProvider = new FisheryDataProvider(fisheryRegion); treeHelper.setDataProvider(dataProvider); TreeModel model = treeHelper.createTreeModel(fisheryRegion); - // fix strange region switch error - sensitivityTabUI.getFisheryRegionTree().setCellRenderer(null); sensitivityTabUI.getFisheryRegionTree().setModel(model); sensitivityTabUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); treeHelper.setUI(sensitivityTabUI.getFisheryRegionTree(), true, false, null);

1 0