Author: tchemit Date: 2009-07-02 16:24:47 +0000 (Thu, 02 Jul 2009) New Revision: 2460 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/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: #BUG 1900 : region does not update after loading another region on nodes previously opened... 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-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -63,6 +63,9 @@ // otherwize, setBean has no effect setBean(null); setBean((CellImpl) cell); + + // reload region in map + refreshRegionInMap(cellMap); cellChanged = false; jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getRegion().getCell(), getBean()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -106,6 +106,21 @@ getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } +/** + * Mettre a jour la region dans une map si necessaire. + * + * @param map la map a mettre a jour si necessaire + */ +protected void refreshRegionInMap(fr.ifremer.isisfish.map.IsisMapBean map) { + FisheryRegion fisheryRegion = map.getFisheryRegion(); + FisheryRegion regionFromContext = getRegion(); + if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) { + log.info("use now " + regionFromContext + " in map " + map); + map.setFisheryRegion(regionFromContext); + } +} + + // TODO this method cause a lot of probleme // must cast TopiaEntity to impl in inherited UIs... // 20090602 chatellier : useless method ? cause a lot of cast problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -36,9 +36,6 @@ boolean portChanged = true; -portMap.setFisheryRegion(getRegion()); -//portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -//portMap.setActiveMouseMode(new SelectMouseMode()); toolSet.setupListeners(portMap); toolMap.add((Component)toolSet); setMapListener(); @@ -53,8 +50,8 @@ } if (evt.getNewValue() != null) { - } } + } }); @Override @@ -65,7 +62,9 @@ // otherwize, setBean has no effect setBean(null); setBean((PortImpl) port); - + // reload region in map + refreshRegionInMap(portMap); + fillList(); } @@ -129,7 +128,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> + <JTextField id="fieldPortName" text='{SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> </cell> </row> <row> @@ -153,7 +152,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldPortComment" text='{SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -176,7 +175,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' decorator='boxed'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed'/> + <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' fisheryRegion='{getRegion()}'/> </JPanel> </JSplitPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -64,6 +64,9 @@ setBean(null); setBean((ZoneImpl) zone); + // reload region in map + refreshRegionInMap(zoneMap); + if (getBean() != null) { setZoneCells(); zoneMap.setSelectedCells(getBean().getCell());