From 5c467a7a12d14f2f3a5535a231f55c7749127581 Mon Sep 17 00:00:00 2001 From: Norberto Lopez <106690103+nobes888@users.noreply.github.com> Date: Wed, 8 May 2013 16:13:48 +0000 Subject: [PATCH] Various updates --- src/distMaker/DistMakerEngine.java | 12 +++++++++--- src/distMaker/gui/PickReleasePanel.java | 4 ++-- .../platform/{AppleFileUtil.java => AppleUtils.java} | 2 +- .../platform/{LinuxFileUtil.java => LinuxUtils.java} | 2 +- src/distMaker/platform/MemUtils.java | 4 ++-- tools/buildRelease | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) rename src/distMaker/platform/{AppleFileUtil.java => AppleUtils.java} (99%) rename src/distMaker/platform/{LinuxFileUtil.java => LinuxUtils.java} (98%) diff --git a/src/distMaker/DistMakerEngine.java b/src/distMaker/DistMakerEngine.java index 0ef9604..ee159bb 100644 --- a/src/distMaker/DistMakerEngine.java +++ b/src/distMaker/DistMakerEngine.java @@ -25,7 +25,7 @@ import javax.swing.SwingUtilities; import distMaker.gui.PickReleasePanel; import distMaker.node.Node; -import distMaker.platform.AppleFileUtil; +import distMaker.platform.AppleUtils; public class DistMakerEngine { @@ -212,7 +212,7 @@ public class DistMakerEngine * This method will be called via reflection. */ @SuppressWarnings("unused") - private void checkForUpdatesWorker(Task aTask) + private void checkForUpdatesWorker(FullTaskPanel aTask) { List fullList; Release chosenItem; @@ -236,6 +236,9 @@ public class DistMakerEngine aTask.abort(); return; } + + // Hide the taskPanel + aTask.setVisible(false); // Prompt the user for the Release aTask.infoAppendln("Please select the release to install..."); @@ -259,6 +262,9 @@ public class DistMakerEngine chosenItem = pickVersionPanel.getChosenItem(); if (chosenItem == null) return; + + // Reshow the taskPanel + aTask.setVisible(true); // Log the user chosen action aTask.infoAppendln("\tRelease chosen: " + chosenItem.getVersion()); @@ -498,7 +504,7 @@ public class DistMakerEngine errMsg = null; if (pFile.setWritable(true) == false) errMsg = "Failure. No writable permmisions for file: " + pFile; - else if (AppleFileUtil.updateVersion(pFile, aRelease.getVersion()) == false) + else if (AppleUtils.updateVersion(pFile, aRelease.getVersion()) == false) errMsg = "Failure. Failed to update file: " + pFile; if (errMsg != null) diff --git a/src/distMaker/gui/PickReleasePanel.java b/src/distMaker/gui/PickReleasePanel.java index 93889c3..4283d5b 100644 --- a/src/distMaker/gui/PickReleasePanel.java +++ b/src/distMaker/gui/PickReleasePanel.java @@ -177,7 +177,7 @@ public class PickReleasePanel extends GlassPanel implements ActionListener, ZioR JPanel tmpPanel; // Form the layout - setLayout(new MigLayout("", "[left][grow][]", "[]40[][][]3[grow]10[]")); + setLayout(new MigLayout("", "[left][grow][]", "[]25[][][]3[grow]10[]")); // Title Area titleL = new JLabel("Please select an update", JLabel.CENTER); // this text gets replaced once the curent version status is known @@ -275,7 +275,7 @@ public class PickReleasePanel extends GlassPanel implements ActionListener, ZioR if (pickItem == null) warnMsg = "Select the version you want to switch to."; else if (pickItem.equals(installedItem) == true) - warnMsg = "You cannot update to the same version you are running. You can dwitch to a different version."; + warnMsg = "You cannot update to the same version you are running. You can switch to a different version."; else if (pickItem.getBuildTime() < installedItem.getBuildTime()) warnMsg = "Please note that your current selection will revert back to an older version than the currently installed version."; diff --git a/src/distMaker/platform/AppleFileUtil.java b/src/distMaker/platform/AppleUtils.java similarity index 99% rename from src/distMaker/platform/AppleFileUtil.java rename to src/distMaker/platform/AppleUtils.java index 0346e2e..bcd310c 100644 --- a/src/distMaker/platform/AppleFileUtil.java +++ b/src/distMaker/platform/AppleUtils.java @@ -16,7 +16,7 @@ import org.w3c.dom.*; /** * Utility class which contains a set of methods to interact with an Apple Info.plist file. */ -public class AppleFileUtil +public class AppleUtils { /** * Utility method to update the specified max memory (-Xmx) value in the plist file (aFile) to the specified diff --git a/src/distMaker/platform/LinuxFileUtil.java b/src/distMaker/platform/LinuxUtils.java similarity index 98% rename from src/distMaker/platform/LinuxFileUtil.java rename to src/distMaker/platform/LinuxUtils.java index 6e8797b..52a7683 100644 --- a/src/distMaker/platform/LinuxFileUtil.java +++ b/src/distMaker/platform/LinuxUtils.java @@ -7,7 +7,7 @@ import java.util.List; import com.google.common.collect.Lists; -public class LinuxFileUtil +public class LinuxUtils { /** diff --git a/src/distMaker/platform/MemUtils.java b/src/distMaker/platform/MemUtils.java index 2589d7f..84073f1 100644 --- a/src/distMaker/platform/MemUtils.java +++ b/src/distMaker/platform/MemUtils.java @@ -78,7 +78,7 @@ public class MemUtils errMsg = null; if (pFile.setWritable(true) == false) errMsg = "Failure. No writable permmisions for file: " + pFile; - else if (AppleFileUtil.updateMaxMem(pFile, maxMemSize) == false) + else if (AppleUtils.updateMaxMem(pFile, maxMemSize) == false) errMsg = "Failure. Failed to update file: " + pFile; if (errMsg != null) @@ -99,7 +99,7 @@ public class MemUtils errMsg = null; if (scriptFile.setWritable(true) == false) errMsg = "Failure. No writable permmisions for file: " + scriptFile; - else if (LinuxFileUtil.updateMaxMem(scriptFile, maxMemSize) == false) + else if (LinuxUtils.updateMaxMem(scriptFile, maxMemSize) == false) errMsg = "Failure. Failed to update file: " + scriptFile; if (errMsg != null) diff --git a/tools/buildRelease b/tools/buildRelease index a7fbf29..cd35894 100755 --- a/tools/buildRelease +++ b/tools/buildRelease @@ -10,7 +10,7 @@ import time # Globals # The version of DistMaker -version = '0.35' +version = '0.36' def logAndPrint(message="", indent=0, showTime=False):