Attachment #178171 for bug #308000




	}

	/**
	 * 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 <b>not</b> 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;
	}

	/**
	 * <p>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.




	public void migrateObsoleteOption(Map options, String optionName, String optionValue) {

		// Migrate formatter options
		String[] compatibleConstants = getFormatterCompatibleConstants(optionName);
		if (compatibleConstants != null) {
			for (int i=0, length=compatibleConstants.length; i < length; i++) {
				options.put(compatibleConstants[i], optionValue);

		}
	}

	/**
	 * 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 <b>not</b> 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

Return to bug 308000

Lines 3907-3941 Link Here

(-)formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java (-29 lines)
3907	}	3907	}
3908		3908
3909	/**	3909	/**
3910	* Return an array of compatible constants for an obsolete constant.
3911	*
3912	* @param name The name of the obsolete constant
3913	* @return The list as a non-empty array of the compatible constants or
3914	* <code>null</code> if the constant is <b>not</b> obsolete.
3915	*/
3916	public static String[] getCompatibleConstants(String name) {
3917	if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER.equals(name)) {
3918	return new String[] {
3919	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
3920	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
3921	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
3922	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
3923	};
3924	}
3925	if (FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION.equals(name)) {
3926	return new String[] {
3927	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
3928	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
3929	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
3930	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE,
3931	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE,
3932	FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER
3933	};
3934	}
3935	return null;
3936	}
3937
3938	/**
3939	* <p>Return the indentation style of the given alignment value.	3910	* <p>Return the indentation style of the given alignment value.
3940	* The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code>	3911	* The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code>
3941	* API.	3912	* API.

Lines 2111-2117 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (-1 / +31 lines)
2111	public void migrateObsoleteOption(Map options, String optionName, String optionValue) {	2111	public void migrateObsoleteOption(Map options, String optionName, String optionValue) {
2112		2112
2113	// Migrate formatter options	2113	// Migrate formatter options
2114	String[] compatibleConstants = DefaultCodeFormatterConstants.getCompatibleConstants(optionName);	2114	String[] compatibleConstants = getFormatterCompatibleConstants(optionName);
2115	if (compatibleConstants != null) {	2115	if (compatibleConstants != null) {
2116	for (int i=0, length=compatibleConstants.length; i < length; i++) {	2116	for (int i=0, length=compatibleConstants.length; i < length; i++) {
2117	options.put(compatibleConstants[i], optionValue);	2117	options.put(compatibleConstants[i], optionValue);
Lines 2120-2125 Link Here
2120	}	2120	}
2121	}	2121	}
2122		2122
		2123	/**
		2124	* Return an array of compatible constants for an obsolete constant.
		2125	*
		2126	* @param name The name of the obsolete constant
		2127	* @return The list as a non-empty array of the compatible constants or
		2128	* <code>null</code> if the constant is <b>not</b> obsolete.
		2129	* @deprecated As using deprecated formatter constants
		2130	*/
		2131	private static String[] getFormatterCompatibleConstants(String name) {
		2132	if (DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_MEMBER.equals(name)) {
		2133	return new String[] {
		2134	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
		2135	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
		2136	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
		2137	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE
		2138	};
		2139	}
		2140	if (DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION.equals(name)) {
		2141	return new String[] {
		2142	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_FIELD,
		2143	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_METHOD,
		2144	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PACKAGE,
		2145	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_TYPE,
		2146	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_LOCAL_VARIABLE,
		2147	DefaultCodeFormatterConstants.FORMATTER_INSERT_NEW_LINE_AFTER_ANNOTATION_ON_PARAMETER
		2148	};
		2149	}
		2150	return null;
		2151	}
		2152
2123	// Do not modify without modifying getDefaultOptions()	2153	// Do not modify without modifying getDefaultOptions()
2124	private Hashtable getDefaultOptionsNoInitialization() {	2154	private Hashtable getDefaultOptionsNoInitialization() {
2125	Map defaultOptionsMap = new CompilerOptions().getMap(); // compiler defaults	2155	Map defaultOptionsMap = new CompilerOptions().getMap(); // compiler defaults