Attachment 196750 Details for Bug 347302 – Fix 2 (revert bug 338673)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix 2 (revert bug 338673)

347302_patch2.txt (text/plain), 2.25 KB, created by Markus Keller

on 2011-05-27 08:48:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2011-05-27 08:48:49 EDT

Size: 2.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java,v
>retrieving revision 1.36
>diff -u -r1.36 NewJavaProjectPreferencePage.java
>--- ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java	18 Apr 2011 16:07:53 -0000	1.36
>+++ ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java	27 May 2011 12:41:10 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
>+// AW
> package org.eclipse.jdt.internal.ui.preferences;
> 
> import java.io.UnsupportedEncodingException;
>@@ -65,12 +66,9 @@
> import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
> import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
> 
>-
>-/**
>- * The preference page for defaults for classpath entries in new java projects.
>- * <p>
>- * See {@link PreferenceConstants} on how to access or change these values through public API.
>- * </p>
>+/*
>+ * The page for defaults for classpath entries in new java projects.
>+ * See PreferenceConstants to access or change these values through public API.
>  */
> public class NewJavaProjectPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
> 
>@@ -111,11 +109,10 @@
> 
> 	public static String decodeJRELibraryDescription(String encoded) {
> 		int end= encoded.indexOf(' ');
>-		if (end == -1)
>-			return ""; //$NON-NLS-1$
>-
>-		String decodedDescription= decode(encoded.substring(0, end));
>-		return decodedDescription.length() > 0 ? decodedDescription : encoded;
>+		if (end != -1) {
>+			return decode(encoded.substring(0, end));
>+		}
>+		return ""; //$NON-NLS-1$
> 	}
> 
> 	private static String decode(String str) {
>@@ -180,7 +177,7 @@
> 		StringBuffer buf= new StringBuffer();
> 		for (int i= 0; i < cpentries.length; i++) {
> 			IClasspathEntry entry= cpentries[i];
>-			buf.append(desc);
>+			buf.append(encode(desc));
> 			buf.append(' ');
> 			buf.append(entry.getEntryKind());
> 			buf.append(' ');

Flags:

daniel_megert: review+

Actions: View | Diff

Attachments on bug 347302: 196657 | 196660 | 196665 | 196750