[Tutti-commits] 17/26: improve code

26 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 7f0238dad854d4eb80843c7d0cf07c8f2f86eb33
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Jan 26 12:17:02 2015 +0100

    improve code
---
 .../java/fr/ifremer/tutti/ui/swing/updater/Module.java  | 14 +++++++-------
 .../java/fr/ifremer/tutti/ui/swing/updater/Updater.java | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java
index 5ecd331..8a45e7d 100644
--- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java
+++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Module.java
@@ -11,24 +11,24 @@ public enum Module {
     launcher(true),
     jre(true),
 
-    application(false),
+    tutti(false),
     i18n(false),
     help(false),
     report(false),
     ichtyometer(false);
 
-    private final boolean runtimeUpdate;
+    private final boolean runtimeModule;
 
-    Module(boolean runtimeUpdate) {
-        this.runtimeUpdate = runtimeUpdate;
+    Module(boolean runtimeModule) {
+        this.runtimeModule = runtimeModule;
     }
 
-    public boolean isRuntimeUpdate() {
-        return runtimeUpdate;
+    public boolean isRuntimeModule() {
+        return runtimeModule;
     }
 
     public String getModuleLoggerName() {
-        String moduleNameStr = String.format("[%s$10s]", name());
+        String moduleNameStr = String.format("[Module %1$-20s]", name());
         return moduleNameStr;
     }
 }
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 a8904fd..ba95d2f 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
@@ -138,7 +138,7 @@ public class Updater {
 
         for (Module module : Module.values()) {
 
-            if (module.isRuntimeUpdate()) {
+            if (module.isRuntimeModule()) {
 
                 boolean updateFound = updateRuntimeModule(module);
 
@@ -177,7 +177,7 @@ public class Updater {
 
         for (Module module : Module.values()) {
 
-            if (!module.isRuntimeUpdate()) {
+            if (!module.isRuntimeModule()) {
 
                 updateModule(module);
 
@@ -215,7 +215,11 @@ public class Updater {
 
         } else {
 
-            System.out.println(String.format("%s No update.", moduleNameStr));
+            Path modulePath = baseDir.resolve(moduleName);
+
+            String newVersion = getVersion(modulePath);
+
+            System.out.println(String.format("%s No update (current version: %s)", moduleNameStr, newVersion));
 
             updateFound = false;
         }
@@ -261,7 +265,10 @@ public class Updater {
 
         } else {
 
-            System.out.println(String.format("%s No update.", moduleNameStr));
+            Path modulePath = baseDir.resolve(moduleName);
+            String newVersion = getVersion(modulePath);
+
+            System.out.println(String.format("%s No update (current version: %s).", moduleNameStr, newVersion));
 
         }
 
@@ -315,7 +322,7 @@ public class Updater {
 
     private void cleanObsoleteFiles() throws IOException {
 
-        Path applicationDirectoryPath = baseDir.resolve(Module.application.name());
+        Path applicationDirectoryPath = baseDir.resolve(Module.tutti.name());
 
         if (windowsOS) {
 

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

    

[Tutti-commits] 17/26: improve code

codelutin.com scm