Author: chatellier Date: 2010-01-11 15:59:58 +0000 (Mon, 11 Jan 2010) New Revision: 2901 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: Fix region delete in repository. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2010-01-11 15:57:37 UTC (rev 2900) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2010-01-11 15:59:58 UTC (rev 2901) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -202,9 +202,9 @@ getContextValue(InputAction.class).copyRegion(getRegionStorage()); setStatusMessage(_("isisfish.message.copy.finished")); } -protected void removeRegion() { +protected void removeRegion(boolean deletecvs) { setStatusMessage(_("isisfish.message.removing.region", getRegionStorage().getName()), true); - boolean deleted = getContextValue(InputAction.class).removeRegion(getRegionStorage(), false); + boolean deleted = getContextValue(InputAction.class).removeRegion(getRegionStorage(), deletecvs); if (deleted) { setStatusMessage(_("isisfish.message.region.removed")); regionNull(); @@ -228,13 +228,13 @@ <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{getRegion() != null}' onActionPerformed="exportRegion()" /> <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{getRegion() != null}' onActionPerformed="copyRegion()" /> <JSeparator/> - <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocaly" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" /> + <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocaly" enabled='{getRegion() != null}' onActionPerformed="removeRegion(false)" /> </JMenu> <JMenu text="isisfish.input.menu.server"> <JMenuItem text="isisfish.input.menu.addRegion" enabled='{getRegion() != null}' onActionPerformed="commitRegionInCVS()" /> <JMenuItem text="isisfish.input.menu.commit" enabled='{getRegion() != null}' onActionPerformed="commitRegionInCVS()" /> <JSeparator/> - <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" /> + <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" enabled='{getRegion() != null}' onActionPerformed="removeRegion(true)" /> </JMenu> <JMenu text="isisfish.input.menu.sensitivity"> <JMenuItem text="isisfish.input.menu.sensitivity.export" enabled='{getRegion() != null}' onActionPerformed="getAction().exportRegionSensitivityFactors(this, getRegion())" />