Attachment 40204 Details for Bug 139056 – fix jarprocessor compile problems

[patch] fix jarprocessor compile problems

139056.txt (text/plain), 2.63 KB, created by Andrew Niefer

on 2006-05-03 10:28:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2006-05-03 10:28:26 EDT

Size: 2.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/jarprocessor/Utils.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/jarprocessor/Utils.java,v
>retrieving revision 1.2
>diff -u -r1.2 Utils.java
>--- src/org/eclipse/update/internal/jarprocessor/Utils.java	21 Apr 2006 18:54:55 -0000	1.2
>+++ src/org/eclipse/update/internal/jarprocessor/Utils.java	3 May 2006 14:24:53 -0000
>@@ -151,7 +151,7 @@
> 
> 		String packExcludes = properties.getProperty("pack.excludes"); //$NON-NLS-1$
> 		if (packExcludes != null) {
>-			String[] excludes = packExcludes.split(",\\s*"); //$NON-NLS-1$
>+			String[] excludes = toStringArray(packExcludes, ","); //$NON-NLS-1$
> 			Set packExclusions = new HashSet();
> 			for (int i = 0; i < excludes.length; i++) {
> 				packExclusions.add(excludes[i]);
>@@ -166,7 +166,7 @@
> 			return Collections.EMPTY_SET;
> 		String signExcludes = properties.getProperty("sign.excludes"); //$NON-NLS-1$
> 		if (signExcludes != null) {
>-			String[] excludes = signExcludes.split(",\\s*"); //$NON-NLS-1$
>+			String[] excludes = toStringArray(signExcludes, ","); //$NON-NLS-1$
> 			Set signExclusions = new HashSet();
> 			for (int i = 0; i < excludes.length; i++) {
> 				signExclusions.add(excludes[i]);
>@@ -185,4 +185,14 @@
> 		}
> 		return buffer.toString();
> 	}
>+
>+	public static String[] toStringArray(String input, String separator) {
>+		StringTokenizer tokenizer = new StringTokenizer(input, separator);
>+		int count = tokenizer.countTokens();
>+		String[] result = new String[count];
>+		for (int i = 0; i < count; i++) {
>+			result[i] = tokenizer.nextToken();
>+		}
>+		return result;
>+	}
> }
>Index: src/org/eclipse/update/internal/jarprocessor/PackStep.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/jarprocessor/PackStep.java,v
>retrieving revision 1.2
>diff -u -r1.2 PackStep.java
>--- src/org/eclipse/update/internal/jarprocessor/PackStep.java	21 Apr 2006 18:54:55 -0000	1.2
>+++ src/org/eclipse/update/internal/jarprocessor/PackStep.java	3 May 2006 14:24:53 -0000
>@@ -91,7 +91,7 @@
> 		String[] cmd = null;
> 		String arguments = getOptions().getProperty(input.getName() + ".pack.args"); //$NON-NLS-1$
> 		if (arguments != null) {
>-			String[] args = arguments.split(",\\s*"); //$NON-NLS-1$
>+			String[] args = Utils.toStringArray(arguments, ","); //$NON-NLS-1$
> 			cmd = new String[3 + args.length];
> 			cmd[0] = packCommand;
> 			System.arraycopy(args, 0, cmd, 1, args.length);

Actions: View | Diff

Attachments on bug 139056: 40204 | 40391 | 40424