Author: chatellier Date: 2009-06-24 12:47:18 +0000 (Wed, 24 Jun 2009) New Revision: 2424 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx Log: Fix add/remove additionnal maps. 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-06-24 12:44:41 UTC (rev 2423) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-06-24 12:47:18 UTC (rev 2424) @@ -74,6 +74,10 @@ getVerifier().setCancelButton(cancel); } +protected InputAction getInputAction() { + return getContextValue(InputAction.class); +} + protected void setFieldMapfilesModel(FisheryRegion region) { DefaultListModel model = new DefaultListModel(); java.util.List<String> mapList = region.getMapFileList(); @@ -86,35 +90,35 @@ } fieldMapfiles.setModel(model); } -protected void mapFieldChanged() { - Object[] values = fieldMapfiles.getSelectedValues(); - java.util.List<String> valuesList = new ArrayList<String>(); - if (values != null) { - for (Object o : values){ - valuesList.add((String)o); - } - } - getBean().setMapFileList(valuesList); -} + protected void addMap() { - getContextValue(InputAction.class).addMap(getBean()); + getInputAction().addMap(getBean()); + setFieldMapfilesModel(getBean()); } + protected void delMap() { - getContextValue(InputAction.class).removeMap(getBean(), fieldMapfiles.getSelectedValues()); + getInputAction().removeMap(getBean(), fieldMapfiles.getSelectedValues()); + setFieldMapfilesModel(getBean()); } + protected void cellFillChanged() { + } + protected void cellFile() { - getContextValue(InputAction.class).loadCellFile(fieldCellFile.getText()); + getInputAction().loadCellFile(fieldCellFile.getText()); } + protected void check() { getContextValue(InputAction.class).checkFisheryRegion(getBean()); setInfoText(_("isisfish.message.check.region")); } + protected void save() { setInfoText(_("isisfish.message.checking.cell")); - getContextValue(InputAction.class).saveFisheryRegion(getBean()); + getInputAction().saveFisheryRegion(getBean()); getVerifier().setEditable(false); + // TODO remove getParentContainer reference getParentContainer(InputUI.class).setTreeModel(); getParentContainer(InputUI.class).setFieldCurrentRegionModel(); setInfoText(_("isisfish.message.save.finished")); @@ -222,7 +226,7 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.6'> <JScrollPane> - <JList id="fieldMapfiles" onMouseClicked='mapFieldChanged()' decorator='boxed'/> + <JList id="fieldMapfiles" decorator='boxed'/> </JScrollPane> </cell> </row>