Attachment #188440 for bug #178071

View | Details | Raw Unified | Return to bug 178071
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2005, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	String JAVADOC_LOCATION_ATTRIBUTE_NAME = "javadoc_location"; //$NON-NLS-1$

	/**
	 * Constant for the name of the "prefer attached Javadoc over attached
	 * source" attribute.
	 * <p>
	 * The possible values
	 * for this attribute are <code>"true"</code> or <code>"false"</code>.
	 * When not present, <code>"false"</code> is assumed.
	 * If the value of this attribute is <code>"true"</code>, then Javadoc
	 * from {@link #JAVADOC_LOCATION_ATTRIBUTE_NAME} should be preferred over
	 * Javadoc from {@link IClasspathEntry#getSourceAttachmentPath()}.
	 * 
	 * @since 3.7
	 */
	String JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME = "javadoc_preferred"; //$NON-NLS-1$
	
	/**
	 * Constant for the name of the optional attribute. The possible values
	 * for this attribute are <code>"true"</code> or <code>"false"</code>.
	 * When not present, <code>"false"</code> is assumed.

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 533-539 Link Here
533		533
534	fElement= selection;	534	fElement= selection;
535	URL initialLocation= selection.getURL();	535	URL initialLocation= selection.getURL();
536	fJavadocConfigurationBlock= new JavadocConfigurationBlock(parent, this, initialLocation, selection.isProjectRef());	536	fJavadocConfigurationBlock= new JavadocConfigurationBlock(parent, this, initialLocation, false, selection.isProjectRef());
537	}	537	}
538		538
539	protected Control createDialogArea(Composite parent) {	539	protected Control createDialogArea(Composite parent) {




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	private StringDialogField fArchiveField;
	private StringDialogField fArchivePathField;
	private URL fInitialURL;
	private boolean fInitialPreferJavadocLocation;
	private SelectionButtonDialogField fValidateURLButton;
	private SelectionButtonDialogField fValidateArchiveButton;
	private SelectionButtonDialogField fBrowseFolder;

	private SelectionButtonDialogField fBrowseArchive;
	private SelectionButtonDialogField fExternalRadio, fWorkspaceRadio;
	private SelectionButtonDialogField fBrowseArchivePath;
	private SelectionButtonDialogField fPreferJavadocLocationButton;
	private Shell fShell;
	private IStatusChangeListener fContext;


	boolean fIsForSource;


	public JavadocConfigurationBlock(Shell shell,  IStatusChangeListener context, URL initURL, boolean initPreferJavadocLocation, boolean forSource) {
		fShell= shell;
		fContext= context;
		fInitialURL= initURL;
		fInitialPreferJavadocLocation= initPreferJavadocLocation;
		fIsForSource= forSource;

		JDocConfigurationAdapter adapter= new JDocConfigurationAdapter();

			fValidateArchiveButton= new SelectionButtonDialogField(SWT.PUSH);
			fValidateArchiveButton.setDialogFieldListener(adapter);
			fValidateArchiveButton.setLabelText(PreferencesMessages.JavadocConfigurationBlock_validate_button);
			
			fPreferJavadocLocationButton= new SelectionButtonDialogField(SWT.CHECK);
			fPreferJavadocLocationButton.setDialogFieldListener(adapter);
			fPreferJavadocLocationButton.setLabelText("&Prefer attached Javadoc over Javadoc from attached source");
		}

		fURLStatus= new StatusInfo();


			fURLRadioButton.attachDialogFields(new DialogField[] {fURLField,  fBrowseFolder, fValidateURLButton });
			fArchiveRadioButton.attachDialogFields(new DialogField[] {fArchiveField,  fBrowseArchive, fExternalRadio, fWorkspaceRadio, fArchivePathField, fBrowseArchivePath, fValidateArchiveButton });
			
			fPreferJavadocLocationButton.doFillIntoGrid(topComp, 1);
		}



		fExternalRadio.setSelection(!isWorkspaceArchive);
		fWorkspaceRadio.setSelection(isWorkspaceArchive);

		fPreferJavadocLocationButton.setSelection(fInitialPreferJavadocLocation);
	}

	public void setFocus() {

		}
		return fArchiveURLResult;
	}
	
	public boolean getPreferJavadocLocation() {
		return fPreferJavadocLocationButton.isSelected();
	}

	private class EntryValidator implements Runnable {





/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.ArrayList;

import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;

import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
import org.eclipse.jdt.internal.ui.text.javadoc.JavadocContentAccess2;
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;

	private IPath fContainerPath;
	private IClasspathEntry fEntry;
	private URL fInitalLocation;
	private boolean finitialPreferAttachedJavadoc;

	public JavadocConfigurationPropertyPage() {
	}

		if (elem != null) {
			try {
				fInitalLocation= JavaUI.getJavadocBaseLocation(elem);
				finitialPreferAttachedJavadoc= JavadocContentAccess2.getPreferAttachedJavadoc(elem);
			} catch (JavaModelException e) {
				JavaPlugin.log(e);
			}
		}

		boolean isProject= (elem instanceof IJavaProject);
		fJavadocConfigurationBlock= new JavadocConfigurationBlock(getShell(), this, fInitalLocation, finitialPreferAttachedJavadoc, isProject);
		Control control= fJavadocConfigurationBlock.createContents(parent);
		control.setVisible(elem != null);


	 */
	public boolean performOk() {
		if (fJavadocConfigurationBlock != null) {
			final URL javadocLocation= fJavadocConfigurationBlock.getJavadocLocation();
			final boolean preferAttachedJavadoc= fJavadocConfigurationBlock.getPreferJavadocLocation();
			
			final boolean javadocLocationModified= !(javadocLocation == null && fInitalLocation == null
					|| javadocLocation != null && fInitalLocation != null && javadocLocation.toExternalForm().equals(fInitalLocation.toExternalForm()));
			final boolean preferAttachedJavadocModified= preferAttachedJavadoc != finitialPreferAttachedJavadoc;
			if (javadocLocationModified && preferAttachedJavadocModified)
				return true; // no change
			}


			final Shell shell= getShell();
			final IJavaElement elem= getJavaElement();
			try {
				IRunnableWithProgress runnable= new IRunnableWithProgress() {
					public void run(IProgressMonitor monitor) throws InvocationTargetException {
						try {
							IJavaProject project= elem.getJavaProject();
							if (elem instanceof IPackageFragmentRoot) {
								ArrayList changedAttributes= new ArrayList(2);
								CPListElement cpElem= CPListElement.createFromExisting(fEntry, project);
								IClasspathEntry newEntry= cpElem.getClasspathEntry();
								if (javadocLocationModified) {
									String loc= javadocLocation != null ? javadocLocation.toExternalForm() : null;
									cpElem.setAttribute(CPListElement.JAVADOC, loc);
									changedAttributes.add(CPListElement.JAVADOC);
								}
								if (preferAttachedJavadocModified) {
									cpElem.setAttribute(CPListElement.PREFER_JAVADOC, Boolean.valueOf(preferAttachedJavadoc));
									changedAttributes.add(CPListElement.PREFER_JAVADOC);
								}
								String[] changedAttributes2= (String[]) changedAttributes.toArray(new String[changedAttributes.size()]);
								BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes2, project, fContainerPath, fEntry.getReferencingEntry() != null, monitor);
							} else {
								JavaUI.setProjectJavadocLocation(project, javadocLocation);
							}
						} catch (CoreException e) {
							throw new InvocationTargetException(e);
						}
					}
				};
				PlatformUI.getWorkbench().getProgressService().run(true, true, runnable);
			} catch (InvocationTargetException e) {
				String title= PreferencesMessages.SourceAttachmentPropertyPage_error_title;

	}


	private static IRunnableWithProgress getRunnable(final Shell shell, final IJavaElement elem, final URL javadocLocation, final IClasspathEntry entry, final IPath containerPath) {
		return new IRunnableWithProgress() {
			public void run(IProgressMonitor monitor) throws InvocationTargetException {
				try {
					IJavaProject project= elem.getJavaProject();
					if (elem instanceof IPackageFragmentRoot) {
						CPListElement cpElem= CPListElement.createFromExisting(entry, project);
						String loc= javadocLocation != null ? javadocLocation.toExternalForm() : null;
						cpElem.setAttribute(CPListElement.JAVADOC, loc);
						IClasspathEntry newEntry= cpElem.getClasspathEntry();
						String[] changedAttributes= { CPListElement.JAVADOC };
						BuildPathSupport.modifyClasspathEntry(shell, newEntry, changedAttributes, project, containerPath, entry.getReferencingEntry() != null, monitor);
					} else {
						JavaUI.setProjectJavadocLocation(project, javadocLocation);
					}
				} catch (CoreException e) {
					throw new InvocationTargetException(e);
				}
			}
		};
	}


	/**
	 * @see IStatusChangeListener#statusChanged(IStatus)
	 */

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java (-19 / +43 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2010 IBM Corporation and others.	2	* Copyright (c) 2008, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 31-37 Link Here
31	import org.eclipse.jface.internal.text.html.HTMLPrinter;	31	import org.eclipse.jface.internal.text.html.HTMLPrinter;
32		32
33	import org.eclipse.jdt.core.IBuffer;	33	import org.eclipse.jdt.core.IBuffer;
		34	import org.eclipse.jdt.core.IClasspathAttribute;
		35	import org.eclipse.jdt.core.IClasspathEntry;
34	import org.eclipse.jdt.core.IField;	36	import org.eclipse.jdt.core.IField;
		37	import org.eclipse.jdt.core.IJavaElement;
35	import org.eclipse.jdt.core.IJavaProject;	38	import org.eclipse.jdt.core.IJavaProject;
36	import org.eclipse.jdt.core.IMember;	39	import org.eclipse.jdt.core.IMember;
37	import org.eclipse.jdt.core.IMethod;	40	import org.eclipse.jdt.core.IMethod;
Lines 447-477 Link Here
447	* @throws JavaModelException is thrown when the element's Javadoc can not be accessed	450	* @throws JavaModelException is thrown when the element's Javadoc can not be accessed
448	*/	451	*/
449	public static String getHTMLContent(IMember member, boolean useAttachedJavadoc) throws JavaModelException {	452	public static String getHTMLContent(IMember member, boolean useAttachedJavadoc) throws JavaModelException {
		453	//TODO: remove unused useAttachedJavadoc
		454	boolean preferAttached= getPreferAttachedJavadoc(member);
		455	if (preferAttached) {
		456	String attached= member.getAttachedJavadoc(null);
		457	if (attached != null)
		458	return attached;
		459	}
450	String sourceJavadoc= getHTMLContentFromSource(member);	460	String sourceJavadoc= getHTMLContentFromSource(member);
451	if (sourceJavadoc == null \|\| sourceJavadoc.length() == 0 \|\| sourceJavadoc.trim().equals("{@inheritDoc}")) { //$NON-NLS-1$	461	if (sourceJavadoc == null \|\| sourceJavadoc.length() == 0 \|\| sourceJavadoc.trim().equals("{@inheritDoc}")) { //$NON-NLS-1$
452	if (useAttachedJavadoc) {	462	if (!preferAttached && member.getOpenable().getBuffer() == null) { // only if no source available
453	if (member.getOpenable().getBuffer() == null) { // only if no source available	463	return member.getAttachedJavadoc(null);
454	return member.getAttachedJavadoc(null);	464	}
455	}	465	if (canInheritJavadoc(member)) {
456	if (canInheritJavadoc(member)) {	466	IMethod method= (IMethod) member;
457	IMethod method= (IMethod) member;	467	String attachedDocInHierarchy= findAttachedDocInHierarchy(method);
458	String attachedDocInHierarchy= findAttachedDocInHierarchy(method);	468
459		469	// Prepend "Overrides:" / "Specified by:" reference headers to make clear
460	// Prepend "Overrides:" / "Specified by:" reference headers to make clear	470	// that description has been copied from super method.
461	// that description has been copied from super method.	471	if (attachedDocInHierarchy == null)
462	if (attachedDocInHierarchy == null)	472	return sourceJavadoc;
463	return sourceJavadoc;	473	StringBuffer superMethodReferences= createSuperMethodReferences(method);
464	StringBuffer superMethodReferences= createSuperMethodReferences(method);	474	if (superMethodReferences == null)
465	if (superMethodReferences == null)	475	return attachedDocInHierarchy;
466	return attachedDocInHierarchy;	476	superMethodReferences.append(attachedDocInHierarchy);
467	superMethodReferences.append(attachedDocInHierarchy);	477	return superMethodReferences.toString();
468	return superMethodReferences.toString();
469	}
470	}	478	}
471	}	479	}
472	return sourceJavadoc;	480	return sourceJavadoc;
473	}	481	}
474		482
		483	public static boolean getPreferAttachedJavadoc(IJavaElement element) throws JavaModelException {
		484	IPackageFragmentRoot root= JavaModelUtil.getPackageFragmentRoot(element);
		485	if (root == null)
		486	return false;
		487
		488	IClasspathEntry classpathEntry= root.getRawClasspathEntry();
		489	IClasspathAttribute[] extraAttributes= classpathEntry.getExtraAttributes();
		490	for (int i= 0; i < extraAttributes.length; i++) {
		491	IClasspathAttribute attribute= extraAttributes[i];
		492	if (IClasspathAttribute.JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME.equals(attribute.getName())) {
		493	return "true".equals(attribute.getValue()); //$NON-NLS-1$
		494	}
		495	}
		496	return false;
		497	}
		498
