This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit dfe68384beaddec03e14fa920cbd6247c42bf6d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:03:26 2015 +0100 rename exit code --- .../src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 ++----- .../fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java | 4 ++-- .../java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java | 2 +- .../java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java index 7deb856..0df7ed5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java @@ -37,7 +37,6 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; import java.awt.Color; -import java.io.IOException; import java.util.Arrays; /** @@ -51,11 +50,9 @@ public class RunTutti { /** Logger. */ private static final Log log = LogFactory.getLog(RunTutti.class); - public static final int DELETE_DB_EXIT_CODE = 89; + public static final int RESTART_EXIT_CODE = 88; - public static final int UPATE_EXIT_CODE = 88; - - public static final int NORMAL_EXIT_CODE = 0; + public static final int STOP_EXIT_CODE = 0; public static void main(String... args) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java index 4570ca2..25cb5d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.t; */ public class CloseApplicationAction extends AbstractChangeScreenAction { - protected int exitCode = RunTutti.NORMAL_EXIT_CODE; + protected int exitCode = RunTutti.STOP_EXIT_CODE; public CloseApplicationAction(MainUIHandler handler) { super(handler, false, null); @@ -58,7 +58,7 @@ public class CloseApplicationAction extends AbstractChangeScreenAction { @Override public void releaseAction() { - exitCode = RunTutti.NORMAL_EXIT_CODE; + exitCode = RunTutti.STOP_EXIT_CODE; super.releaseAction(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java index ab5dff5..9d7d96b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java @@ -44,7 +44,7 @@ public class ReloadTuttiAction extends AbstractChangeScreenAction { public void doAction() throws Exception { // Close the application, will exit and restart application - RunTutti.closeTutti(getHandler(), RunTutti.UPATE_EXIT_CODE); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java index ba956de..049b055 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java @@ -147,7 +147,7 @@ public class UpdateApplicationAction extends AbstractTuttiAction<TuttiUIContext, CloseApplicationAction action = getContext().getActionFactory().createLogicAction( getHandler(), CloseApplicationAction.class); - action.setExitCode(RunTutti.UPATE_EXIT_CODE); + action.setExitCode(RunTutti.RESTART_EXIT_CODE); getActionEngine().runAction(action); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java index c3ffc2a..5717260 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java @@ -142,7 +142,7 @@ public class UpdateReportAction extends AbstractTuttiAction<TuttiUIContext, Main CloseApplicationAction action = getContext().getActionFactory().createLogicAction( getHandler(), CloseApplicationAction.class); - action.setExitCode(RunTutti.UPATE_EXIT_CODE); + action.setExitCode(RunTutti.RESTART_EXIT_CODE); getActionEngine().runAction(action); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.