branch develop updated (f2665e3 -> e44d941)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f2665e3 fixes #6541 new 84422d2 add new shutdown methods new 892651f add new method to close persistence service new 3f51fe4 add new shutdown methods new 5c1d9d4 delete db files new dfe6838 rename exit code new e44d941 fixes #6601 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e44d9410c3c85f18a9d7a19fa6f42d0d9cb641fc Merge: f2665e3 dfe6838 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:09:55 2015 +0100 fixes #6601 commit dfe68384beaddec03e14fa920cbd6247c42bf6d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:03:26 2015 +0100 rename exit code commit 5c1d9d4dc03d9d2d2afd55bb9331f2553dc83493 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:03:09 2015 +0100 delete db files commit 3f51fe4bf2cd3fbee80b8fb032ee7d4d5692dbdf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:47:58 2015 +0100 add new shutdown methods commit 892651f6082c54070e82659be2c58dc9505b86e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:40:29 2015 +0100 add new method to close persistence service commit 84422d24b1ccf1339a89dde2c4625d6fd694dbc5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:35:08 2015 +0100 add new shutdown methods Summary of changes: .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 ++++++++++++++++ .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 ++-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 42 +++++++++++++++++++--- .../ui/swing/action/CloseApplicationAction.java | 4 +-- .../ui/swing/action/ExportAndCleanDbAction.java | 21 ++++------- .../tutti/ui/swing/action/ReimportDbAction.java | 9 ++--- .../tutti/ui/swing/action/ReinstallDbAction.java | 9 ++--- .../tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- 10 files changed, 93 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 84422d24b1ccf1339a89dde2c4625d6fd694dbc5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:35:08 2015 +0100 add new shutdown methods --- .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java index cc48b77..7f278ff 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java @@ -24,6 +24,7 @@ package fr.ifremer.tutti.util; * #L% */ +import fr.ifremer.tutti.TuttiConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -31,6 +32,7 @@ import org.hibernate.cfg.Environment; import java.io.File; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -123,4 +125,33 @@ public class Jdbcs { public static String getJdbcUrl(File directory, String dbName) { return "jdbc:hsqldb:file:" + directory.getAbsolutePath() + "/" + dbName; } + + public static void shutdown(TuttiConfiguration configuration) throws SQLException { + + String jdbcUrl = configuration.getJdbcUrl(); + String jdbcUsername = configuration.getJdbcUsername(); + String jdbcPassword = configuration.getJdbcPassword(); + try (Connection connection = createConnection(jdbcUrl, jdbcUsername, jdbcPassword)) { + + try (PreparedStatement pStmt = connection.prepareStatement("SHUTDOWN")) { + pStmt.execute(); + } + } + + } + + public static void shutdownCompact(TuttiConfiguration configuration) throws SQLException { + + String jdbcUrl = configuration.getJdbcUrl(); + String jdbcUsername = configuration.getJdbcUsername(); + String jdbcPassword = configuration.getJdbcPassword(); + try (Connection connection = createConnection(jdbcUrl, jdbcUsername, jdbcPassword)) { + + try (PreparedStatement pStmt = connection.prepareStatement("SHUTDOWN COMPACT")) { + pStmt.execute(); + } + } + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 892651f6082c54070e82659be2c58dc9505b86e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:40:29 2015 +0100 add new method to close persistence service --- .../java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 17 +++++++++++++++++ .../tutti/ui/swing/action/ExportAndCleanDbAction.java | 7 ++----- .../ifremer/tutti/ui/swing/action/ReimportDbAction.java | 3 +-- .../tutti/ui/swing/action/ReinstallDbAction.java | 4 +--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index d23d363..85da5a4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -58,6 +58,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; +import fr.ifremer.tutti.util.Jdbcs; import jaxx.runtime.JAXXContext; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -99,6 +100,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.sql.SQLException; import java.util.Date; import java.util.Locale; import java.util.Map; @@ -1178,4 +1180,19 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } return result; } + + public void closePersistenceService() { + + setDbLoaded(false); + reloadPersistenceService(); + + try { + Jdbcs.shutdown(config); + } catch (SQLException e) { + if (log.isErrorEnabled()) { + log.error("Could not shutdown the database", e); + } + } + + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java index c04b320..0ce92c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java @@ -96,11 +96,8 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { // clear all caches getContext().getPersistenceService().clearAllCaches(); - // set to not reload a real db - getContext().setDbLoaded(false); - - // close services + repon a fake persistence service - getContext().reloadPersistenceService(); + // close current persistence service + getContext().closePersistenceService(); // clean db context getContext().clearDbContext(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java index f286037..a0989d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java @@ -139,8 +139,7 @@ public class ReimportDbAction extends AbstractMainUITuttiAction { // close db progressionModel.increments(t("tutti.reimport.step.closeDb", jdbcUrl)); - getContext().setDbLoaded(false); - getContext().reloadPersistenceService(); + getContext().closePersistenceService(); // backup db progressionModel.increments(t("tutti.reimport.step.backupDb", backupFile)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java index 244e23d..f981399 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java @@ -118,9 +118,7 @@ public class ReinstallDbAction extends AbstractMainUITuttiAction { // close db progressionModel.increments(t("tutti.reinstallDb.step.closeDb", jdbcUrl)); - - getContext().setDbLoaded(false); - getContext().reloadPersistenceService(); + getContext().closePersistenceService(); // backup db progressionModel.increments(t("tutti.reinstallDb.step.backupDb", backupFile)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3f51fe4bf2cd3fbee80b8fb032ee7d4d5692dbdf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 18:47:58 2015 +0100 add new shutdown methods --- tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java index 7f278ff..6bdd0c8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Jdbcs.java @@ -153,5 +153,5 @@ public class Jdbcs { } } - + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 5c1d9d4dc03d9d2d2afd55bb9331f2553dc83493 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:03:09 2015 +0100 delete db files --- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 25 ++++++++++++++++++---- .../ui/swing/action/ExportAndCleanDbAction.java | 14 +++++------- .../tutti/ui/swing/action/ReimportDbAction.java | 6 ++++-- .../tutti/ui/swing/action/ReinstallDbAction.java | 5 ++++- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 85da5a4..4ca08bb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -54,6 +54,7 @@ import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.updater.DeleteHelper; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; @@ -78,7 +79,6 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.UserI18nInitializer; import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; @@ -389,7 +389,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } @Override - public ApplicationConfiguration getConfiguration() { + public TuttiConfiguration getConfiguration() { return config; } @@ -1134,7 +1134,6 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage public boolean checkUpdateApplicationReachable(boolean showErrorInPopup) { boolean result = true; - TuttiConfiguration config = getConfig(); String url = config.getUpdateApplicationUrl(); try { @@ -1159,7 +1158,6 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage public boolean checkUpdateDataReachable(boolean showErrorInPopup) { boolean result = true; - TuttiConfiguration config = getConfig(); String url = config.getUpdateDataUrl(); try { @@ -1195,4 +1193,23 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } } + + public void deleteDbOnExit() { + + if (log.isInfoEnabled()) { + log.info("Delete db files on exit."); + } + + try { + + DeleteHelper.deleteDirectoryOnExit(config.getDbDirectory().toPath()); + DeleteHelper.deleteDirectoryOnExit(config.getCacheDirectory().toPath()); + DeleteHelper.deleteDirectoryOnExit(config.getDbAttachmentDirectory().toPath()); + + } catch (IOException e) { + throw new ApplicationTechnicalException("Could not mark db files to be deleted on exit.", e); + } + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java index 0ce92c7..473f70b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java @@ -103,19 +103,15 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { getContext().clearDbContext(); // export db - - progressionModel.increments(1); - progressionModel.setMessage(t("tutti.exportDb.step.createArchive", file)); - + progressionModel.increments(t("tutti.exportDb.step.createArchive", file)); getContext().getPersistenceService().exportDb(file); - // clean files - - progressionModel.increments(1); - progressionModel.setMessage(t("tutti.exportDb.step.reloadApplication")); + // delete db files on exit + getContext().deleteDbOnExit(); // Close the application, will exit and restart application - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + progressionModel.increments(t("tutti.exportDb.step.reloadApplication")); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java index a0989d5..bc5846c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java @@ -154,10 +154,12 @@ public class ReimportDbAction extends AbstractMainUITuttiAction { File startActionFile = getConfig().getStartActionFile(); ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); + // delete db files on exit + getContext().deleteDbOnExit(); + // restart application progressionModel.increments(t("tutti.reimport.step.reloadApplication")); - - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java index f981399..1514577 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java @@ -133,9 +133,12 @@ public class ReinstallDbAction extends AbstractMainUITuttiAction { File startActionFile = getConfig().getStartActionFile(); ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); + // delete db files on exit + getContext().deleteDbOnExit(); + // restart application progressionModel.increments(t("tutti.reinstallDb.step.reloadApplication")); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 e44d9410c3c85f18a9d7a19fa6f42d0d9cb641fc Merge: f2665e3 dfe6838 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:09:55 2015 +0100 fixes #6601 .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 ++++++++++++++++ .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 ++-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 42 +++++++++++++++++++--- .../ui/swing/action/CloseApplicationAction.java | 4 +-- .../ui/swing/action/ExportAndCleanDbAction.java | 21 ++++------- .../tutti/ui/swing/action/ReimportDbAction.java | 9 ++--- .../tutti/ui/swing/action/ReinstallDbAction.java | 9 ++--- .../tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- 10 files changed, 93 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm