Attachment #226791 for bug #399098




/*******************************************************************************
 * Copyright (c) 2000, 2013 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.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;


				if (rootPath.isEmpty()) {
					rootPath = null;
				}
				// construct the classpath attributes for this library location
				IClasspathAttribute[] attributes = JREContainer.buildClasspathAttributes(vm, libs[i], overrideJavaDoc);
					javadocLocation = vm.getJavadocLocation();
				}
				IClasspathAttribute[] attributes = null;
				if (javadocLocation == null) {
					attributes = new IClasspathAttribute[0];
				} else {
					attributes = new IClasspathAttribute[]{JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation.toExternalForm())};
				}
				IAccessRule[] libRules = null;
				if (rules != null) {
					libRules = rules[i];

		return cpEntries;		
	}

	private static IClasspathAttribute[] buildClasspathAttributes(final IVMInstall vm, final LibraryLocation lib, final boolean overrideJavaDoc) {
	
		List<IClasspathAttribute> classpathAttributes = new LinkedList<IClasspathAttribute>();
		// process the javadoc location
		URL javadocLocation = lib.getJavadocLocation();
		if (overrideJavaDoc && javadocLocation == null) {
			javadocLocation = vm.getJavadocLocation();
		}
		if(javadocLocation != null) {
			IClasspathAttribute javadocCPAttribute = JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation.toExternalForm());
			classpathAttributes.add(javadocCPAttribute);
		}
		// process the index location
		URL indexLocation = lib.getIndexLocation();
		if(indexLocation != null) {
			IClasspathAttribute indexCPLocation = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, indexLocation.toExternalForm());
			classpathAttributes.add(indexCPLocation);
		}
		return classpathAttributes.toArray(new IClasspathAttribute[classpathAttributes.size()]);
	}
	
	/**
	 * Constructs a JRE classpath container on the given VM install
	 * 

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java (-7 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2012 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 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 382-396 Link Here
382	Element element = doc.createElement("libraryLocation"); //$NON-NLS-1$	382	Element element = doc.createElement("libraryLocation"); //$NON-NLS-1$
383	element.setAttribute("jreJar", locations[i].getSystemLibraryPath().toString()); //$NON-NLS-1$	383	element.setAttribute("jreJar", locations[i].getSystemLibraryPath().toString()); //$NON-NLS-1$
384	element.setAttribute("jreSrc", locations[i].getSystemLibrarySourcePath().toString()); //$NON-NLS-1$	384	element.setAttribute("jreSrc", locations[i].getSystemLibrarySourcePath().toString()); //$NON-NLS-1$
385		385
386	IPath packageRootPath = locations[i].getPackageRootPath();	386	IPath packageRootPath = locations[i].getPackageRootPath();
387	if (packageRootPath != null) {	387	if (packageRootPath != null) {
388	element.setAttribute("pkgRoot", packageRootPath.toString()); //$NON-NLS-1$	388	element.setAttribute("pkgRoot", packageRootPath.toString()); //$NON-NLS-1$
389	}	389	}
390		390
391	URL url= locations[i].getJavadocLocation();	391	URL javadocURL= locations[i].getJavadocLocation();
392	if (url != null) {	392	if (javadocURL != null) {
393	element.setAttribute("jreJavadoc", url.toExternalForm()); //$NON-NLS-1$	393	element.setAttribute("jreJavadoc", javadocURL.toExternalForm()); //$NON-NLS-1$
		394	}
		395	URL indexURL = locations[i].getIndexLocation();
		396	if(indexURL != null) {
		397	element.setAttribute("jreIndex", indexURL.toExternalForm()); //$NON-NLS-1$
394	}	398	}
395	root.appendChild(element);	399	root.appendChild(element);
396	}	400	}
Lines 628-633 Link Here
628	String jreSrc= libLocationElement.getAttribute("jreSrc"); //$NON-NLS-1$	632	String jreSrc= libLocationElement.getAttribute("jreSrc"); //$NON-NLS-1$
629	String pkgRoot= libLocationElement.getAttribute("pkgRoot"); //$NON-NLS-1$	633	String pkgRoot= libLocationElement.getAttribute("pkgRoot"); //$NON-NLS-1$
630	String jreJavadoc= libLocationElement.getAttribute("jreJavadoc"); //$NON-NLS-1$	634	String jreJavadoc= libLocationElement.getAttribute("jreJavadoc"); //$NON-NLS-1$
		635	String jreIndex= libLocationElement.getAttribute("jreIndex"); //$NON-NLS-1$
		636	// javadoc URL
631	URL javadocURL= null;	637	URL javadocURL= null;
632	if (jreJavadoc.length() == 0) {	638	if (jreJavadoc.length() == 0) {
633	jreJavadoc= null;	639	jreJavadoc= null;
Lines 635-645 Link Here
635	try {	641	try {
636	javadocURL= new URL(jreJavadoc);	642	javadocURL= new URL(jreJavadoc);
637	} catch (MalformedURLException e) {	643	} catch (MalformedURLException e) {
638	LaunchingPlugin.log("Library location element is specified incorrectly."); //$NON-NLS-1$	644	LaunchingPlugin.log("Library location javadoc element is specified incorrectly."); //$NON-NLS-1$
639	}	645	}
640	}	646	}
		647	// index URL
		648	URL indexURL= null;
		649	if (jreIndex.length() == 0) {
		650	jreIndex= null;
		651	} else {
		652	try {
		653	indexURL= new URL(jreIndex);
		654	} catch (MalformedURLException e) {
		655	LaunchingPlugin.log("Library location jre index element is specified incorrectly."); //$NON-NLS-1$
		656	}
		657	}
641	if (jreJar != null && jreSrc != null && pkgRoot != null) {	658	if (jreJar != null && jreSrc != null && pkgRoot != null) {
642	return new LibraryLocation(new Path(jreJar), new Path(jreSrc), new Path(pkgRoot), javadocURL);	659	return new LibraryLocation(new Path(jreJar), new Path(jreSrc), new Path(pkgRoot), javadocURL, indexURL);
643	}	660	}
644	LaunchingPlugin.log("Library location element is specified incorrectly."); //$NON-NLS-1$	661	LaunchingPlugin.log("Library location element is specified incorrectly."); //$NON-NLS-1$
645	return null;	662	return null;




/*******************************************************************************
 * Copyright (c) 2000, 2013 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 IPath fSystemLibrarySource;
	private IPath fPackageRootPath;
	private URL fJavadocLocation;
	private URL fIndexLocation;
	
	/**
	 * Creates a new library location.

	 * @since 3.1
	 */	
	public LibraryLocation(IPath libraryPath, IPath sourcePath, IPath packageRoot, URL javadocLocation) {
		this(libraryPath, sourcePath, packageRoot, javadocLocation, null);
	}		

	/**
	 * Creates a new library location.
	 * 
	 * @param libraryPath	The location of the JAR containing java.lang.Object
	 * 					Must not be <code>null</code>.
	 * @param sourcePath	The location of the zip file containing the sources for <code>library</code>
	 * 					Must not be <code>null</code> (Use Path.EMPTY instead)
	 * @param packageRoot The path inside the <code>source</code> zip file where packages names
	 * 					  begin. If the source for java.lang.Object source is found at 
	 * 					  "src/java/lang/Object.java" in the zip file, the 
	 * 					  packageRoot should be "src"
	 * 					  Must not be <code>null</code>. (Use Path.EMPTY or IPath.ROOT)
	 * @param javadocLocation The location of the javadoc for <code>library</code>
	 * @param indexLocation The location of the index for <code>library</code>
	 * @throws IllegalArgumentException If the library path is <code>null</code>.
	 * @since 3.7
	 */
	public LibraryLocation(IPath libraryPath, IPath sourcePath, IPath packageRoot, URL javadocLocation, URL indexLocation) {
		if (libraryPath == null) {
			throw new IllegalArgumentException(LaunchingMessages.libraryLocation_assert_libraryNotNull); 
		}
		fSystemLibrary= libraryPath;
		fSystemLibrarySource= sourcePath;
		fPackageRootPath= packageRoot;
		fJavadocLocation= javadocLocation;
		fIndexLocation = indexLocation;
	}
	
	/**
	 * Returns the JRE library jar location.
	 * 

	/**
	 * Returns the Javadoc location associated with this Library location.
	 * 
	 * @return a {@link URL} pointing to the Javadoc location associated with
	 * 	this Library location, or <code>null</code> if none
	 * @since 3.1
	 */
	public URL getJavadocLocation() {
		return fJavadocLocation;
	}
	
	/**
	 * Returns the index location associated with this library location.
	 * 
	 * @return a {@link URL} pointing to the index location associated with
	 * 	this Library location, or <code>null</code> if none
	 * @since 3.7
	 */
	public URL getIndexLocation() {
		return fIndexLocation;
	}
	
	/* (non-Javadoc)

		fSystemLibrarySource = source;
	}

	/**
	 * Sets the index location to the given {@link URL}.
	 * 
	 * @param indexLoc
	 * @since 3.7
	 */
	public void setIndexLocation(URL indexLoc) {
		fIndexLocation = indexLoc;
	}
}

