From 8a00fa0e5d649e25216782651cca78858243c646 Mon Sep 17 00:00:00 2001 From: Morlok8k Date: Fri, 5 Oct 2012 01:50:51 -0700 Subject: [PATCH] Update function is "functional" in GUI although sparse. --- src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java | 11 +++++++++-- src/morlok8k/MinecraftLandGenerator/Main.java | 2 +- src/morlok8k/MinecraftLandGenerator/Update.java | 12 +++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java b/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java index 12f8de3..ba0a8d3 100644 --- a/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java +++ b/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java @@ -30,6 +30,7 @@ import javax.swing.UIManager; import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.metal.OceanTheme; +import morlok8k.MinecraftLandGenerator.Update; import morlok8k.MinecraftLandGenerator.var; /** @@ -641,9 +642,15 @@ public class MLG_GUI { static void UpdateMLG() { - // Update.updateMLG(); + boolean update = Update.updateMLG(); + + if (update) { + //TODO: add a popup saying we got a new version + Exit(); + } else { + //TODO: popup: no new version / error + } - Exit(); } void ImportCustomList() { diff --git a/src/morlok8k/MinecraftLandGenerator/Main.java b/src/morlok8k/MinecraftLandGenerator/Main.java index 2be794a..a239e71 100644 --- a/src/morlok8k/MinecraftLandGenerator/Main.java +++ b/src/morlok8k/MinecraftLandGenerator/Main.java @@ -90,7 +90,7 @@ public class Main { } ////// - //GUI = false; // forcing GUI to be false for now, because I don't have the MLG_GUI code ready yet! + GUI = false; // forcing GUI to be false for now, because I don't have the MLG_GUI code ready yet! ////// } else { diff --git a/src/morlok8k/MinecraftLandGenerator/Update.java b/src/morlok8k/MinecraftLandGenerator/Update.java index 697a484..96f5d35 100644 --- a/src/morlok8k/MinecraftLandGenerator/Update.java +++ b/src/morlok8k/MinecraftLandGenerator/Update.java @@ -383,7 +383,7 @@ public class Update { * @author Morlok8k * */ - public static void updateMLG() { + public static boolean updateMLG() { buildID(true); //get latest BuildID file. var.MLG_Last_Modified_Date = null; @@ -393,12 +393,9 @@ public class Update { String s; int diff; - //boolean renameFailed = false; - while (e.hasNext()) { s = e.next(); diff = var.MLG_Last_Modified_Date.compareTo(new Date(new Long(s))); - //out(diff); if (diff < 0) { // if this is less than 0, there is a new version of MLG on the Internet! Out.out("There is a NEW VERSION Of " + var.PROG_NAME + " available online!"); @@ -417,8 +414,8 @@ public class Update { } catch (final Exception e2) { Out.out("Rename attempt #2 failed!"); e2.printStackTrace(); - //renameFailed = true; - return; + + return false; } } @@ -426,11 +423,12 @@ public class Update { final boolean fileSuccess = DownloadFile.downloadFile(var.github_MLG_jar_URL, true); if (fileSuccess) { Out.out(var.MLG_JarFile + " downloaded."); - return; + return true; } } } + return false; }