Attachment 39287 Details for Bug 137975 – Proposed fix

[patch] Proposed fix

patch_137975.txt (text/plain), 4.32 KB, created by Olivier Thomann

on 2006-04-24 11:23:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-04-24 11:23:56 EDT

Size: 4.32 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java,v
>retrieving revision 1.34
>diff -u -r1.34 JavaCorePreferenceInitializer.java
>--- model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java	29 Mar 2006 03:08:48 -0000	1.34
>+++ model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java	24 Apr 2006 15:07:55 -0000
>@@ -90,6 +90,9 @@
> 		// Time out for parameter names
> 		defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$
> 		
>+		// enable external javadoc attachment
>+		defaultOptionsMap.put(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, JavaCore.ENABLED);
>+
> 		// Store default values to default preferences
> 	 	IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(JavaCore.PLUGIN_ID);
> 		for (Iterator iter = defaultOptionsMap.entrySet().iterator(); iter.hasNext();) {
>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.335
>diff -u -r1.335 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	6 Apr 2006 15:22:52 -0000	1.335
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	24 Apr 2006 15:07:55 -0000
>@@ -1477,6 +1477,9 @@
> 		
> 		// Time out for parameter names
> 		defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$
>+
>+		// enable external javadoc attachment
>+		defaultOptionsMap.put(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, JavaCore.ENABLED);
> 		
> 		return new Hashtable(defaultOptionsMap);
> 	}
>Index: model/org/eclipse/jdt/internal/core/BinaryType.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java,v
>retrieving revision 1.144
>diff -u -r1.144 BinaryType.java
>--- model/org/eclipse/jdt/internal/core/BinaryType.java	6 Apr 2006 01:47:51 -0000	1.144
>+++ model/org/eclipse/jdt/internal/core/BinaryType.java	24 Apr 2006 15:07:55 -0000
>@@ -1054,6 +1054,10 @@
> 	if (cachedJavadoc != null && cachedJavadoc != EMPTY_JAVADOC) {
> 		return cachedJavadoc;
> 	}
>+	String option = this.getJavaProject().getOption(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, true);
>+	if (JavaCore.DISABLED.equals(option)) {
>+		return null;
>+	}
> 	
> 	URL baseLocation= getJavadocBaseLocation();
> 	if (baseLocation == null) {
>Index: model/org/eclipse/jdt/core/JavaCore.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
>retrieving revision 1.539
>diff -u -r1.539 JavaCore.java
>--- model/org/eclipse/jdt/core/JavaCore.java	6 Apr 2006 15:22:52 -0000	1.539
>+++ model/org/eclipse/jdt/core/JavaCore.java	24 Apr 2006 15:07:55 -0000
>@@ -935,7 +935,12 @@
> 	 */
> 	public static final String TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC = PLUGIN_ID + ".timeoutForParameterNameFromAttachedJavadoc"; //$NON-NLS-1$
> 
>-	
>+	/**
>+	 * Possible  configurable option ID.
>+	 * @see #getDefaultOptions()
>+	 * @since 3.2
>+	 */
>+	public static final String ENABLE_JAVADOC_ATTACHMENTS = PLUGIN_ID + ".enable.external.javadoc.attachments"; //$NON-NLS-1$
> 	// *************** Possible values for configurable options. ********************
> 	
> 	/**
>@@ -2386,6 +2391,12 @@
> 	 *     - possible values:	"&lt;n&gt;", where n is an integer greater than or equal to 0
> 	 *     - default:           "50"
> 	 * 
>+	 *	JAVACORE / Enabling the javadoc attachments.
>+	 *    When disabled, javadoc attachments are not used to retrieve the javadoc of java elements.
>+	 *     - option id:         "org.eclipse.jdt.core.enable.javadoc.attachments"
>+	 *     - possible values:   { "enabled", "disabled" }
>+	 *     - default:           "enabled"
>+	 * 
> 	 *	FORMATTER / Inserting New Line Before Opening Brace
> 	 *    When Insert, a new line is inserted before an opening brace, otherwise nothing
> 	 *    is inserted

Actions: View | Diff

Attachments on bug 137975: 39192 | 39287