Author: tchemit Date: 2013-05-01 16:27:16 +0200 (Wed, 01 May 2013) New Revision: 907 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/907 Log: fixes #2383: [TECH] - Mise ?\195?\160 jour de la base : ?\195?\169crasement des donn?\195?\169es si on force la mise ?\195?\160 jour Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-05-01 13:30:06 UTC (rev 906) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-05-01 14:27:16 UTC (rev 907) @@ -146,10 +146,14 @@ dbInstalled = false; dbUpdated = false; } else { - if (ApplicationUpdater.ZERO_VERSION.equals(info.oldVersion)) { + if (context.isDbExist()) { + + // when db exists always an update + dbUpdated = true; + } else { + + // when no db, then always install dbInstalled = true; - } else { - dbUpdated = true; } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-01 13:30:06 UTC (rev 906) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-01 14:27:16 UTC (rev 907) @@ -267,8 +267,7 @@ case DB: { UpdateDbAction logicAction = TuttiActionHelper.createLogicAction(getHandler(), UpdateDbAction.class); action = logicAction; - ApplicationInfo info = versions.get(appType); - if (ApplicationUpdater.ZERO_VERSION.equals(info.oldVersion)) { + if (!getContext().isDbExist()) { // install db action.setActionDescription(