[Tutti-commits] 01/04: refs #6544 (permettre d'avoir des modules non existants au demarrage)

27 Jan 2015

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 121fee984eea9a969d5eceffbea68e234fe6d204
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Jan 27 13:24:45 2015 +0100

    refs #6544 (permettre d'avoir des modules non existants au demarrage)
---
 .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 42 ++++++++++++----------
 .../ui/swing/updater/UpdaterFileSystemPathes.java  | 21 ++++++-----
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java
index ecafb14..4b8d75f 100644
--- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java
+++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java
@@ -176,24 +176,18 @@ public class Updater {
 
     }
 
-    protected void cleanFiles() throws IOException {
-
-        pathHelper.cleanObsoleteFiles();
-        DeleteHelper.deleteDirectory(pathHelper.getUpdateDirectory());
-
-    }
-
     protected boolean updateRuntimeModule(Module module) throws IOException {
 
-        boolean updateFound;
+        boolean moduleExist = pathHelper.isModuleExists(module);
+        boolean updateModuleExist = pathHelper.isUpdateModuleExists(module);
 
-        String oldVersion = pathHelper.getModuleVersion(module);
+        String oldVersion = moduleExist ? pathHelper.getModuleVersion(module) : "None";
 
         String moduleNameStr = module.getModuleLoggerName();
 
         System.out.println(String.format("%s Current version: %s", moduleNameStr, oldVersion));
 
-        if (pathHelper.isUpdateModuleExists(module)) {
+        if (updateModuleExist) {
 
             String newVersion = pathHelper.getUpdateModuleVersion(module);
 
@@ -202,27 +196,28 @@ public class Updater {
             // Remove older backup
             pathHelper.removeOlderBackup(module);
 
-            updateFound = true;
-
         } else {
 
             System.out.println(String.format("%s No update found", moduleNameStr));
-            updateFound = false;
 
         }
 
-        return updateFound;
+        return updateModuleExist;
 
     }
 
     protected void updateApplicationModule(Module module) throws IOException {
 
+        boolean moduleExist = pathHelper.isModuleExists(module);
+        boolean updateModuleExist = pathHelper.isUpdateModuleExists(module);
+
+        String oldVersion = moduleExist ? pathHelper.getModuleVersion(module) : "None";
+
         String moduleNameStr = module.getModuleLoggerName();
-        String oldVersion = pathHelper.getModuleVersion(module);
 
         System.out.println(String.format("%s Current version: %s", moduleNameStr, oldVersion));
 
-        if (pathHelper.isUpdateModuleExists(module)) {
+        if (updateModuleExist) {
 
             String newVersion = pathHelper.getUpdateModuleVersion(module);
 
@@ -232,8 +227,12 @@ public class Updater {
 
             Path modulePath = pathHelper.getModulePath(module);
 
-            // Backup existing module
-            pathHelper.backupModule(module, oldVersion);
+            if (moduleExist) {
+
+                // Backup existing module
+                pathHelper.backupModule(module, oldVersion);
+
+            }
 
             // Installing new module
             System.out.println(String.format("%s Install new version %s", moduleNameStr, newVersion));
@@ -248,4 +247,11 @@ public class Updater {
 
     }
 
+    protected void cleanFiles() throws IOException {
+
+        pathHelper.cleanObsoleteFiles();
+        DeleteHelper.deleteDirectory(pathHelper.getUpdateDirectory());
+
+    }
+
 }
diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java
index e31d01c..82f2772 100644
--- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java
+++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java
@@ -81,6 +81,14 @@ public class UpdaterFileSystemPathes {
         return modulePath;
     }
 
+    public boolean isModuleExists(Module module) {
+
+        Path modulePath = getModulePath(module);
+        boolean isDirectory = Files.isDirectory(modulePath);
+        return isDirectory;
+
+    }
+
     public String getModuleVersion(Module module) throws IOException {
 
         Path modulePath = getModulePath(module);
@@ -161,18 +169,15 @@ public class UpdaterFileSystemPathes {
     public void backupModule(Module module, String version) throws IOException {
 
         Path modulePath = getModulePath(module);
-        if (Files.isDirectory(modulePath)) {
-
-            String moduleName = module.name();
 
-            Path backupDirectory = getBackupDirectory();
+        String moduleName = module.name();
 
-            Path backupModulePath = backupDirectory.resolve(String.format("%s-%s-%s", moduleName, version, backupDate));
+        Path backupDirectory = getBackupDirectory();
 
-            System.out.println(String.format("%s Backup old version %s to %s", module.getModuleLoggerName(), version, backupModulePath));
-            Files.move(modulePath, backupModulePath);
+        Path backupModulePath = backupDirectory.resolve(String.format("%s-%s-%s", moduleName, version, backupDate));
 
-        }
+        System.out.println(String.format("%s Backup old version %s to %s", module.getModuleLoggerName(), version, backupModulePath));
+        Files.move(modulePath, backupModulePath);
 
     }
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 01/04: refs #6544 (permettre d'avoir des modules non existants au demarrage)

codelutin.com scm