Attachment #97623 for bug #228297

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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




/*******************************************************************************
 * Copyright (c) 2005, 2008 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.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.runtime.*;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.HostSpecification;
import org.eclipse.pde.core.plugin.IPluginModelBase;

					buffer.append(path);
					if (archive)
						buffer.insert(0, "jar:"); //$NON-NLS-1$
					processPlugins(buffer.toString(), children[i].getChildren());
				}
			}
		}

		}
	}

	public synchronized void reset() {
		fLocations = null;
	}


Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/preferences/TargetSourceTab.java (-2 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 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 14-19 Link Here
14	import java.util.*;	14	import java.util.*;
15	import java.util.List;	15	import java.util.List;
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
		17	import org.eclipse.core.runtime.jobs.Job;
17	import org.eclipse.core.runtime.spi.RegistryContributor;	18	import org.eclipse.core.runtime.spi.RegistryContributor;
18	import org.eclipse.jface.dialogs.Dialog;	19	import org.eclipse.jface.dialogs.Dialog;
19	import org.eclipse.jface.dialogs.IDialogPage;	20	import org.eclipse.jface.dialogs.IDialogPage;
Lines 162-168 Link Here
162	public boolean performOk() {	163	public boolean performOk() {
163	Preferences preferences = PDECore.getDefault().getPluginPreferences();	164	Preferences preferences = PDECore.getDefault().getPluginPreferences();
164	preferences.setValue(ICoreConstants.P_SOURCE_LOCATIONS, encodeSourceLocations());	165	preferences.setValue(ICoreConstants.P_SOURCE_LOCATIONS, encodeSourceLocations());
165	PDECore.getDefault().getJavadocLocationManager().reset();	166	// Reset the javadoc locations in a job in case locations are being initialized
		167	Job resetJavadocJob = new Job("Reset Javadoc Locations") { //$NON-NLS-1$
		168	protected IStatus run(IProgressMonitor monitor) {
		169	PDECore.getDefault().getJavadocLocationManager().reset();
		170	return Status.OK_STATUS;
		171	}
		172	};
		173	resetJavadocJob.setSystem(true);
		174	resetJavadocJob.schedule();
166	return true;	175	return true;
167	}	176	}
168		177

Return to bug 228297

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/JavadocLocationManager.java (-12 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 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 13-27 Link Here
13	import java.io.File;	13	import java.io.File;
14	import java.net.MalformedURLException;	14	import java.net.MalformedURLException;
15	import java.net.URL;	15	import java.net.URL;
16	import java.util.HashMap;	16	import java.util.*;
17	import java.util.HashSet;	17	import org.eclipse.core.runtime.*;
18	import java.util.Iterator;
19	import java.util.Set;
20
21	import org.eclipse.core.runtime.IConfigurationElement;
22	import org.eclipse.core.runtime.IExtension;
23	import org.eclipse.core.runtime.IPath;
24	import org.eclipse.core.runtime.Path;
25	import org.eclipse.osgi.service.resolver.BundleDescription;	18	import org.eclipse.osgi.service.resolver.BundleDescription;
26	import org.eclipse.osgi.service.resolver.HostSpecification;	19	import org.eclipse.osgi.service.resolver.HostSpecification;
27	import org.eclipse.pde.core.plugin.IPluginModelBase;	20	import org.eclipse.pde.core.plugin.IPluginModelBase;
Lines 112-118 Link Here
112	buffer.append(path);	105	buffer.append(path);
113	if (archive)	106	if (archive)
114	buffer.insert(0, "jar:"); //$NON-NLS-1$	107	buffer.insert(0, "jar:"); //$NON-NLS-1$
115	processPlugins(buffer.toString(), children[i].getChildren()); //$NON-NLS-1$	108	processPlugins(buffer.toString(), children[i].getChildren());
116	}	109	}
117	}	110	}
118	}	111	}
Lines 134-140 Link Here
134	}	127	}
135	}	128	}
136		129
137	public void reset() {	130	public synchronized void reset() {
138	fLocations = null;	131	fLocations = null;
139	}	132	}
140		133