Author: chatellier Date: 2009-10-21 09:47:45 +0000 (Wed, 21 Oct 2009) New Revision: 2679 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: Make delete action more "user friendly" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:39:13 UTC (rev 2678) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-10-21 09:47:45 UTC (rev 2679) @@ -287,20 +287,17 @@ * * @param regionStorage region storage * @param cvsDelete if true delete region in CVS too - * @return status message + * @return removed region */ - public String removeRegion(RegionStorage regionStorage, boolean cvsDelete) { - String result = null; + public boolean removeRegion(RegionStorage regionStorage, boolean cvsDelete) { + boolean result = false; try { int resp = JOptionPane.showConfirmDialog(null, _( "isisfish.message.confirm.remove.region", regionStorage .getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(cvsDelete); - result = _("isisfish.message.region.removed"); - - } else { - result = _("isisfish.message.region.remove.canceled"); + result = true; } } catch (Exception eee) { if (log.isErrorEnabled()) { 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 2009-10-21 09:39:13 UTC (rev 2678) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-10-21 09:47:45 UTC (rev 2679) @@ -204,8 +204,14 @@ } protected void removeRegion() { setStatusMessage(_("isisfish.message.removing.region", getRegionStorage().getName()), true); - setStatusMessage(getContextValue(InputAction.class).removeRegion(getRegionStorage(), false)); - regionNull(); + boolean deleted = getContextValue(InputAction.class).removeRegion(getRegionStorage(), false); + if (deleted) { + setStatusMessage(_("isisfish.message.region.removed")); + regionNull(); + } + else { + setStatusMessage(_("isisfish.message.region.remove.canceled")); + } } protected void commitRegionInCVS() { setStatusMessage(_("isisfish.message.commiting.region", getRegionStorage().getName()), true); @@ -230,9 +236,6 @@ <JSeparator/> <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" accelerator="accRemove"/> </JMenu> - <!--JMenu text="isisfish.input.menu.help"> - <JMenuItem name="miAbout" text="isisfish.input.menu.about" onActionPerformed="about()" accelerator="accAbout"/> - </JMenu--> </JMenuBar> <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' minimumSize="{new java.awt.Dimension(0,0)}">