Attachment #39287 for bug #137975

Lines 90-95 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaCorePreferenceInitializer.java (+3 lines)
90	// Time out for parameter names	90	// Time out for parameter names
91	defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$	91	defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$
92		92
		93	// enable external javadoc attachment
		94	defaultOptionsMap.put(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, JavaCore.ENABLED);
		95
93	// Store default values to default preferences	96	// Store default values to default preferences
94	IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(JavaCore.PLUGIN_ID);	97	IEclipsePreferences defaultPreferences = ((IScopeContext) new DefaultScope()).getNode(JavaCore.PLUGIN_ID);
95	for (Iterator iter = defaultOptionsMap.entrySet().iterator(); iter.hasNext();) {	98	for (Iterator iter = defaultOptionsMap.entrySet().iterator(); iter.hasNext();) {

Lines 1477-1482 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaModelManager.java (+3 lines)
1477		1477
1478	// Time out for parameter names	1478	// Time out for parameter names
1479	defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$	1479	defaultOptionsMap.put(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, "50"); //$NON-NLS-1$
		1480
		1481	// enable external javadoc attachment
		1482	defaultOptionsMap.put(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, JavaCore.ENABLED);
1480		1483
1481	return new Hashtable(defaultOptionsMap);	1484	return new Hashtable(defaultOptionsMap);
1482	}	1485	}

Lines 1054-1059 Link Here

(-)model/org/eclipse/jdt/internal/core/BinaryType.java (+4 lines)
1054	if (cachedJavadoc != null && cachedJavadoc != EMPTY_JAVADOC) {	1054	if (cachedJavadoc != null && cachedJavadoc != EMPTY_JAVADOC) {
1055	return cachedJavadoc;	1055	return cachedJavadoc;
1056	}	1056	}
		1057	String option = this.getJavaProject().getOption(JavaCore.ENABLE_JAVADOC_ATTACHMENTS, true);
		1058	if (JavaCore.DISABLED.equals(option)) {
		1059	return null;
		1060	}
1057		1061
1058	URL baseLocation= getJavadocBaseLocation();	1062	URL baseLocation= getJavadocBaseLocation();
1059	if (baseLocation == null) {	1063	if (baseLocation == null) {

Lines 935-941 Link Here

(-)model/org/eclipse/jdt/core/JavaCore.java (-1 / +12 lines)
935	*/	935	*/
936	public static final String TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC = PLUGIN_ID + ".timeoutForParameterNameFromAttachedJavadoc"; //$NON-NLS-1$	936	public static final String TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC = PLUGIN_ID + ".timeoutForParameterNameFromAttachedJavadoc"; //$NON-NLS-1$
937		937
938		938	/**
		939	* Possible configurable option ID.
		940	* @see #getDefaultOptions()
		941	* @since 3.2
		942	*/
		943	public static final String ENABLE_JAVADOC_ATTACHMENTS = PLUGIN_ID + ".enable.external.javadoc.attachments"; //$NON-NLS-1$
939	// ************* Possible values for configurable options. ******************	944	// ************* Possible values for configurable options. ******************
940		945
941	/**	946	/**
Lines 2386-2391 Link Here
2386	* - possible values: "<n>", where n is an integer greater than or equal to 0	2391	* - possible values: "<n>", where n is an integer greater than or equal to 0
2387	* - default: "50"	2392	* - default: "50"
2388	*	2393	*
		2394	* JAVACORE / Enabling the javadoc attachments.
		2395	* When disabled, javadoc attachments are not used to retrieve the javadoc of java elements.
		2396	* - option id: "org.eclipse.jdt.core.enable.javadoc.attachments"
		2397	* - possible values: { "enabled", "disabled" }
		2398	* - default: "enabled"
		2399	*
2389	* FORMATTER / Inserting New Line Before Opening Brace	2400	* FORMATTER / Inserting New Line Before Opening Brace
2390	* When Insert, a new line is inserted before an opening brace, otherwise nothing	2401	* When Insert, a new line is inserted before an opening brace, otherwise nothing
2391	* is inserted	2402	* is inserted

Return to bug 137975