Move Options over to JarProcessorExecutor

4 files changed, 33 insertions, 32 deletions

diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java
index d06022a1f..1bd9f4869 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Main.java
@@ -16,17 +16,6 @@ import org.eclipse.equinox.p2.jarprocessor.JarProcessorExecutor;
 
 public class Main {
 
-	public static class Options {
-		public String outputDir = "."; //$NON-NLS-1$
-		public String signCommand = null;
-		public boolean pack = false;
-		public boolean repack = false;
-		public boolean unpack = false;
-		public boolean verbose = false;
-		public boolean processAll = false;
-		public File input = null;
-	}
-
 	private static void printUsage() {
 		System.out.println("[-option ...]... input"); //$NON-NLS-1$
 		System.out.println("The following options are supported:"); //$NON-NLS-1$
@@ -43,13 +32,13 @@ public class Main {
 		System.out.println("-verbose        verbose mode "); //$NON-NLS-1$
 	}
 
-	public static Options processArguments(String[] args) {
+	public static JarProcessorExecutor.Options processArguments(String[] args) {
 		if (args.length == 0) {
 			printUsage();
 			return null;
 		}
 
-		Options options = new Options();
+		JarProcessorExecutor.Options options = new JarProcessorExecutor.Options();
 		int i = 0;
 		for (; i < args.length - 1; i++) {
 			if (args[i].equals("-pack")) {//$NON-NLS-1$
@@ -110,7 +99,7 @@ public class Main {
 	 * @param args
 	 */
 	public static void main(String[] args) {
-		Options options = processArguments(args);
+		JarProcessorExecutor.Options options = processArguments(args);
 		if (options == null)
 			return;
 		new JarProcessorExecutor().runJarProcessor(options);
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java
index 744e92f6d..ea9fb4388 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/internal/p2/jarprocessor/Utils.java
@@ -16,6 +16,8 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipException;
 
+import org.eclipse.equinox.p2.jarprocessor.JarProcessor;
+
 /**
  * @author aniefer@ca.ibm.com
  *
@@ -52,11 +54,11 @@ public class Utils {
 	//Exclude this jar from signing
 	public static final String MARK_EXCLUDE_SIGN = "jarprocessor.exclude.sign"; //$NON-NLS-1$
 	//Exclude this jar's children from processing
-	public static final String MARK_EXCLUDE_CHILDREN = "jarprocessor.exclude.children";
+	public static final String MARK_EXCLUDE_CHILDREN = "jarprocessor.exclude.children"; //$NON-NLS-1$
 	//Exclude this jar's children from pack200
-	public static final String MARK_EXCLUDE_CHILDREN_PACK = "jarprocessor.exclude.children.pack";
+	public static final String MARK_EXCLUDE_CHILDREN_PACK = "jarprocessor.exclude.children.pack"; //$NON-NLS-1$
 	//Exclude this jar's children from signing
-	public static final String MARK_EXCLUDE_CHILDREN_SIGN = "jarprocessor.exclude.children.sign";
+	public static final String MARK_EXCLUDE_CHILDREN_SIGN = "jarprocessor.exclude.children.sign"; //$NON-NLS-1$
 	//Arguments used in pack200 for this jar
 	public static final String PACK_ARGS = "pack200.args"; //$NON-NLS-1$
 
@@ -76,7 +78,7 @@ public class Utils {
 
 	public static final FileFilter PACK_GZ_FILTER = new FileFilter() {
 		public boolean accept(File pathname) {
-			return pathname.isFile() && pathname.getName().endsWith(PACKED_SUFFIX);
+			return pathname.isFile() && pathname.getName().endsWith(JarProcessor.PACKED_SUFFIX);
 		}
 	};
 
@@ -246,7 +248,7 @@ public class Utils {
 	public static Properties getEclipseInf(File jarFile, boolean verbose) {
 		if (jarFile == null || !jarFile.exists()) {
 			if (verbose)
-				System.out.println("Failed to obtain eclipse.inf due to missing jar file: " + jarFile);
+				System.out.println("Failed to obtain eclipse.inf due to missing jar file: " + jarFile); //$NON-NLS-1$
 			return null;
 		}
 		JarFile jar = null;
@@ -257,7 +259,7 @@ public class Utils {
 			return null;
 		} catch (IOException e) {
 			if (verbose) {
-				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile);
+				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile); //$NON-NLS-1$
 				e.printStackTrace();
 			}
 			return null;
@@ -274,7 +276,7 @@ public class Utils {
 			return new Properties();
 		} catch (IOException e) {
 			if (verbose) {
-				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile);
+				System.out.println("Failed to obtain eclipse.inf due to IOException: " + jarFile); //$NON-NLS-1$
 				e.printStackTrace();
 			}
 			return null;
@@ -319,7 +321,7 @@ public class Utils {
 			printStream.print(key);
 			printStream.print(" = "); //$NON-NLS-1$
 			printStream.print(sorted.get(key));
-			printStream.print("\n");
+			printStream.print("\n"); //$NON-NLS-1$
 
 		}
 		printStream.flush();
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java
index b3e2e4ca7..e017ec974 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessor.java
@@ -347,13 +347,13 @@ public class JarProcessor {
 		return result;
 	}
 	
-	private void normalize(File input, File workingDirectory) {
-		if(input.getName().endsWith(Utils.PACKED_SUFFIX)) {
+	private void normalize(File input, File directory) {
+		if(input.getName().endsWith(JarProcessor.PACKED_SUFFIX)) {
 			//not a jar
 			return;
 		}
 		try {
-			File tempJar = new File(workingDirectory, "temp_" + input.getName()); //$NON-NLS-1$
+			File tempJar = new File(directory, "temp_" + input.getName()); //$NON-NLS-1$
 			JarFile jar = null;
 			try {
 				jar = new JarFile(input, false);
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java
index 92c762562..0fa529ce8 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/equinox/p2/jarprocessor/JarProcessorExecutor.java
@@ -15,9 +15,19 @@ import java.io.*;
 import java.util.Properties;
 import java.util.zip.ZipException;
 import org.eclipse.equinox.internal.p2.jarprocessor.*;
-import org.eclipse.equinox.internal.p2.jarprocessor.Main.Options;
 
 public class JarProcessorExecutor {
+	public static class Options {
+		public String outputDir = "."; //$NON-NLS-1$
+		public String signCommand = null;
+		public boolean pack = false;
+		public boolean repack = false;
+		public boolean unpack = false;
+		public boolean verbose = false;
+		public boolean processAll = false;
+		public File input = null;
+	}
+
 	public void runJarProcessor(Options options) {
 		if (options.input.isFile() && options.input.getName().endsWith(".zip")) { //$NON-NLS-1$
 			ZipProcessor processor = new ZipProcessor();
@@ -48,7 +58,7 @@ public class JarProcessorExecutor {
 			//load options file
 			Properties properties = new Properties();
 			if (options.input.isDirectory()) {
-				File packProperties = new File(options.input, "pack.properties");
+				File packProperties = new File(options.input, "pack.properties"); //$NON-NLS-1$
 				if (packProperties.exists() && packProperties.isFile()) {
 					InputStream in = null;
 					try {
@@ -104,7 +114,7 @@ public class JarProcessorExecutor {
 				String dir = processor.getWorkingDirectory();
 				processor.setWorkingDirectory(dir + "/" + files[i].getName()); //$NON-NLS-1$
 				if (packProcessor != null)
-					packProcessor.setWorkingDirectory(dir + "/" + files[i].getName());
+					packProcessor.setWorkingDirectory(dir + "/" + files[i].getName()); //$NON-NLS-1$
 				process(files[i], filter, verbose, processor, packProcessor);
 				processor.setWorkingDirectory(dir);
 				if (packProcessor != null)
@@ -123,19 +133,19 @@ public class JarProcessorExecutor {
 		}
 	}
 
-	public void addPackUnpackStep(JarProcessor processor, Properties properties, Options options) {
+	public void addPackUnpackStep(JarProcessor processor, Properties properties, JarProcessorExecutor.Options options) {
 		processor.addProcessStep(new PackUnpackStep(properties, options.verbose));
 	}
 
-	public void addSignStep(JarProcessor processor, Properties properties, Options options) {
+	public void addSignStep(JarProcessor processor, Properties properties, JarProcessorExecutor.Options options) {
 		processor.addProcessStep(new SignCommandStep(properties, options.signCommand, options.verbose));
 	}
 
-	public void addPackStep(JarProcessor processor, Properties properties, Options options) {
+	public void addPackStep(JarProcessor processor, Properties properties, JarProcessorExecutor.Options options) {
 		processor.addProcessStep(new PackStep(properties, options.verbose));
 	}
 
-	public void addUnpackStep(JarProcessor processor, Properties properties, Options options) {
+	public void addUnpackStep(JarProcessor processor, Properties properties, JarProcessorExecutor.Options options) {
 		processor.addProcessStep(new UnpackStep(properties, options.verbose));
 	}
 }