branch develop updated (f78563f -> 6f1f910)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from f78563f fixes #1162 be sure the fiscal periods or ordered by begin date new 6f1f910 fixes #1163 launch first start lima befaore loading main ui The 1 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 6f1f910432f315d0fae561699d466130a055830e Author: dcosse <japbiw74> Date: Fri Feb 13 17:24:58 2015 +0100 fixes #1163 launch first start lima befaore loading main ui Summary of changes: .../lima/business/ejb/ImportServiceImpl.java | 1 - .../src/main/java/org/chorem/lima/LimaMain.java | 32 ++++++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 6f1f910432f315d0fae561699d466130a055830e Author: dcosse <japbiw74> Date: Fri Feb 13 17:24:58 2015 +0100 fixes #1163 launch first start lima befaore loading main ui --- .../lima/business/ejb/ImportServiceImpl.java | 1 - .../src/main/java/org/chorem/lima/LimaMain.java | 32 ++++++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index fbdd513..188cd3f 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -752,7 +752,6 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return globalResult; } - subReport = importFinancialTransactionsAsCSV(financialTransactions, false); globalResult.pushImportResults(subReport); if (subReport.isErrors()){ diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index 84710a2..b52cb34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -136,23 +136,9 @@ public class LimaMain { splash.updateProgression(0.1, t("lima.launch.services")); LimaServiceFactory.initFactory(config); - // do init ui - MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class); - final MainView ui = uiHandler.initUI(context); - ui.setLocationRelativeTo(null); - - // defaut display home view (not closeable, but might be !) - uiHandler.showHomeView(context); - // load accounts and test if there is an account plan defined // if not, call #loadDefaultAccount() - splash.updateProgression(0.7, t("lima.launch.accounting")); - AccountService accountService = LimaServiceFactory.getService(AccountService.class); - - //start http server - getHttpServerService().start(); - long accountCount = accountService.getAccountCount(); if (accountCount == 0) { if (log.isInfoEnabled()) { @@ -163,8 +149,24 @@ public class LimaMain { openingView.setLocationRelativeTo(null); openingView.setVisible(true); } else { - splash.updateProgression(1, t("lima.launch.finished")); + splash.updateProgression(0.5, t("lima.launch.accounting")); } + + // do init ui + MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class); + final MainView ui = uiHandler.initUI(context); + ui.setLocationRelativeTo(null); + + // defaut display home view (not closeable, but might be !) + uiHandler.showHomeView(context); + + splash.updateProgression(0.7, t("lima.launch.accounting")); + + //start http server + getHttpServerService().start(); + + splash.updateProgression(0.1, t("lima.launch.finished")); + // show ui SwingUtilities.invokeLater(new Runnable() { @Override -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm