Author: sletellier Date: 2009-02-16 11:59:33 +0000 (Mon, 16 Feb 2009) New Revision: 1817 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx Log: Fix OpenMap bugs Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-02-16 11:58:27 UTC (rev 1816) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-02-16 11:59:33 UTC (rev 1817) @@ -51,15 +51,11 @@ protected OpenMapEvents mapListener = null; boolean cellChanged = true; -cellMap = new fr.ifremer.isisfish.map.IsisMapBean(); setButtonTitle(_("isisfish.input.continueZones")); setNextPath("$root/$zones"); -cellMap.setFisheryRegion(getRegion()); -cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -cellMap.setActiveMouseMode(new SelectMouseMode()); +cellMap.addMapMouseListener(getMapListener()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); -setMapListener(); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -85,9 +81,8 @@ cellChanged = false; jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean()); cellChanged = true; - cellMap.setSelectedCells(getBean()); } -protected void setMapListener(){ +protected OpenMapEvents getMapListener(){ if (mapListener == null){ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @@ -103,6 +98,7 @@ } }; } + return mapListener; } protected void fieldCellChanged() { @@ -184,7 +180,7 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' constraints='BorderLayout.CENTER'/> + <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER'/> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-02-16 11:58:27 UTC (rev 1816) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-02-16 11:59:33 UTC (rev 1817) @@ -57,9 +57,6 @@ setBean((FisheryRegionImpl)region); if (region != null){ setFieldMapfilesModel(getBean()); - cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - cellMap.setActiveMouseMode(new SelectMouseMode()); - cellMap.setFisheryRegion(getBean()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); } @@ -256,7 +253,7 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER'/> + <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER'/> </JPanel> </JSplitPane> </JPanel>