Author: chatellier Date: 2011-04-18 14:31:52 +0000 (Mon, 18 Apr 2011) New Revision: 3262 Log: Fix npe when clicking on map with no bean loaded Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -64,8 +64,8 @@ // TODO a fixer, le clic droit du menu contextuel // passe aussi par ici et change la selection //if (e.getButton() == MouseEvent.BUTTON1) { - for (Cell c : cellMap.getSelectedCells()) { - if (getBean() != null) { + if (getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : cellMap.getSelectedCells()) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getFisheryRegion().getCell(), c); result = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -61,8 +61,8 @@ new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - for (Cell c : portMap.getSelectedCells()) { - if (getBean() != null) { + if (getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : portMap.getSelectedCells()) { if (getBean().getCell() != null) { if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); @@ -183,7 +183,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-18 14:19:01 UTC (rev 3261) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-18 14:31:52 UTC (rev 3262) @@ -66,11 +66,15 @@ new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - getBean().setCell(zoneMap.getSelectedCells()); - if (getBean().getCell() != null){ - zoneCells.setSelectedValues(getBean().getCell().toArray()); + boolean result = false; + if (getBean() != null) { // impossible de desactiver la carte :( + getBean().setCell(zoneMap.getSelectedCells()); + if (getBean().getCell() != null){ + zoneCells.setSelectedValues(getBean().getCell().toArray()); + result = true; + } } - return true; + return result; } }; @@ -203,7 +207,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row>