Attachment 178171 Details for Bug 308000 – Additional patch

[patch] Additional patch

v06b.txt (text/plain), 4.82 KB, created by Frederic Fusier

on 2010-09-03 12:07:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2010-09-03 12:07:02 EDT

Size: 4.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v
>retrieving revision 1.118
>diff -u -r1.118 DefaultCodeFormatterConstants.java
>--- formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	3 Sep 2010 15:44:26 -0000	1.118
>+++ formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	3 Sep 2010 16:03:54 -0000
>@@ -3907,35 +3907,6 @@
> 	}
> 
> 	/**
>-	 * Return an array of compatible constants for an obsolete constant.
>-	 * 
>-	 * @param name The name of the obsolete constant
>-	 * @return The list as a non-empty array of the compatible constants or
>-	 * <code>null</code> if the constant is not obsolete.
>-	 */
>-	public static String[] getCompatibleConstants(String name) {
>-		if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER.equals(name)) {
>-			return new String[] {
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
>-			};
>-		}
>-		if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION.equals(name)) {
>-			return new String[] {
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE,
>-				FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER
>-			};
>-		}
>-		return null;
>-	}
>-
>-	/**
> 	 * Return the indentation style of the given alignment value.
> 	 * The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code>
> 	 * API.
>Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
>retrieving revision 1.455
>diff -u -r1.455 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	3 Sep 2010 15:44:26 -0000	1.455
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	3 Sep 2010 16:03:55 -0000
>@@ -2111,7 +2111,7 @@
> 	public void migrateObsoleteOption(Map options, String optionName, String optionValue) {
> 
> 		// Migrate formatter options
>-		String[] compatibleConstants = DefaultCodeFormatterConstants.getCompatibleConstants(optionName);
>+		String[] compatibleConstants = getFormatterCompatibleConstants(optionName);
> 		if (compatibleConstants != null) {
> 			for (int i=0, length=compatibleConstants.length; i < length; i++) {
> 				options.put(compatibleConstants[i], optionValue);
>@@ -2120,6 +2120,36 @@
> 		}
> 	}
> 
>+	/**
>+	 * Return an array of compatible constants for an obsolete constant.
>+	 * 
>+	 * @param name The name of the obsolete constant
>+	 * @return The list as a non-empty array of the compatible constants or
>+	 * <code>null</code> if the constant is not obsolete.
>+	 * @deprecated As using deprecated formatter constants
>+	 */
>+	private static String[] getFormatterCompatibleConstants(String name) {
>+		if (DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER.equals(name)) {
>+			return new String[] {
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
>+			};
>+		}
>+		if (DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION.equals(name)) {
>+			return new String[] {
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE,
>+				DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER
>+			};
>+		}
>+		return null;
>+	}
>+
> 	// Do not modify without modifying getDefaultOptions()
> 	private Hashtable getDefaultOptionsNoInitialization() {
> 		Map defaultOptionsMap = new CompilerOptions().getMap(); // compiler defaults

Actions: View | Diff

Attachments on bug 308000: 172780 | 176332 | 176715 | 177102 | 177845 | 178168 | 178171