Return to bug 399098

Lines 1-5 Link Here

(-)a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java (-11 / +25 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2012 IBM Corporation and others.	2	* Copyright (c) 2000, 2013 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 15-20 Link Here
15	import java.util.ArrayList;	15	import java.util.ArrayList;
16	import java.util.HashMap;	16	import java.util.HashMap;
17	import java.util.Iterator;	17	import java.util.Iterator;
		18	import java.util.LinkedList;
18	import java.util.List;	19	import java.util.List;
19	import java.util.Map;	20	import java.util.Map;
20		21
Lines 317-332 Link Here
317	if (rootPath.isEmpty()) {	318	if (rootPath.isEmpty()) {
318	rootPath = null;	319	rootPath = null;
319	}	320	}
320	URL javadocLocation = libs[i].getJavadocLocation();	321	// construct the classpath attributes for this library location
321	if (overrideJavaDoc && javadocLocation == null) {	322	IClasspathAttribute[] attributes = JREContainer.buildClasspathAttributes(vm, libs[i], overrideJavaDoc);
322	javadocLocation = vm.getJavadocLocation();
323	}
324	IClasspathAttribute[] attributes = null;
325	if (javadocLocation == null) {
326	attributes = new IClasspathAttribute[0];
327	} else {
328	attributes = new IClasspathAttribute[]{JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation.toExternalForm())};
329	}
330	IAccessRule[] libRules = null;	323	IAccessRule[] libRules = null;
331	if (rules != null) {	324	if (rules != null) {
332	libRules = rules[i];	325	libRules = rules[i];
Lines 343-348 Link Here
343	return cpEntries;	336	return cpEntries;
344	}	337	}
345		338
		339	private static IClasspathAttribute[] buildClasspathAttributes(final IVMInstall vm, final LibraryLocation lib, final boolean overrideJavaDoc) {
		340
		341	List<IClasspathAttribute> classpathAttributes = new LinkedList<IClasspathAttribute>();
		342	// process the javadoc location
		343	URL javadocLocation = lib.getJavadocLocation();
		344	if (overrideJavaDoc && javadocLocation == null) {
		345	javadocLocation = vm.getJavadocLocation();
		346	}
		347	if(javadocLocation != null) {
		348	IClasspathAttribute javadocCPAttribute = JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation.toExternalForm());
		349	classpathAttributes.add(javadocCPAttribute);
		350	}
		351	// process the index location
		352	URL indexLocation = lib.getIndexLocation();
		353	if(indexLocation != null) {
		354	IClasspathAttribute indexCPLocation = JavaCore.newClasspathAttribute(IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, indexLocation.toExternalForm());
		355	classpathAttributes.add(indexCPLocation);
		356	}
		357	return classpathAttributes.toArray(new IClasspathAttribute[classpathAttributes.size()]);
		358	}
		359
346	/**	360	/**
347	* Constructs a JRE classpath container on the given VM install	361	* Constructs a JRE classpath container on the given VM install
348	*	362	*