475	private static StringBuffer createSuperMethodReferences(final IMethod method) throws JavaModelException {	499	private static StringBuffer createSuperMethodReferences(final IMethod method) throws JavaModelException {
476	IType type= method.getDeclaringType();	500	IType type= method.getDeclaringType();
477	ITypeHierarchy hierarchy= SuperTypeHierarchyCache.getTypeHierarchy(type);	501	ITypeHierarchy hierarchy= SuperTypeHierarchyCache.getTypeHierarchy(type);

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java (-1 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 54-59 Link Here
54	public static final String COMBINE_ACCESSRULES= "combineaccessrules"; //$NON-NLS-1$	54	public static final String COMBINE_ACCESSRULES= "combineaccessrules"; //$NON-NLS-1$
55		55
56	public static final String JAVADOC= IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME;	56	public static final String JAVADOC= IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME;
		57	public static final String PREFER_JAVADOC= IClasspathAttribute.JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME;
57	public static final String NATIVE_LIB_PATH= JavaRuntime.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY;	58	public static final String NATIVE_LIB_PATH= JavaRuntime.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY;
58		59
59	private IJavaProject fProject;	60	private IJavaProject fProject;

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/JavadocLocationDialog.java (-3 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 23-28 Link Here
23		23
24	import org.eclipse.ui.PlatformUI;	24	import org.eclipse.ui.PlatformUI;
25		25
		26	import org.eclipse.jdt.core.IClasspathAttribute;
		27
26	import org.eclipse.jdt.internal.corext.util.Messages;	28	import org.eclipse.jdt.internal.corext.util.Messages;
27		29
28	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;	30	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
Lines 44-51 Link Here
44	* @param parent The parent shell for the dialog.	46	* @param parent The parent shell for the dialog.
45	* @param libraryName Name of of the library to which configured javadoc location belongs.	47	* @param libraryName Name of of the library to which configured javadoc location belongs.
46	* @param initialURL The initial URL or <code>null</code>.	48	* @param initialURL The initial URL or <code>null</code>.
		49	* @param preferJavadocLocation The initial value for {@link IClasspathAttribute#JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME}.
47	*/	50	*/
48	public JavadocLocationDialog(Shell parent, String libraryName, URL initialURL) {	51	public JavadocLocationDialog(Shell parent, String libraryName, URL initialURL, boolean preferJavadocLocation) {
49	super(parent);	52	super(parent);
50		53
51	IStatusChangeListener listener= new IStatusChangeListener() {	54	IStatusChangeListener listener= new IStatusChangeListener() {
Lines 55-61 Link Here
55	};	58	};
56		59
57	setTitle(Messages.format(NewWizardMessages.LibrariesWorkbookPage_JavadocPropertyDialog_title, libraryName));	60	setTitle(Messages.format(NewWizardMessages.LibrariesWorkbookPage_JavadocPropertyDialog_title, libraryName));
58	fJavadocConfigurationBlock= new JavadocConfigurationBlock(parent, listener, initialURL, false);	61	fJavadocConfigurationBlock= new JavadocConfigurationBlock(parent, listener, initialURL, preferJavadocLocation, false);
59	}	62	}
60		63
61	/*	64	/*
Lines 86-91 Link Here
86	return fJavadocConfigurationBlock.getJavadocLocation();	89	return fJavadocConfigurationBlock.getJavadocLocation();
87	}	90	}
88		91
		92	/**
		93	* Returns whether attached Javadoc is preferred over source attachments.
		94	* The result is only valid after the dialog has been opened and has not been cancelled by the user.
		95	*
		96	* @return the configured value
		97	*
		98	* @since 3.7
		99	*/
		100	public boolean getPreferJavadocLocation() {
		101	return fJavadocConfigurationBlock.getPreferJavadocLocation();
		102	}
		103
89	/*	104	/*
90	* @see org.eclipse.jface.window.Window#configureShell(Shell)	105	* @see org.eclipse.jface.window.Window#configureShell(Shell)
91	*/	106	*/




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceComparator;

import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;


			throw new IllegalArgumentException();
		}

		JavadocLocationDialog dialog=  new JavadocLocationDialog(shell, libraryName, initialURL, false);
		if (dialog.open() == Window.OK) {
			return new URL[] { dialog.getResult() };
		}

		}

		URL location= JavaUI.getLibraryJavadocLocation(initialEntry);
		boolean preferJavadocLocation= getPreferAttachedJavadoc(initialEntry);
		JavadocLocationDialog dialog=  new JavadocLocationDialog(shell, BasicElementLabels.getPathLabel(initialEntry.getPath(), false), location, preferJavadocLocation);
		if (dialog.open() == Window.OK) {
			CPListElement element= CPListElement.createFromExisting(initialEntry, null);
			URL res= dialog.getResult();
			element.setAttribute(CPListElement.JAVADOC, res != null ? res.toExternalForm() : null);
			boolean preferJavadoc= dialog.getPreferJavadocLocation();
			element.setAttribute(CPListElement.PREFER_JAVADOC, Boolean.valueOf(preferJavadoc));
			return element.getClasspathEntry();
		}
		return null;
	}
	
	private static boolean getPreferAttachedJavadoc(IClasspathEntry entry) {
		IClasspathAttribute[] extraAttributes= entry.getExtraAttributes();
		for (int i= 0; i < extraAttributes.length; i++) {
			IClasspathAttribute attrib= extraAttributes[i];
			if (IClasspathAttribute.JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME.equals(attrib.getName())) {
				return Boolean.valueOf(attrib.getValue()).booleanValue();
			}
		}
		return false;
	}

	/**
	 * Shows the UI for configuring a variable classpath entry. See {@link IClasspathEntry#CPE_VARIABLE} for

Return to bug 178071

Lines 1-5 Link Here

(-)model/org/eclipse/jdt/core/IClasspathAttribute.java (-1 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2010 IBM Corporation and others.	2	* Copyright (c) 2005, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 60-65 Link Here
60	String JAVADOC_LOCATION_ATTRIBUTE_NAME = "javadoc_location"; //$NON-NLS-1$	60	String JAVADOC_LOCATION_ATTRIBUTE_NAME = "javadoc_location"; //$NON-NLS-1$
61		61
62	/**	62	/**
		63	* Constant for the name of the "prefer attached Javadoc over attached
		64	* source" attribute.
		65	* <p>
		66	* The possible values
		67	* for this attribute are <code>"true"</code> or <code>"false"</code>.
		68	* When not present, <code>"false"</code> is assumed.
		69	* If the value of this attribute is <code>"true"</code>, then Javadoc
		70	* from {@link #JAVADOC_LOCATION_ATTRIBUTE_NAME} should be preferred over
		71	* Javadoc from {@link IClasspathEntry#getSourceAttachmentPath()}.
		72	*
		73	* @since 3.7
		74	*/
		75	String JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME = "javadoc_preferred"; //$NON-NLS-1$
		76
		77	/**
63	* Constant for the name of the optional attribute. The possible values	78	* Constant for the name of the optional attribute. The possible values
64	* for this attribute are <code>"true"</code> or <code>"false"</code>.	79	* for this attribute are <code>"true"</code> or <code>"false"</code>.
65	* When not present, <code>"false"</code> is assumed.	80	* When not present, <code>"false"</code> is assumed.

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationBlock.java (-2 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 88-93 Link Here
88	private StringDialogField fArchiveField;	88	private StringDialogField fArchiveField;
89	private StringDialogField fArchivePathField;	89	private StringDialogField fArchivePathField;
90	private URL fInitialURL;	90	private URL fInitialURL;
		91	private boolean fInitialPreferJavadocLocation;
91	private SelectionButtonDialogField fValidateURLButton;	92	private SelectionButtonDialogField fValidateURLButton;
92	private SelectionButtonDialogField fValidateArchiveButton;	93	private SelectionButtonDialogField fValidateArchiveButton;
93	private SelectionButtonDialogField fBrowseFolder;	94	private SelectionButtonDialogField fBrowseFolder;
Lines 96-101 Link Here
96	private SelectionButtonDialogField fBrowseArchive;	97	private SelectionButtonDialogField fBrowseArchive;
97	private SelectionButtonDialogField fExternalRadio, fWorkspaceRadio;	98	private SelectionButtonDialogField fExternalRadio, fWorkspaceRadio;
98	private SelectionButtonDialogField fBrowseArchivePath;	99	private SelectionButtonDialogField fBrowseArchivePath;
		100	private SelectionButtonDialogField fPreferJavadocLocationButton;
99	private Shell fShell;	101	private Shell fShell;
100	private IStatusChangeListener fContext;	102	private IStatusChangeListener fContext;
101		103
Lines 109-118 Link Here
109	boolean fIsForSource;	111	boolean fIsForSource;
110		112
111		113
112	public JavadocConfigurationBlock(Shell shell, IStatusChangeListener context, URL initURL, boolean forSource) {	114	public JavadocConfigurationBlock(Shell shell, IStatusChangeListener context, URL initURL, boolean initPreferJavadocLocation, boolean forSource) {
113	fShell= shell;	115	fShell= shell;
114	fContext= context;	116	fContext= context;
115	fInitialURL= initURL;	117	fInitialURL= initURL;
		118	fInitialPreferJavadocLocation= initPreferJavadocLocation;
116	fIsForSource= forSource;	119	fIsForSource= forSource;
117		120
118	JDocConfigurationAdapter adapter= new JDocConfigurationAdapter();	121	JDocConfigurationAdapter adapter= new JDocConfigurationAdapter();
Lines 167-172 Link Here
167	fValidateArchiveButton= new SelectionButtonDialogField(SWT.PUSH);	170	fValidateArchiveButton= new SelectionButtonDialogField(SWT.PUSH);
168	fValidateArchiveButton.setDialogFieldListener(adapter);	171	fValidateArchiveButton.setDialogFieldListener(adapter);
169	fValidateArchiveButton.setLabelText(PreferencesMessages.JavadocConfigurationBlock_validate_button);	172	fValidateArchiveButton.setLabelText(PreferencesMessages.JavadocConfigurationBlock_validate_button);
		173
		174	fPreferJavadocLocationButton= new SelectionButtonDialogField(SWT.CHECK);
		175	fPreferJavadocLocationButton.setDialogFieldListener(adapter);
		176	fPreferJavadocLocationButton.setLabelText("&Prefer attached Javadoc over Javadoc from attached source");
170	}	177	}
171		178
172	fURLStatus= new StatusInfo();	179	fURLStatus= new StatusInfo();
Lines 244-249 Link Here
244		251
245	fURLRadioButton.attachDialogFields(new DialogField[] {fURLField, fBrowseFolder, fValidateURLButton });	252	fURLRadioButton.attachDialogFields(new DialogField[] {fURLField, fBrowseFolder, fValidateURLButton });
246	fArchiveRadioButton.attachDialogFields(new DialogField[] {fArchiveField, fBrowseArchive, fExternalRadio, fWorkspaceRadio, fArchivePathField, fBrowseArchivePath, fValidateArchiveButton });	253	fArchiveRadioButton.attachDialogFields(new DialogField[] {fArchiveField, fBrowseArchive, fExternalRadio, fWorkspaceRadio, fArchivePathField, fBrowseArchivePath, fValidateArchiveButton });
		254
		255	fPreferJavadocLocationButton.doFillIntoGrid(topComp, 1);
247	}	256	}
248		257
249		258
Lines 301-306 Link Here
301	fExternalRadio.setSelection(!isWorkspaceArchive);	310	fExternalRadio.setSelection(!isWorkspaceArchive);
302	fWorkspaceRadio.setSelection(isWorkspaceArchive);	311	fWorkspaceRadio.setSelection(isWorkspaceArchive);
303		312
		313	fPreferJavadocLocationButton.setSelection(fInitialPreferJavadocLocation);
304	}	314	}
305		315
306	public void setFocus() {	316	public void setFocus() {
Lines 317-322 Link Here
317	}	327	}
318	return fArchiveURLResult;	328	return fArchiveURLResult;
319	}	329	}
		330
		331	public boolean getPreferJavadocLocation() {
		332	return fPreferJavadocLocationButton.isSelected();
		333	}
320		334
321	private class EntryValidator implements Runnable {	335	private class EntryValidator implements Runnable {
322		336

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/ui/wizards/BuildPathDialogAccess.java (-3 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 36-41 Link Here
36	import org.eclipse.ui.model.WorkbenchLabelProvider;	36	import org.eclipse.ui.model.WorkbenchLabelProvider;
37	import org.eclipse.ui.views.navigator.ResourceComparator;	37	import org.eclipse.ui.views.navigator.ResourceComparator;
38		38
		39	import org.eclipse.jdt.core.IClasspathAttribute;
39	import org.eclipse.jdt.core.IClasspathEntry;	40	import org.eclipse.jdt.core.IClasspathEntry;
40	import org.eclipse.jdt.core.IJavaProject;	41	import org.eclipse.jdt.core.IJavaProject;
41		42
Lines 130-136 Link Here
130	throw new IllegalArgumentException();	131	throw new IllegalArgumentException();
131	}	132	}
132		133
133	JavadocLocationDialog dialog= new JavadocLocationDialog(shell, libraryName, initialURL);	134	JavadocLocationDialog dialog= new JavadocLocationDialog(shell, libraryName, initialURL, false);
134	if (dialog.open() == Window.OK) {	135	if (dialog.open() == Window.OK) {
135	return new URL[] { dialog.getResult() };	136	return new URL[] { dialog.getResult() };
136	}	137	}
Lines 161-175 Link Here
161	}	162	}
162		163
163	URL location= JavaUI.getLibraryJavadocLocation(initialEntry);	164	URL location= JavaUI.getLibraryJavadocLocation(initialEntry);
164	JavadocLocationDialog dialog= new JavadocLocationDialog(shell, BasicElementLabels.getPathLabel(initialEntry.getPath(), false), location);	165	boolean preferJavadocLocation= getPreferAttachedJavadoc(initialEntry);
		166	JavadocLocationDialog dialog= new JavadocLocationDialog(shell, BasicElementLabels.getPathLabel(initialEntry.getPath(), false), location, preferJavadocLocation);
165	if (dialog.open() == Window.OK) {	167	if (dialog.open() == Window.OK) {
166	CPListElement element= CPListElement.createFromExisting(initialEntry, null);	168	CPListElement element= CPListElement.createFromExisting(initialEntry, null);
167	URL res= dialog.getResult();	169	URL res= dialog.getResult();
168	element.setAttribute(CPListElement.JAVADOC, res != null ? res.toExternalForm() : null);	170	element.setAttribute(CPListElement.JAVADOC, res != null ? res.toExternalForm() : null);
		171	boolean preferJavadoc= dialog.getPreferJavadocLocation();
		172	element.setAttribute(CPListElement.PREFER_JAVADOC, Boolean.valueOf(preferJavadoc));
169	return element.getClasspathEntry();	173	return element.getClasspathEntry();
170	}	174	}
171	return null;	175	return null;
172	}	176	}
		177
		178	private static boolean getPreferAttachedJavadoc(IClasspathEntry entry) {
		179	IClasspathAttribute[] extraAttributes= entry.getExtraAttributes();
		180	for (int i= 0; i < extraAttributes.length; i++) {
		181	IClasspathAttribute attrib= extraAttributes[i];
		182	if (IClasspathAttribute.JAVADOC_LOCATION_PREFERRED_ATTRIBUTE_NAME.equals(attrib.getName())) {
		183	return Boolean.valueOf(attrib.getValue()).booleanValue();
		184	}
		185	}
		186	return false;
		187	}
173		188
174	/**	189	/**
175	* Shows the UI for configuring a variable classpath entry. See {@link IClasspathEntry#CPE_VARIABLE} for	190	* Shows the UI for configuring a variable classpath entry. See {@link IClasspathEntry#CPE_VARIABLE} for