Code cleanup / minor fixes.

script/appleUtils.py

@@ -405,8 +405,8 @@ def buildPListInfoStatic(destFile, args, jreTarGzFile):
 #	if icnsStr != None:
 #		writeln(f, 3, '<string>-Xdock:icon=Contents/Resources/' + icnsStr + '</string>')
 	writeln(f, 3, '<string>-Dapple.laf.useScreenMenuBar=true</string>')
-	writeln(f, 3, '<string>-Dcom.apple.macos.use-file-dialog-packages=true</string>')
 	writeln(f, 3, '<string>-Dcom.apple.macos.useScreenMenuBar=true</string>')
+	writeln(f, 3, '<string>-Dcom.apple.macos.use-file-dialog-packages=true</string>')
 	writeln(f, 3, '<string>-Dcom.apple.mrj.application.apple.menu.about.name=' + args.name + '</string>')
 	writeln(f, 3, '<string>-Dapple.awt.application.name=' + args.name + '</string>')
 	writeln(f, 3, '<string>-Djava.system.class.loader=appLauncher.RootClassLoader</string>')

src/distMaker/MiscUtils.java

@@ -155,6 +155,10 @@ public class MiscUtils
 		TarArchiveEntry entry = null;
 		while ((entry = (TarArchiveEntry)debInputStream.getNextEntry()) != null)
 		{
+			// Bail if we have been aborted
+			if (aTask.isActive() == false)
+				return null;
+
 			final File outputFile = new File(aDestPath, entry.getName());
 			if (entry.isDirectory())
 			{
@@ -225,7 +229,13 @@ public class MiscUtils
 
 		// Update all of the times on the folders last
 		for (File aDir : pathMap.keySet())
+		{
+			// Bail if we have been aborted
+			if (aTask.isActive() == false)
+				return null;
+
 			aDir.setLastModified(pathMap.get(aDir));
+		}
 
 		aTask.infoAppendln("\tUnpacked: " + untaredFiles.size() + " files\n");