Attachment #156703 for bug #297895

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

Lines 32-41 Link Here

(-)src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java (-7 / +14 lines)
32	import org.eclipse.jdt.core.JavaCore;	32	import org.eclipse.jdt.core.JavaCore;
33	import org.eclipse.jdt.core.JavaModelException;	33	import org.eclipse.jdt.core.JavaModelException;
34	import org.eclipse.jdt.launching.JavaRuntime;	34	import org.eclipse.jdt.launching.JavaRuntime;
35	import org.eclipse.pde.core.project.Factory;
36	import org.eclipse.pde.core.project.IBundleClasspathEntry;	35	import org.eclipse.pde.core.project.IBundleClasspathEntry;
37	import org.eclipse.pde.core.project.IBundleProjectDescription;	36	import org.eclipse.pde.core.project.IBundleProjectDescription;
		37	import org.eclipse.pde.core.project.IBundleProjectService;
38	import org.eclipse.pde.core.project.IPackageExportDescription;	38	import org.eclipse.pde.core.project.IPackageExportDescription;
		39	import org.eclipse.pde.internal.core.PDECore;
39	import org.eclipse.pde.internal.core.natures.PDE;	40	import org.eclipse.pde.internal.core.natures.PDE;
40	import org.osgi.framework.Version;	41	import org.osgi.framework.Version;
41		42
Lines 58-63 Link Here
58	*/	59	*/
59	public static final String SRC_FOLDER = "src";	60	public static final String SRC_FOLDER = "src";
60		61
		62	public static IBundleProjectService getBundleProjectService() {
		63	return (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
		64	}
		65
61	/**	66	/**
62	* Crate a plug-in project with the given name	67	* Crate a plug-in project with the given name
63	* @param projectName	68	* @param projectName
Lines 80-87 Link Here
80	}	85	}
81		86
82	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);	87	IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
83	IBundleProjectDescription description = Factory.getDescription(project);	88	IBundleProjectService service = getBundleProjectService();
84	IBundleClasspathEntry entry = Factory.newBundleClasspathEntry(new Path(SRC_FOLDER), new Path(BIN_FOLDER), null);	89	IBundleProjectDescription description = service.getDescription(project);
		90	IBundleClasspathEntry entry = service.newBundleClasspathEntry(new Path(SRC_FOLDER), new Path(BIN_FOLDER), null);
85	description.setSymbolicName(projectName);	91	description.setSymbolicName(projectName);
86	description.setBundleClassath(new IBundleClasspathEntry[]{entry});	92	description.setBundleClassath(new IBundleClasspathEntry[]{entry});
87	description.setNatureIds(resolvednatures);	93	description.setNatureIds(resolvednatures);
Lines 282-288 Link Here
282	* @param packagename the name of the package to remove from the export package header	288	* @param packagename the name of the package to remove from the export package header
283	*/	289	*/
284	public static void removeExportedPackage(IProject project, String packagename) throws CoreException {	290	public static void removeExportedPackage(IProject project, String packagename) throws CoreException {
285	IBundleProjectDescription description = Factory.getDescription(project);	291	IBundleProjectDescription description = getBundleProjectService().getDescription(project);
286	IPackageExportDescription[] exports = description.getPackageExports();	292	IPackageExportDescription[] exports = description.getPackageExports();
287	if (exports != null) {	293	if (exports != null) {
288	List list = new ArrayList();	294	List list = new ArrayList();
Lines 314-320 Link Here
314	//do no work	320	//do no work
315	return;	321	return;
316	}	322	}
317	IBundleProjectDescription description = Factory.getDescription(project);	323	IBundleProjectService service = getBundleProjectService();
		324	IBundleProjectDescription description = service.getDescription(project);
318	IPackageExportDescription[] exports = description.getPackageExports();	325	IPackageExportDescription[] exports = description.getPackageExports();
319	List list = new ArrayList();	326	List list = new ArrayList();
320	if (exports != null) {	327	if (exports != null) {
Lines 322-328 Link Here
322	list.add(exports[i]);	329	list.add(exports[i]);
323	}	330	}
324	}	331	}
325	list.add(Factory.newPackageExport(packagename, null, !internal, friends));	332	list.add(service.newPackageExport(packagename, null, !internal, friends));
326	description.setPackageExports((IPackageExportDescription[]) list.toArray(new IPackageExportDescription[list.size()]));	333	description.setPackageExports((IPackageExportDescription[]) list.toArray(new IPackageExportDescription[list.size()]));
327	description.apply(null);	334	description.apply(null);
328	}	335	}
Lines 335-341 Link Here
335	* @return the {@link IPackageExportDescription}s for the given project or <code>null</code>	342	* @return the {@link IPackageExportDescription}s for the given project or <code>null</code>
336	*/	343	*/
337	public static IPackageExportDescription[] getExportedPackages(IProject project) throws CoreException {	344	public static IPackageExportDescription[] getExportedPackages(IProject project) throws CoreException {
338	IBundleProjectDescription description = Factory.getDescription(project);	345	IBundleProjectDescription description = getBundleProjectService().getDescription(project);
339	return description.getPackageExports();	346	return description.getPackageExports();
340	}	347	}
341	}	348	}

Lines 27-33 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
27	org.eclipse.pde.internal.core.natures;x-friends:="org.eclipse.pde.ui",	27	org.eclipse.pde.internal.core.natures;x-friends:="org.eclipse.pde.ui",
28	org.eclipse.pde.internal.core.plugin;x-friends:="org.eclipse.pde.ui",	28	org.eclipse.pde.internal.core.plugin;x-friends:="org.eclipse.pde.ui",
29	org.eclipse.pde.internal.core.product;x-friends:="org.eclipse.pde.ui",	29	org.eclipse.pde.internal.core.product;x-friends:="org.eclipse.pde.ui",
30	org.eclipse.pde.internal.core.project;x-friends:="org.eclipse.pde.ui",	30	org.eclipse.pde.internal.core.project;x-friends:="org.eclipse.pde.ui,org.eclipse.pde.launching",
31	org.eclipse.pde.internal.core.schema;x-friends:="org.eclipse.pde.ui",	31	org.eclipse.pde.internal.core.schema;x-friends:="org.eclipse.pde.ui",
32	org.eclipse.pde.internal.core.search;x-friends:="org.eclipse.pde.ui",	32	org.eclipse.pde.internal.core.search;x-friends:="org.eclipse.pde.ui",
33	org.eclipse.pde.internal.core.site;x-friends:="org.eclipse.pde.ui",	33	org.eclipse.pde.internal.core.site;x-friends:="org.eclipse.pde.ui",

Lines 1-5 Link Here

(-)src/org/eclipse/pde/core/build/IBuild.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-21 Link Here
15		15
16	/**	16	/**
17	* The top-level model object of the model that is created from	17	* The top-level model object of the model that is created from
18	* "build.properties" file.	18	* <code>build.properties</code> file.
19	*	19	*
20	* @noimplement This interface is not intended to be implemented by clients.	20	* @noimplement This interface is not intended to be implemented by clients.
21	* @noextend This interface is not intended to be extended by clients.	21	* @noextend This interface is not intended to be extended by clients.

Lines 1-5 Link Here

(-)src/org/eclipse/pde/core/build/IBuildModel.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-20 Link Here
14	import org.eclipse.pde.core.IModelChangeProvider;	14	import org.eclipse.pde.core.IModelChangeProvider;
15		15
16	/**	16	/**
17	* This model is created from the "build.properties" file	17	* This model is created from the <code>build.properties</code> file
18	* that defines what source folders in the plug-in are	18	* that defines what source folders in the plug-in are
19	* to be used to build require plug-in Jars.	19	* to be used to build require plug-in Jars.
20	* <p>	20	* <p>




/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.core.project;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.pde.internal.core.project.*;
import org.osgi.framework.Version;

/**
 * Factory class for creating bundle project descriptions and associated artifacts.
 * 
 * @noinstantiate This class is not intended to be instantiated by clients.
 * @since 3.6
 */
public final class Factory {

	/**
	 * Returns a bundle description for the given project.
	 * If the project does not exist, the description can be used to create
	 * a new bundle project. If the project does exist, the description can be used to
	 * modify a project.
	 *  
	 * @param project project
	 * @return bundle description for the associated project
	 * @exception CoreException if unable to create a description on an existing project
	 */
	public static IBundleProjectDescription getDescription(IProject project) throws CoreException {
		return new BundleProjectDescription(project);
	}

	/**
	 * Creates and returns a new host description.
	 * 
	 * @param name symbolic name of the host
	 * @param range version constraint or <code>null</code>
	 * @return host description
	 */
	public static IHostDescription newHost(String name, VersionRange range) {
		return new HostDescriptoin(name, range);
	}

	/**
	 * Creates and returns a new package import description.
	 * 
	 * @param name fully qualified name of imported package
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the import is optional
	 * @return package import description
	 */
	public static IPackageImportDescription newPackageImport(String name, VersionRange range, boolean optional) {
		return new PackageImportDescription(name, range, optional);
	}

	/**
	 * Constructs a new package export description.
	 * 
	 * @param name fully qualified package name
	 * @param version version or <code>null</code>
	 * @param api whether the package is considered API
	 * @param friends symbolic names of bundles that are friends, or <code>null</code>; when 
	 *  friends are specified the package will not be API
	 * @return package export description
	 */
	public static IPackageExportDescription newPackageExport(String name, Version version, boolean api, String[] friends) {
		return new PackageExportDescription(name, version, friends, api);
	}

	/**
	 * Creates and returns a new required bundle description.
	 * 
	 * @param name symbolic name of required bundle
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the required bundle is optional
	 * @param export whether the required bundle is re-exported
	 * @return required bundle description
	 */
	public static IRequiredBundleDescription newRequiredBundle(String name, VersionRange range, boolean optional, boolean export) {
		return new RequiredBundleDescription(name, range, export, optional);
	}

	/**
	 * Creates and returns a new bundle classpath entry defining the relationship
	 * between a source, binaries, and library on the Bundle-Classpath header.
	 * <p>
	 * When a source folder is specified, the binary folder defines its output
	 * folder, or may be <code>null</code> to indicate that the project's default output
	 * folder is used by the source folder. When only a binary folder is specified, there
	 * is no source associated with the folder. When no source or binary are specified,
	 * it indicates the library is included in the project as an archive.
	 * </p>
	 * @param sourceFolder source folder or <code>null</code>
	 * @param binaryFolder binary folder or <code>null</code>
	 * @param library associated entry on the Bundle-Classpath header or <code>null</code>
	 * 	to indicate default entry "."
	 */
	public static IBundleClasspathEntry newBundleClasspathEntry(IPath sourceFolder, IPath binaryFolder, IPath library) {
		return new BundleClasspathSpecification(sourceFolder, binaryFolder, library);
	}
}

Lines 44-50 Link Here

(-)src/org/eclipse/pde/core/project/IBundleClasspathEntry.java (-1 / +2 lines)
44	* Java project's default build path output folder. When a {@link #getSourcePath()} is	44	* Java project's default build path output folder. When a {@link #getSourcePath()} is
45	* not specified, the binary path specifies a folder of class files.	45	* not specified, the binary path specifies a folder of class files.
46	* </p>	46	* </p>
47	* @return class file folder, archive or <code>null</code> to indicate default build path output folder	47	* @return project relative class file folder, archive or <code>null</code> to indicate
		48	* default build path output folder
48	*/	49	*/
49	public IPath getBinaryPath();	50	public IPath getBinaryPath();
50		51




	/**
	 * Sets the value of the Bundle-Localization header for the described bundle.
	 * 
	 * @param path bundle root relative path or <code>null</code>
	 */
	public void setLocalization(IPath path);


	 * Bundle-Classpath will be included. This sets any additional entries that 
	 * are to be included.
	 * </p>
	 * @param paths bundle root relative paths of files and folders to include
	 *  or <code>null</code> if none
	 */
	public void setBinIncludes(IPath[] paths);

	 * Bundle-Classpath will be included. This returns any additional entries that 
	 * are to be included.
	 * </p>
	 * @return bundle root relative paths of files and folders on the <code>bin.includes</code>
	 * 	entry or <code>null</code>
	 */
	public IPath[] getBinIncludes();

	/**
	 * Sets the location within the project where the root of the bundle and its associated
	 * artifacts will reside, or <code>null</code> to indicate the default bundle root location
	 * should be used (project folder).
	 * <p>
	 * This has no effect on existing projects.  This method is intended for use on descriptions
	 * for new projects. To modify the bundle root of an existing project use
	 * {@link Factory#setBundleRoot(IProject, IPath)}.
	 * </p>
	 * <p>
	 * The bundle root is the folder containing the <code>META-INF/</code> folder. When a project
	 * does not yet exist, bundle files will be created relative to the bundle root. When a project
	 * already exists and the bundle root location is modified, existing bundle artifacts at the old
	 * root are not moved or modified. Instead, the modify operation will update any existing bundle
	 * files at the new root location, or create them if not yet present.
	 * </p>
	 * @param path project relative path to bundle root artifacts in the project or <code>null</code>
	 */
	public void setBundleRoot(IPath path);

	/**
	 * Returns the location within the project that is the root of the bundle related
	 * artifacts, or <code>null</code> to indicate the default location (project folder).
	 * 
	 * @return project relative bundle root path or <code>null</code>
	 */
	public IPath getBundleRoot();

}




/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.core.project;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;

/**
 * Service used to create and configure bundle project descriptions.
 * <p>
 * An instance of this service can be obtained from a {@link BundleContext} as
 * follows
 * <pre>
 * BundleContext context = ...
 * ServiceReference ref = context.getServiceReference(IBundleContextService.class.getName());
 * IBundleContextService service = (IBundleContextService)context.getService(ref);
 * ...
 * context.ungetService(ref); 
 * </pre>
 * </p>
 * @since 3.6
 */
public interface IBundleProjectService {

	/**
	 * Returns a bundle description for the given project.
	 * If the project does not exist, the description can be used to create
	 * a new bundle project. If the project does exist, the description can be used to
	 * modify a project.
	 *  
	 * @param project project
	 * @return bundle description for the associated project
	 * @exception CoreException if unable to create a description on an existing project
	 */
	public IBundleProjectDescription getDescription(IProject project) throws CoreException;

	/**
	 * Creates and returns a new host description.
	 * 
	 * @param name symbolic name of the host
	 * @param range version constraint or <code>null</code>
	 * @return host description
	 */
	public IHostDescription newHost(String name, VersionRange range);

	/**
	 * Creates and returns a new package import description.
	 * 
	 * @param name fully qualified name of imported package
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the import is optional
	 * @return package import description
	 */
	public IPackageImportDescription newPackageImport(String name, VersionRange range, boolean optional);

	/**
	 * Constructs a new package export description.
	 * 
	 * @param name fully qualified package name
	 * @param version version or <code>null</code>
	 * @param api whether the package is considered API
	 * @param friends symbolic names of bundles that are friends, or <code>null</code>; when 
	 *  friends are specified the package will not be API
	 * @return package export description
	 */
	public IPackageExportDescription newPackageExport(String name, Version version, boolean api, String[] friends);

	/**
	 * Creates and returns a new required bundle description.
	 * 
	 * @param name symbolic name of required bundle
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the required bundle is optional
	 * @param export whether the required bundle is re-exported
	 * @return required bundle description
	 */
	public IRequiredBundleDescription newRequiredBundle(String name, VersionRange range, boolean optional, boolean export);

	/**
	 * Creates and returns a new bundle classpath entry defining the relationship
	 * between a source, binaries, and library on the Bundle-Classpath header.
	 * <p>
	 * When a source folder is specified, the binary folder defines its output
	 * folder, or may be <code>null</code> to indicate that the project's default output
	 * folder is used by the source folder. When only a binary folder is specified, there
	 * is no source associated with the folder. When no source or binary are specified,
	 * it indicates the library is included in the project as an archive.
	 * </p>
	 * @param sourceFolder source folder or <code>null</code>
	 * @param binaryFolder binary folder or <code>null</code>
	 * @param library associated entry on the Bundle-Classpath header or <code>null</code>
	 * 	to indicate default entry "."
	 */
	public IBundleClasspathEntry newBundleClasspathEntry(IPath sourceFolder, IPath binaryFolder, IPath library);

	/**
	 * Sets the location within the project where the root of the bundle and its associated
	 * artifacts will reside, or <code>null</code> to indicate the default bundle root location
	 * should be used (project folder).
	 * <p>
	 * The bundle root is the folder containing the <code>META-INF/</code> folder. When the bundle
	 * root location is modified, existing bundle artifacts at the old root are not moved or modified.
	 * When creating a new bundle project {@link IBundleProjectDescription#setBundleRoot(IPath)} can 
	 * be used to specify an initial bundle root location. To modify the bundle root location of an
	 * existing project, this method must be used.
	 * </p>
	 * @param project project that must exist and be open
	 * @param bundleRoot project relative path to bundle root artifacts in the project or <code>null</code>
	 * @throws CoreException if setting the root fails
	 */
	public void setBundleRoot(IProject project, IPath bundleRoot) throws CoreException;

}

Lines 24-29 Link Here

(-)src/org/eclipse/pde/internal/core/ClasspathComputer.java (-1 / +2 lines)
24	import org.eclipse.pde.core.plugin.IPluginLibrary;	24	import org.eclipse.pde.core.plugin.IPluginLibrary;
25	import org.eclipse.pde.core.plugin.IPluginModelBase;	25	import org.eclipse.pde.core.plugin.IPluginModelBase;
26	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	26	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
		27	import org.eclipse.pde.internal.core.project.PDEProject;
27	import org.eclipse.pde.internal.core.util.CoreUtility;	28	import org.eclipse.pde.internal.core.util.CoreUtility;
28	import org.eclipse.team.core.RepositoryProvider;	29	import org.eclipse.team.core.RepositoryProvider;
29		30
Lines 140-146 Link Here
140	}	141	}
141		142
142	protected static IBuild getBuild(IProject project) throws CoreException {	143	protected static IBuild getBuild(IProject project) throws CoreException {
143	IFile buildFile = project.getFile("build.properties"); //$NON-NLS-1$	144	IFile buildFile = PDEProject.getBuildProperties(project);
144	IBuildModel buildModel = null;	145	IBuildModel buildModel = null;
145	if (buildFile.exists()) {	146	if (buildFile.exists()) {
146	buildModel = new WorkspaceBuildModel(buildFile);	147	buildModel = new WorkspaceBuildModel(buildFile);




/*******************************************************************************
 * Copyright (c) 2003, 2010 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.pde.core.build.IBuildEntry;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.project.PDEProject;

public class ClasspathHelper {


		try {
			if (project.hasNature(JavaCore.NATURE_ID)) {
				Map classpathMap = getClasspathMap(project, checkExcluded, !base.getId().equals(PDECore.getDefault().getModelManager().getSystemBundleId()), false);
				IFile file = PDEProject.getBuildProperties(project);
				boolean searchBuild = file.exists();
				if (searchBuild) {
					WorkspaceBuildModel bModel = new WorkspaceBuildModel(file);

				try {
					IProject project = frags[i].getUnderlyingResource().getProject();
					Map classpathMap = getClasspathMap(project, checkExcluded, false, true);
					IFile file = PDEProject.getBuildProperties(project);
					IBuild build = null;
					if (file.exists()) {
						WorkspaceBuildModel bModel = new WorkspaceBuildModel(file);

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/ClasspathUtilCore.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 26-31 Link Here
26	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	26	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
27	import org.eclipse.pde.internal.core.plugin.*;	27	import org.eclipse.pde.internal.core.plugin.*;
28	import org.eclipse.pde.internal.core.plugin.Plugin;	28	import org.eclipse.pde.internal.core.plugin.Plugin;
		29	import org.eclipse.pde.internal.core.project.PDEProject;
29		30
30	public class ClasspathUtilCore {	31	public class ClasspathUtilCore {
31		32
Lines 195-201 Link Here
195	IBuildModel buildModel = model.getBuildModel();	196	IBuildModel buildModel = model.getBuildModel();
196	if (buildModel == null) {	197	if (buildModel == null) {
197	IProject project = model.getUnderlyingResource().getProject();	198	IProject project = model.getUnderlyingResource().getProject();
198	IFile buildFile = project.getFile("build.properties"); //$NON-NLS-1$	199	IFile buildFile = PDEProject.getBuildProperties(project);
199	if (buildFile.exists()) {	200	if (buildFile.exists()) {
200	buildModel = new WorkspaceBuildModel(buildFile);	201	buildModel = new WorkspaceBuildModel(buildFile);
201	buildModel.load();	202	buildModel.load();

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/ExternalFeatureModelManager.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 57-63 Link Here
57	monitor.beginTask("", featurePaths.length); //$NON-NLS-1$	57	monitor.beginTask("", featurePaths.length); //$NON-NLS-1$
58	Map uniqueFeatures = new HashMap();	58	Map uniqueFeatures = new HashMap();
59	for (int i = 0; i < featurePaths.length; i++) {	59	for (int i = 0; i < featurePaths.length; i++) {
60	File manifest = new File(featurePaths[i].getFile(), "feature.xml"); //$NON-NLS-1$	60	File manifest = new File(featurePaths[i].getFile(), ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
61	if (!manifest.exists() \|\| !manifest.isFile()) {	61	if (!manifest.exists() \|\| !manifest.isFile()) {
62	monitor.worked(1);	62	monitor.worked(1);
63	continue;	63	continue;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/FileAdapter.java (-3 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 12-18 Link Here
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.util.Locale;	14	import java.util.Locale;
15
16	import org.eclipse.core.runtime.PlatformObject;	15	import org.eclipse.core.runtime.PlatformObject;
17		16
18	public class FileAdapter extends PlatformObject {	17	public class FileAdapter extends PlatformObject {
Lines 33-39 Link Here
33		32
34	public boolean isManifest() {	33	public boolean isManifest() {
35	String fileName = fFile.getName();	34	String fileName = fFile.getName();
36	return (fileName.equals("plugin.xml") \|\| fileName.equals("fragment.xml") \|\| fileName.equalsIgnoreCase("manifest.mf")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	35	return (fileName.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) \|\| fileName.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) \|\| fileName.equalsIgnoreCase(ICoreConstants.MANIFEST_FILENAME));
37	}	36	}
38		37
39	public boolean isSchema() {	38	public boolean isSchema() {




 *******************************************************************************/
package org.eclipse.pde.internal.core;

import java.util.Locale;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.osgi.framework.Constants;

	/** Constant for the string <code>META-INF/MANIFEST.MF</code> */
	public final static String BUNDLE_FILENAME_DESCRIPTOR = "META-INF/MANIFEST.MF"; //$NON-NLS-1$

	/** Constant for the string <code>MANIFEST.MF</code> */
	public final static String MANIFEST_FILENAME = "MANIFEST.MF"; //$NON-NLS-1$

	/** Constant for the string <code>.options</code> */
	public final static String OPTIONS_FILENAME = ".options"; //$NON-NLS-1$

	/** Constant for the string <code>manifest.mf</code> */
	public final static String MANIFEST_FILENAME_LOWER_CASE = MANIFEST_FILENAME.toLowerCase(Locale.ENGLISH);

	/** Constant for the string <code>build.properties</code> */
	public final static String BUILD_FILENAME_DESCRIPTOR = "build.properties"; //$NON-NLS-1$





/*******************************************************************************
 *  Copyright (c) 2005, 2010 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

 *******************************************************************************/
package org.eclipse.pde.internal.core;

import java.io.*;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Enumeration;
import java.util.Properties;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.*;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IElementChangedListener;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaElementDelta;
import org.eclipse.jdt.core.IJavaModel;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.project.PDEProject;

public class JavaElementChangeListener implements IElementChangedListener {



	private boolean isInterestingProject(IJavaProject jProject) {
		IProject project = jProject.getProject();
		return WorkspaceModelManager.isPluginProject(project) && !WorkspaceModelManager.isBinaryProject(project) && !PDEProject.getManifest(project).exists();
	}

	private void updateTable(IJavaElement element) {

Lines 19-26 Link Here

(-)src/org/eclipse/pde/internal/core/PDECore.java (+12 lines)
19	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
20	import org.eclipse.jdt.launching.JavaRuntime;	20	import org.eclipse.jdt.launching.JavaRuntime;
21	import org.eclipse.pde.core.plugin.IPluginModelBase;	21	import org.eclipse.pde.core.plugin.IPluginModelBase;
		22	import org.eclipse.pde.core.project.IBundleProjectService;
22	import org.eclipse.pde.internal.core.builders.FeatureRebuilder;	23	import org.eclipse.pde.internal.core.builders.FeatureRebuilder;
23	import org.eclipse.pde.internal.core.builders.PluginRebuilder;	24	import org.eclipse.pde.internal.core.builders.PluginRebuilder;
		25	import org.eclipse.pde.internal.core.project.BundleProjectService;
24	import org.eclipse.pde.internal.core.schema.SchemaRegistry;	26	import org.eclipse.pde.internal.core.schema.SchemaRegistry;
25	import org.eclipse.pde.internal.core.target.TargetPlatformService;	27	import org.eclipse.pde.internal.core.target.TargetPlatformService;
26	import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;	28	import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
Lines 149-154 Link Here
149	*/	151	*/
150	private ServiceRegistration fTargetPlatformService;	152	private ServiceRegistration fTargetPlatformService;
151		153
		154	/**
		155	* Bundle project service.
		156	*/
		157	private ServiceRegistration fBundleProjectService;
		158
152	public PDECore() {	159	public PDECore() {
153	inst = this;	160	inst = this;
154	}	161	}
Lines 287-292 Link Here
287	fFeatureRebuilder.start();	294	fFeatureRebuilder.start();
288		295
289	fTargetPlatformService = context.registerService(ITargetPlatformService.class.getName(), TargetPlatformService.getDefault(), new Hashtable());	296	fTargetPlatformService = context.registerService(ITargetPlatformService.class.getName(), TargetPlatformService.getDefault(), new Hashtable());
		297	fBundleProjectService = context.registerService(IBundleProjectService.class.getName(), BundleProjectService.getDefault(), new Hashtable());
290		298
291	// for now we need to start this bundle to ensure required services	299	// for now we need to start this bundle to ensure required services
292	// are present when we need them (like IProfileRegistry)	300	// are present when we need them (like IProfileRegistry)
Lines 342-347 Link Here
342	fTargetPlatformService.unregister();	350	fTargetPlatformService.unregister();
343	fTargetPlatformService = null;	351	fTargetPlatformService = null;
344	}	352	}
		353	if (fBundleProjectService != null) {
		354	fBundleProjectService.unregister();
		355	fBundleProjectService = null;
		356	}
345		357
346	fServiceTracker.close();	358	fServiceTracker.close();
347	fPackageAdmin = null;	359	fPackageAdmin = null;

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/PDEState.java (-7 / +10 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 25-30 Link Here
25	import org.eclipse.pde.core.plugin.PluginRegistry;	25	import org.eclipse.pde.core.plugin.PluginRegistry;
26	import org.eclipse.pde.internal.core.bundle.*;	26	import org.eclipse.pde.internal.core.bundle.*;
27	import org.eclipse.pde.internal.core.plugin.*;	27	import org.eclipse.pde.internal.core.plugin.*;
		28	import org.eclipse.pde.internal.core.project.PDEProject;
28	import org.eclipse.pde.internal.core.util.CoreUtility;	29	import org.eclipse.pde.internal.core.util.CoreUtility;
29		30
30	public class PDEState extends MinimalState {	31	public class PDEState extends MinimalState {
Lines 261-281 Link Here
261	IProject project = PDECore.getWorkspace().getRoot().getProject(projectName);	262	IProject project = PDECore.getWorkspace().getRoot().getProject(projectName);
262	if (!project.exists())	263	if (!project.exists())
263	return null;	264	return null;
264	if (project.exists(ICoreConstants.MANIFEST_PATH)) {	265	IFile manifest = PDEProject.getManifest(project);
		266	IFile pluginXml = PDEProject.getPluginXml(project);
		267	IFile fragmentXml = PDEProject.getFragmentXml(project);
		268	if (manifest.exists()) {
265	BundlePluginModelBase model = null;	269	BundlePluginModelBase model = null;
266	if (desc.getHost() == null)	270	if (desc.getHost() == null)
267	model = new BundlePluginModel();	271	model = new BundlePluginModel();
268	else	272	else
269	model = new BundleFragmentModel();	273	model = new BundleFragmentModel();
270	model.setEnabled(true);	274	model.setEnabled(true);
271	WorkspaceBundleModel bundle = new WorkspaceBundleModel(project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR));	275	WorkspaceBundleModel bundle = new WorkspaceBundleModel(manifest);
272	bundle.load(desc, this);	276	bundle.load(desc, this);
273	model.setBundleDescription(desc);	277	model.setBundleDescription(desc);
274	model.setBundleModel(bundle);	278	model.setBundleModel(bundle);
275	bundle.setEditable(false);	279	bundle.setEditable(false);
276		280
277	String filename = (desc.getHost() == null) ? ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR : ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR;	281	IFile file = (desc.getHost() == null) ? pluginXml : fragmentXml;
278	IFile file = project.getFile(filename);
279	if (file.exists()) {	282	if (file.exists()) {
280	WorkspaceExtensionsModel extensions = new WorkspaceExtensionsModel(file);	283	WorkspaceExtensionsModel extensions = new WorkspaceExtensionsModel(file);
281	extensions.setEditable(false);	284	extensions.setEditable(false);
Lines 288-296 Link Here
288		291
289	WorkspacePluginModelBase model = null;	292	WorkspacePluginModelBase model = null;
290	if (desc.getHost() == null)	293	if (desc.getHost() == null)
291	model = new WorkspacePluginModel(project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), true);	294	model = new WorkspacePluginModel(pluginXml, true);
292	else	295	else
293	model = new WorkspaceFragmentModel(project.getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR), true);	296	model = new WorkspaceFragmentModel(fragmentXml, true);
294	model.load(desc, this);	297	model.load(desc, this);
295	model.setBundleDescription(desc);	298	model.setBundleDescription(desc);
296	return model;	299	return model;




		fWorkspaceManager.removeExtensionDeltaListener(listener);
	}

	/**
	 * Called when the bundle root for a project is changed.
	 * 
	 * @param project
	 */
	public void bundleRootChanged(IProject project) {
		fWorkspaceManager.removeModel(project);
		if (fWorkspaceManager.isInterestingProject(project)) {
			fWorkspaceManager.createModel(project, false);
			Object model = fWorkspaceManager.getModel(project);
			fWorkspaceManager.addChange(model, IModelProviderEvent.MODELS_CHANGED);
		}
		fWorkspaceManager.processModelChanges();
	}

}

Lines 482-488 Link Here

(-)src/org/eclipse/pde/internal/core/TargetPlatformHelper.java (-1 / +1 lines)
482	for (int i = 0; i < models.length; i++) {	482	for (int i = 0; i < models.length; i++) {
483	String location = models[i].getInstallLocation();	483	String location = models[i].getInstallLocation();
484	if (location != null)	484	if (location != null)
485	list.add(location + IPath.SEPARATOR + "feature.xml"); //$NON-NLS-1$	485	list.add(location + IPath.SEPARATOR + ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
486	}	486	}
487	return (String[]) list.toArray(new String[list.size()]);	487	return (String[]) list.toArray(new String[list.size()]);
488	}	488	}




/*******************************************************************************
 *  Copyright (c) 2000, 2010 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

		ZipFile jarFile = null;
		try {
			if (pluginLocation.isDirectory())
				return new File(pluginLocation, ICoreConstants.OPTIONS_FILENAME).exists();

			jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);
			ZipEntry manifestEntry = jarFile.getEntry(ICoreConstants.OPTIONS_FILENAME);
			if (manifestEntry != null) {
				stream = jarFile.getInputStream(manifestEntry);
			}

		ZipFile jarFile = null;
		try {
			if (pluginLocation.isDirectory()) {
				File file = new File(pluginLocation, ICoreConstants.OPTIONS_FILENAME);
				if (file.exists())
					stream = new FileInputStream(file);
			} else {
				jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);
				ZipEntry manifestEntry = jarFile.getEntry(ICoreConstants.OPTIONS_FILENAME);
				if (manifestEntry != null) {
					stream = jarFile.getInputStream(manifestEntry);
				}




/*******************************************************************************
 *  Copyright (c) 2006, 2010 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

package org.eclipse.pde.internal.core;

import java.util.HashMap;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.pde.core.IModelProviderEvent;
import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.core.project.PDEProject;

public class WorkspaceFeatureModelManager extends WorkspaceModelManager {


	}

	protected void createModel(IProject project, boolean notify) {
		IFile featureXml = PDEProject.getFeatureXml(project);
		if (featureXml.exists()) {
			WorkspaceFeatureModel model = new WorkspaceFeatureModel(featureXml);
			loadModel(model, false);
			if (fModels == null)
				fModels = new HashMap();


	protected void handleFileDelta(IResourceDelta delta) {
		IFile file = (IFile) delta.getResource();
		IProject project = file.getProject();
		IFile featureXml = PDEProject.getFeatureXml(project);
		if (file.equals(featureXml)) {
			Object model = getModel(project);
			int kind = delta.getKind();
			if (kind == IResourceDelta.REMOVED && model != null) {




/*******************************************************************************
 *  Copyright (c) 2003, 2010 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

 *******************************************************************************/
package org.eclipse.pde.internal.core;

import java.io.*;
import java.util.*;
import org.eclipse.core.resources.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.ListIterator;
import java.util.Map;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.pde.core.IModel;
import org.eclipse.pde.core.IModelProviderEvent;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.team.core.RepositoryProvider;

public abstract class WorkspaceModelManager extends AbstractModelManager implements IResourceChangeListener, IResourceDeltaVisitor {

	public static boolean isPluginProject(IProject project) {
		if (project.isOpen())
			return PDEProject.getManifest(project).exists() || PDEProject.getPluginXml(project).exists() || PDEProject.getFragmentXml(project).exists();
		return false;
	}

	public static boolean isFeatureProject(IProject project) {
		return project.isOpen() && PDEProject.getFeatureXml(project).exists();
	}

	public static boolean isBinaryProject(IProject project) {




/*******************************************************************************
 * Copyright (c) 2006, 2010 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.net.URL;
import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.pde.core.IModelProviderEvent;
import org.eclipse.pde.core.plugin.IPluginModelBase;

import org.eclipse.pde.internal.core.ischema.ISchema;
import org.eclipse.pde.internal.core.ischema.ISchemaDescriptor;
import org.eclipse.pde.internal.core.plugin.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.schema.SchemaDescriptor;

public class WorkspacePluginModelManager extends WorkspaceModelManager {

	 */
	protected void createModel(IProject project, boolean notify) {
		IPluginModelBase model = null;
		IFile manifest = PDEProject.getManifest(project);
		IFile pluginXml = PDEProject.getPluginXml(project);
		IFile fragmentXml = PDEProject.getFragmentXml(project);
		if (manifest.exists()) {
			WorkspaceBundleModel bmodel = new WorkspaceBundleModel(manifest);
			loadModel(bmodel, false);
			if (bmodel.isFragmentModel())
				model = new BundleFragmentModel();

			bmodel.setEditable(false);
			((IBundlePluginModelBase) model).setBundleModel(bmodel);

			IFile efile = bmodel.isFragmentModel() ? fragmentXml : pluginXml;
			if (efile.exists()) {
				WorkspaceExtensionsModel extModel = new WorkspaceExtensionsModel(efile);
				extModel.setEditable(false);

				extModel.setBundleModel((IBundlePluginModelBase) model);
			}

		} else if (pluginXml.exists()) {
			model = new WorkspacePluginModel(pluginXml, true);
			loadModel(model, false);
		} else if (fragmentXml.exists()) {
			model = new WorkspaceFragmentModel(fragmentXml, true);
			loadModel(model, false);
		}

		if (PDEProject.getOptionsFile(project).exists())
			PDECore.getDefault().getTracingOptionsManager().reset();

		if (model != null) {

	 */
	protected void handleFileDelta(IResourceDelta delta) {
		IFile file = (IFile) delta.getResource();
		IProject project = file.getProject();
		String filename = file.getName();
		if (file.equals(PDEProject.getOptionsFile(project))) {
			PDECore.getDefault().getTracingOptionsManager().reset();
		} else if (filename.endsWith(".properties")) { //$NON-NLS-1$
			// change in build.properties should trigger a Classpath Update
			// we therefore fire a notification
			//TODO this is inefficient.  we could do better.
			if (file.equals(PDEProject.getBuildProperties(project))) {
				Object model = getModel(file.getProject());
				if (model != null)
					addChange(model, IModelProviderEvent.MODELS_CHANGED);

		} else if (filename.endsWith(".exsd")) { //$NON-NLS-1$
			handleEclipseSchemaDelta(file, delta);
		} else {
			if (file.equals(PDEProject.getPluginXml(project)) || file.equals(PDEProject.getFragmentXml(project))) {
			if (path.equals(ICoreConstants.PLUGIN_PATH) || path.equals(ICoreConstants.FRAGMENT_PATH)) {
				handleExtensionFileDelta(file, delta);
			} else if (file.equals(PDEProject.getManifest(project))) {
				handleBundleManifestDelta(file, delta);
			}
		}

	 */
	protected Object removeModel(IProject project) {
		Object model = super.removeModel(project);
		if (model != null && PDEProject.getOptionsFile(project).exists())
			PDECore.getDefault().getTracingOptionsManager().reset();
		if (model instanceof IPluginModelBase) {
			// PluginModelManager will remove IPluginModelBase form ModelEntry before triggering IModelChangedEvent

	 * 
	 */
	protected boolean isInterestingFolder(IFolder folder) {
		IContainer root = PDEProject.getBundleRoot(folder.getProject());
		if (folder.getProjectRelativePath().isPrefixOf(root.getProjectRelativePath())) {
			return true;
		}
		String folderName = folder.getName();
		if (("META-INF".equals(folderName) || "OSGI-INF".equals(folderName) || "schema".equals(folderName)) && folder.getParent().equals(root)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			return true;
		}
		if ("OSGI-INF/l10n".equals(folder.getProjectRelativePath().toString())) { //$NON-NLS-1$




package org.eclipse.pde.internal.core.build;

import java.io.PrintWriter;
import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.ModelChangedEvent;
import org.eclipse.pde.core.build.IBuildEntry;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.PropertiesUtil;

public class BuildEntry extends BuildObject implements IBuildEntry {

	}

	void processEntry(String value) {
		IPath rootPath = getRootPath();
		StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$
		while (stok.hasMoreTokens()) {
			String token = stok.nextToken();
			token = token.trim();
			token = fromRelative(token, rootPath);
			tokens.add(token);
		}
	}

	}

	public void write(String indent, PrintWriter writer) {
		Enumeration elements = tokens.elements();
		IPath rootPath = getRootPath();
		if (rootPath != null) {
			// translation required for source. and output. entries
			Vector vector = new Vector();
			while (elements.hasMoreElements()) {
				String e = (String) elements.nextElement();
				vector.add(toRelative(e, rootPath));
			}
			elements = vector.elements();
		}
		PropertiesUtil.writeKeyValuePair(indent, name, elements, writer);
	}

	public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {

			setName(newValue != null ? newValue.toString() : null);
		}
	}

	/**
	 * Returns the path that this entries tokens are relative to, or <code>null</code> if none.
	 * 
	 * @return relative root path, or <code>null</code>
	 */
	IPath getRootPath() {
		if (name.startsWith(IBuildEntry.JAR_PREFIX) || name.startsWith(IBuildEntry.OUTPUT_PREFIX)) {
			IResource resource = getModel().getUnderlyingResource();
			if (resource != null) {
				IProject project = resource.getProject();
				if (project != null) {
					IContainer root = PDEProject.getBundleRoot(project);
					if (root != null && !root.equals(project)) {
						// translation required for source. and output. entries
						return root.getProjectRelativePath();
					}
				}
			}
		}
		return null;
	}

	/**
	 * Makes the token a bundle root relative path
	 * 
	 * @param token token
	 * @param root bundle root path or <code>null</code>
	 * @return bundle relative token
	 */
	String toRelative(String token, IPath root) {
		if (root == null) {
			return token;
		}
		return (new Path(token)).makeRelativeTo(root).toPortableString();
	}

	/**
	 * Makes the token a project relative path
	 * 
	 * @param token token
	 * @param root bundle root path or <code>null</code>
	 * @return project relative token
	 */
	String fromRelative(String token, IPath root) {
		if (root == null) {
			return token;
		}
		return root.append(new Path(token)).toPortableString();
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.*;
import java.net.URL;
import org.eclipse.core.runtime.IPath;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;

public class ExternalBuildModel extends BuildModel {

			if (file.isFile() && file.getName().endsWith(".jar")) { //$NON-NLS-1$
				url = new URL("jar:file:" + file.getAbsolutePath() + "!/build.properties"); //$NON-NLS-1$ //$NON-NLS-2$
			} else {
				url = new URL("file:" + file.getAbsolutePath() + IPath.SEPARATOR + ICoreConstants.BUILD_FILENAME_DESCRIPTOR); //$NON-NLS-1$
			}
			stream = url.openStream();
			load(stream, false);


	private File getLocalFile() {
		File file = new File(getInstallLocation());
		return (file.isFile()) ? file : new File(file, ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
	}

	public boolean isInSync() {




/*******************************************************************************
 * Copyright (c) 2005, 2010 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.pde.internal.core.*;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.build.BuildEntry;
import org.eclipse.pde.internal.core.text.build.BuildModel;
import org.eclipse.pde.internal.core.util.CoreUtility;

public class BuildErrorReporter extends ErrorReporter implements IBuildPropertiesConstants {

	private static final String DEF_SOURCE_ENTRY = PROPERTY_SOURCE_PREFIX + '.';
	private static final String[] RESERVED_NAMES = new String[] {"meta-inf", "osgi-inf", ICoreConstants.BUILD_FILENAME_DESCRIPTOR, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR, "plugin.properties"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
	private static final String JAVAC_WARNINGS_ENTRY = PROPERTY_JAVAC_WARNINGS_PREFIX + '.';
	private static final String ASSERT_IDENTIFIER = "assertIdentifier"; //$NON-NLS-1$
	private static final String ENUM_IDENTIFIER = "enumIdentifier"; //$NON-NLS-1$


	private void validateBinIncludes(IBuildEntry binIncludes) {
		// make sure we have a manifest entry
		if (PDEProject.getManifest(fProject).exists()) {
			validateBinIncludes(binIncludes, ICoreConstants.MANIFEST_FOLDER_NAME);
		}

		// if we have an OSGI_INF/ directory, let's do some validation
		IFolder OSGinf = PDEProject.getOSGiInf(fProject);
		if (OSGinf.exists()) {
			try {
				if (OSGinf.members().length > 0) { // only validate if we have something in it
				if (folder.members().length > 0) { // only validate if we have something in it
					validateBinIncludes(binIncludes, ICoreConstants.OSGI_INF_FOLDER_NAME);
				}
			} catch (CoreException e) { // do nothing

		}

		// make sure if we're a fragment, we have a fragment.xml entry
		if (PDEProject.getFragmentXml(fProject).exists()) {
			validateBinIncludes(binIncludes, ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR);
		}

		// make sure if we're a plug-in, we have a plugin.xml entry
		if (PDEProject.getPluginXml(fProject).exists()) {
			validateBinIncludes(binIncludes, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
		}


			if (startsWithAntVariable(token))
				// skip '${x}' variables
				continue;
			IResource member = PDEProject.getBundleRoot(fProject).findMember(token);
			String message = null;
			int fixId = PDEMarkerFactory.NO_RESOLUTION;
			if (member == null) {




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.pde.core.plugin.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;
import org.eclipse.pde.internal.core.util.*;
import org.osgi.framework.*;

		IPluginBase base = fModel.getPluginBase();
		// must check the existence of plugin.xml file instead of using IPluginBase because if the bundle is not a singleton,
		// it won't be registered with the extension registry and will always return 0 when querying extensions/extension points
		boolean hasExtensions = base != null && PDEProject.getPluginXml(fProject).exists();

		if (hasExtensions) {
			if (TargetPlatformHelper.getTargetVersion() >= 3.1) {

	private void validateFragmentHost() {
		IHeader header = getHeader(Constants.FRAGMENT_HOST);
		if (header == null) {
			if (isCheckNoRequiredAttr() && PDEProject.getFragmentXml(fProject).exists()) {
				report(PDECoreMessages.BundleErrorReporter_HostNeeded, 1, CompilerFlags.P_NO_REQUIRED_ATT, PDEMarkerFactory.CAT_FATAL);
			}
			return;

			location = new String();
		}

		IResource res = PDEProject.getBundleRoot(fProject).findMember(location);
		if (res == null || !(res instanceof IContainer)) {
			report(PDECoreMessages.BundleErrorReporter_localization_folder_not_exist, header.getLineNumber() + 1, CompilerFlags.getFlag(fProject, CompilerFlags.P_UNKNOWN_RESOURCE), PDEMarkerFactory.CAT_OTHER);
			return;




/*******************************************************************************
 * Copyright (c) 2000, 2010 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

 *******************************************************************************/
package org.eclipse.pde.internal.core.builders;

import java.util.Locale;
import java.util.Map;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.osgi.framework.Bundle;

public class FeatureConsistencyChecker extends IncrementalProjectBuilder {

	}

	private void checkProject(IProgressMonitor monitor) {
		IFile file = PDEProject.getFeatureXml(getProject());
		if (file.exists()) {
			checkFile(file, monitor);
		}

	}

	private boolean isManifestFile(IFile file) {
		return file.equals(PDEProject.getFeatureXml(file.getProject()));
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#clean(org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected void clean(IProgressMonitor monitor) throws CoreException {
		IFile file = PDEProject.getFeatureXml(getProject());
		if (file.exists()) {
			SubMonitor localmonitor = SubMonitor.convert(monitor, NLS.bind(PDECoreMessages.FeatureConsistencyChecker_0, file.getName()), 1);
			try {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/builders/ManifestConsistencyChecker.java (-20 / +22 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 21-26 Link Here
21	import org.eclipse.pde.core.plugin.PluginRegistry;	21	import org.eclipse.pde.core.plugin.PluginRegistry;
22	import org.eclipse.pde.internal.core.*;	22	import org.eclipse.pde.internal.core.*;
23	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	23	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
		24	import org.eclipse.pde.internal.core.project.PDEProject;
24	import org.osgi.framework.Bundle;	25	import org.osgi.framework.Bundle;
25		26
26	public class ManifestConsistencyChecker extends IncrementalProjectBuilder {	27	public class ManifestConsistencyChecker extends IncrementalProjectBuilder {
Lines 98-105 Link Here
98	if (resource.isDerived())	99	if (resource.isDerived())
99	return false;	100	return false;
100	if (resource.getType() == IResource.FILE) {	101	if (resource.getType() == IResource.FILE) {
		102	IFile file = (IFile) resource;
		103	IProject project = file.getProject();
101	String name = resource.getName();	104	String name = resource.getName();
102	IPath path = resource.getProjectRelativePath();
103	if (isLocalizationFile(resource)) {	105	if (isLocalizationFile(resource)) {
104	type \|= MANIFEST \| EXTENSIONS;	106	type \|= MANIFEST \| EXTENSIONS;
105	if (DEBUG) {	107	if (DEBUG) {
Lines 107-127 Link Here
107	System.out.print(delta.getResource().getProjectRelativePath().toString());	109	System.out.print(delta.getResource().getProjectRelativePath().toString());
108	System.out.println(" - changed"); //$NON-NLS-1$	110	System.out.println(" - changed"); //$NON-NLS-1$
109	}	111	}
110	} else if (path.equals(ICoreConstants.MANIFEST_PATH)) {	112	} else if (file.equals(PDEProject.getManifest(project))) {
111	type \|= MANIFEST \| EXTENSIONS \| BUILD;	113	type \|= MANIFEST \| EXTENSIONS \| BUILD;
112	if (DEBUG) {	114	if (DEBUG) {
113	System.out.print("Needs to rebuild project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$	115	System.out.print("Needs to rebuild project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$
114	System.out.print(delta.getResource().getProjectRelativePath().toString());	116	System.out.print(delta.getResource().getProjectRelativePath().toString());
115	System.out.println(" - changed"); //$NON-NLS-1$	117	System.out.println(" - changed"); //$NON-NLS-1$
116	}	118	}
117	} else if (name.endsWith(".exsd") \|\| path.equals(ICoreConstants.PLUGIN_PATH) \|\| path.equals(ICoreConstants.FRAGMENT_PATH)) { //$NON-NLS-1$	119	} else if (name.endsWith(".exsd") \|\| file.equals(PDEProject.getPluginXml(project)) \|\| file.equals(PDEProject.getFragmentXml(project))) { //$NON-NLS-1$
118	type \|= EXTENSIONS;	120	type \|= EXTENSIONS;
119	if (DEBUG) {	121	if (DEBUG) {
120	System.out.print("Needs to rebuild extensions in project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$	122	System.out.print("Needs to rebuild extensions in project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$
121	System.out.print(delta.getResource().getProjectRelativePath().toString());	123	System.out.print(delta.getResource().getProjectRelativePath().toString());
122	System.out.println(" - changed"); //$NON-NLS-1$	124	System.out.println(" - changed"); //$NON-NLS-1$
123	}	125	}
124	} else if (path.equals(ICoreConstants.BUILD_PROPERTIES_PATH)) {	126	} else if (file.equals(PDEProject.getBuildProperties(project))) {
125	type \|= BUILD;	127	type \|= BUILD;
126	if (DEBUG) {	128	if (DEBUG) {
127	System.out.print("Needs to rebuild build.properties in project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$	129	System.out.print("Needs to rebuild build.properties in project [" + getProject().getName() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$
Lines 225-238 Link Here
225		227
226	if ((type & MANIFEST \| EXTENSIONS) != 0) {	228	if ((type & MANIFEST \| EXTENSIONS) != 0) {
227	IProject project = getProject();	229	IProject project = getProject();
228	IFile file = project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);	230	IFile file = PDEProject.getPluginXml(project);
229	if (!file.exists())	231	if (!file.exists())
230	file = project.getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR);	232	file = PDEProject.getFragmentXml(project);
231		233
232	if (file.exists()) {	234	if (file.exists()) {
233	validateFiles(file, type, monitor);	235	validateFiles(file, type, monitor);
234	} else if ((type & MANIFEST) != 0) {	236	} else if ((type & MANIFEST) != 0) {
235	IFile manifestFile = project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);	237	IFile manifestFile = PDEProject.getManifest(project);
236	if (manifestFile.exists())	238	if (manifestFile.exists())
237	validateManifestFile(manifestFile, new SubProgressMonitor(monitor, 1));	239	validateManifestFile(manifestFile, new SubProgressMonitor(monitor, 1));
238	}	240	}
Lines 288-294 Link Here
288	String message = NLS.bind(PDECoreMessages.Builders_verifying, file.getFullPath().toString());	290	String message = NLS.bind(PDECoreMessages.Builders_verifying, file.getFullPath().toString());
289	monitor.subTask(message);	291	monitor.subTask(message);
290		292
291	IFile bundleManifest = file.getProject().getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);	293	IFile bundleManifest = PDEProject.getManifest(getProject());
292	XMLErrorReporter reporter = null;	294	XMLErrorReporter reporter = null;
293	BundleErrorReporter bundleReporter = null;	295	BundleErrorReporter bundleReporter = null;
294	if (bundleManifest.exists()) {	296	if (bundleManifest.exists()) {
Lines 297-305 Link Here
297	if ((type & MANIFEST) != 0)	299	if ((type & MANIFEST) != 0)
298	bundleReporter = new BundleErrorReporter(bundleManifest);	300	bundleReporter = new BundleErrorReporter(bundleManifest);
299	} else if ((type & MANIFEST) != 0 \|\| (type & EXTENSIONS) != 0) {	301	} else if ((type & MANIFEST) != 0 \|\| (type & EXTENSIONS) != 0) {
300	if (file.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR)) {	302	if (file.equals(PDEProject.getPluginXml(getProject()))) {
301	reporter = new PluginErrorReporter(file);	303	reporter = new PluginErrorReporter(file);
302	} else if (file.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {	304	} else if (file.equals(PDEProject.getFragmentXml(getProject()))) {
303	reporter = new FragmentErrorReporter(file);	305	reporter = new FragmentErrorReporter(file);
304	}	306	}
305	}	307	}
Lines 319-325 Link Here
319	if (monitor.isCanceled())	321	if (monitor.isCanceled())
320	return;	322	return;
321	IProject project = getProject();	323	IProject project = getProject();
322	IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);	324	IFile file = PDEProject.getBuildProperties(project);
323	if (file.exists()) {	325	if (file.exists()) {
324	monitor.subTask(PDECoreMessages.ManifestConsistencyChecker_buildPropertiesSubtask);	326	monitor.subTask(PDECoreMessages.ManifestConsistencyChecker_buildPropertiesSubtask);
325	BuildErrorReporter ber = new BuildErrorReporter(file);	327	BuildErrorReporter ber = new BuildErrorReporter(file);
Lines 329-335 Link Here
329		331
330	// Will place a marker on the project if the build.properties does not exist	332	// Will place a marker on the project if the build.properties does not exist
331	private void validateBuildPropertiesExists(IProject project) {	333	private void validateBuildPropertiesExists(IProject project) {
332	IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);	334	IFile file = PDEProject.getBuildProperties(project);
333	if (!file.exists()) {	335	if (!file.exists()) {
334	int severity = CompilerFlags.getFlag(project, CompilerFlags.P_BUILD);	336	int severity = CompilerFlags.getFlag(project, CompilerFlags.P_BUILD);
335	if (severity == CompilerFlags.IGNORE)	337	if (severity == CompilerFlags.IGNORE)
Lines 346-359 Link Here
346		348
347	// Will place a marker on either the project (if META-INF exist but not a MANIFEST.MF) or on the MANIFEST.MF file with incorrect casing.	349	// Will place a marker on either the project (if META-INF exist but not a MANIFEST.MF) or on the MANIFEST.MF file with incorrect casing.
348	private void validateManifestCasing(IProject project) {	350	private void validateManifestCasing(IProject project) {
349	IFolder manifestFolder = project.getFolder("META-INF"); //$NON-NLS-1$	351	IFolder manifestFolder = PDEProject.getMetaInf(project);
350	if (manifestFolder.exists()) {	352	if (manifestFolder.exists()) {
351	try {	353	try {
352	manifestFolder.deleteMarkers(PDEMarkerFactory.MARKER_ID, false, IResource.DEPTH_ONE);	354	manifestFolder.deleteMarkers(PDEMarkerFactory.MARKER_ID, false, IResource.DEPTH_ONE);
353	} catch (CoreException e1) {	355	} catch (CoreException e1) {
354	}	356	}
355	// exit if the proper casing exists (should be majority of the time)	357	// exit if the proper casing exists (should be majority of the time)
356	if (manifestFolder.getFile("MANIFEST.MF").exists()) //$NON-NLS-1$	358	if (PDEProject.getManifest(project).exists())
357	return;	359	return;
358		360
359	IPath location = manifestFolder.getLocation();	361	IPath location = manifestFolder.getLocation();
Lines 389-395 Link Here
389	class ManifestFilter implements FilenameFilter {	391	class ManifestFilter implements FilenameFilter {
390		392
391	public boolean accept(File dir, String name) {	393	public boolean accept(File dir, String name) {
392	return (name.equalsIgnoreCase("MANIFEST.MF")); //$NON-NLS-1$	394	return (name.equalsIgnoreCase(ICoreConstants.MANIFEST_FILENAME));
393	}	395	}
394	}	396	}
395		397
Lines 402-415 Link Here
402	// clean problem markers on the project	404	// clean problem markers on the project
403	cleanProblems(getProject(), IResource.DEPTH_ZERO);	405	cleanProblems(getProject(), IResource.DEPTH_ZERO);
404	// clean the manifest directory (since errors can be created on manifest files with incorrect casing)	406	// clean the manifest directory (since errors can be created on manifest files with incorrect casing)
405	IFile manifestFile = getProject().getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);	407	IFile manifestFile = PDEProject.getManifest(getProject());
406	cleanProblems(manifestFile.getParent(), IResource.DEPTH_ONE);	408	cleanProblems(manifestFile.getParent(), IResource.DEPTH_ONE);
407	// clean plug-in XML file	409	// clean plug-in XML file
408	cleanProblems(getProject().getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), IResource.DEPTH_ZERO);	410	cleanProblems(PDEProject.getPluginXml(getProject()), IResource.DEPTH_ZERO);
409	// clean fragment XML file	411	// clean fragment XML file
410	cleanProblems(getProject().getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR), IResource.DEPTH_ZERO);	412	cleanProblems(PDEProject.getFragmentXml(getProject()), IResource.DEPTH_ZERO);
411	// clean build properties	413	// clean build properties
412	cleanProblems(getProject().getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR), IResource.DEPTH_ZERO);	414	cleanProblems(PDEProject.getBuildProperties(getProject()), IResource.DEPTH_ZERO);
413	localmonitor.worked(1);	415	localmonitor.worked(1);
414	} finally {	416	} finally {
415	localmonitor.done();	417	localmonitor.done();

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/bundle/WorkspaceBundlePluginModelBase.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 77-83 Link Here
77	public IBundleModel getBundleModel() {	77	public IBundleModel getBundleModel() {
78	if (fBundleModel == null) {	78	if (fBundleModel == null) {
79	IFile file = (IFile) getUnderlyingResource();	79	IFile file = (IFile) getUnderlyingResource();
80	fBundleModel = new WorkspaceBundleModel((IFile) getUnderlyingResource());	80	fBundleModel = new WorkspaceBundleModel(file);
81	if (file.exists()) {	81	if (file.exists()) {
82	try {	82	try {
83	fBundleModel.load();	83	fBundleModel.load();




/*******************************************************************************
 *  Copyright (c) 2003, 2010 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.pde.internal.core.build.Build;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.converter.PluginConverterParser.PluginInfo;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.osgi.framework.*;

public class PluginConverter {

	/** bundle manifest type jared bundle */
	static public final byte MANIFEST_TYPE_JAR = 0x08;

	public static final String OSGI_BUNDLE_MANIFEST = "META-INF/MANIFEST.MF"; //$NON-NLS-1$

	private static final String SEMICOLON = "; "; //$NON-NLS-1$
	private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
	public static final String LIST_SEPARATOR = ",\n "; //$NON-NLS-1$

	private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
	private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
	private static PluginConverter instance;
	static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
	static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
	static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
	protected static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$
	protected static final String PI_RUNTIME_COMPATIBILITY = "org.eclipse.core.runtime.compatibility"; //$NON-NLS-1$
	static public final String PLUGIN_MANIFEST = "plugin.xml"; //$NON-NLS-1$
	private static final String COMPATIBILITY_ACTIVATOR = "org.eclipse.core.internal.compatibility.PluginActivator"; //$NON-NLS-1$
	private static final String SOURCE_PREFIX = "source."; //$NON-NLS-1$


			//this can't happen since we are building the urls ourselves from a file
		}
		try {
			xmlFileLocation = new URL(baseURL, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
			stream = xmlFileLocation.openStream();
			manifestType |= MANIFEST_TYPE_PLUGIN;
			return xmlFileLocation;

			}
		}
		try {
			xmlFileLocation = new URL(baseURL, ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR);
			stream = xmlFileLocation.openStream();
			manifestType |= MANIFEST_TYPE_FRAGMENT;
			return xmlFileLocation;

	}

	public Set getExports(IProject proj, Map libs) {
		IFile buildProperties = PDEProject.getBuildProperties(proj);
		IBuild build = null;
		if (buildProperties != null) {
			WorkspaceBuildModel buildModel = new WorkspaceBuildModel(buildProperties);

		if ((manifestType & MANIFEST_TYPE_JAR) != 0)
			return pluginLocation.lastModified();
		else if ((manifestType & MANIFEST_TYPE_PLUGIN) != 0)
			return new File(pluginLocation, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR).lastModified();
		else if ((manifestType & MANIFEST_TYPE_FRAGMENT) != 0)
			return new File(pluginLocation, ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR).lastModified();
		else if ((manifestType & MANIFEST_TYPE_BUNDLE) != 0)
			return new File(pluginLocation, ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR).lastModified();
		return -1;
	}





/*******************************************************************************
 * Copyright (c) 2006, 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.core.exports;

import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.pde.core.IModel;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.ifeature.IFeature;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;

public abstract class FeatureBasedExportOperation extends FeatureExportOperation {

	protected String fFeatureLocation;

	public FeatureBasedExportOperation(FeatureExportInfo info, String name) {
		super(info, name);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#run(org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IStatus run(IProgressMonitor monitor) {
		try {
			createDestination();
			monitor.beginTask("Exporting...", 33); //$NON-NLS-1$
			// create a feature to contain all plug-ins
			String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
			fFeatureLocation = fBuildTempLocation + File.separator + featureID;
			String[][] config = new String[][] {{TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL()}};
			createFeature(featureID, fFeatureLocation, config, false);
			createBuildPropertiesFile(fFeatureLocation);
			if (fInfo.useJarFormat)
				createPostProcessingFiles();
			IStatus status = testBuildWorkspaceBeforeExport(new SubProgressMonitor(monitor, 10));
			doExport(featureID, null, fFeatureLocation, config, new SubProgressMonitor(monitor, 20));
			if (monitor.isCanceled()) {
				return Status.CANCEL_STATUS;
			}
			return status;
		} catch (IOException e) {
			return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e);
		} catch (CoreException e) {
			return e.getStatus();
		} catch (InvocationTargetException e) {
			return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e.getTargetException());
		} finally {
			for (int i = 0; i < fInfo.items.length; i++) {
				if (fInfo.items[i] instanceof IModel)
					try {
						deleteBuildFiles(fInfo.items[i]);
					} catch (CoreException e) {
						PDECore.log(e);
					}
			}
			cleanup(null, new SubProgressMonitor(monitor, 3));
			monitor.done();
		}
	}

	protected abstract void createPostProcessingFiles();

	protected String[] getPaths() {
		String[] paths = super.getPaths();
		String[] all = new String[paths.length + 1];
		all[0] = fFeatureLocation + File.separator + ICoreConstants.FEATURE_FILENAME_DESCRIPTOR;
		System.arraycopy(paths, 0, all, 1, paths.length);
		return all;
	}

	private void createBuildPropertiesFile(String featureLocation) {
		File file = new File(featureLocation);
		if (!file.exists() || !file.isDirectory())
			file.mkdirs();
		Properties prop = new Properties();
		prop.put("pde", "marker"); //$NON-NLS-1$ //$NON-NLS-2$

		if (fInfo.exportSource && fInfo.exportSourceBundle) {
			prop.put("individualSourceBundles", "true"); //$NON-NLS-1$ //$NON-NLS-2$
			Dictionary environment = new Hashtable(4);
			environment.put("osgi.os", TargetPlatform.getOS()); //$NON-NLS-1$
			environment.put("osgi.ws", TargetPlatform.getWS()); //$NON-NLS-1$
			environment.put("osgi.arch", TargetPlatform.getOSArch()); //$NON-NLS-1$
			environment.put("osgi.nl", TargetPlatform.getNL()); //$NON-NLS-1$

			for (int i = 0; i < fInfo.items.length; i++) {
				if (fInfo.items[i] instanceof IFeatureModel) {
					IFeature feature = ((IFeatureModel) fInfo.items[i]).getFeature();
					prop.put("generate.feature@" + feature.getId() + ".source", feature.getId()); //$NON-NLS-1$ //$NON-NLS-2$
				} else {
					BundleDescription bundle = null;
					if (fInfo.items[i] instanceof IPluginModelBase) {
						bundle = ((IPluginModelBase) fInfo.items[i]).getBundleDescription();
					}
					if (bundle == null) {
						if (fInfo.items[i] instanceof BundleDescription)
							bundle = (BundleDescription) fInfo.items[i];
					}
					if (bundle == null)
						continue;
					if (shouldAddPlugin(bundle, environment)) {
						prop.put("generate.plugin@" + bundle.getSymbolicName() + ".source", bundle.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
					}
				}
			}
		}
		save(new File(file, ICoreConstants.BUILD_FILENAME_DESCRIPTOR), prop, "Marker File"); //$NON-NLS-1$
	}
}
}




/*******************************************************************************
 * Copyright (c) 2006, 2010 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.pde.internal.core.feature.ExternalFeatureModel;
import org.eclipse.pde.internal.core.feature.FeatureChild;
import org.eclipse.pde.internal.core.ifeature.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.osgi.framework.InvalidSyntaxException;
import org.w3c.dom.*;

				model.setInstallLocation(fFeatureLocation);
				InputStream stream = null;

				stream = new BufferedInputStream(new FileInputStream(new File(fFeatureLocation + File.separator + ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)));
				model.load(stream, true);
				if (stream != null) {
					stream.close();


	protected boolean isCustomBuild(IModel model) throws CoreException {
		IBuildModel buildModel = null;
		IFile buildFile = PDEProject.getBuildProperties(model.getUnderlyingResource().getProject());
		if (buildFile.exists()) {
			buildModel = new WorkspaceBuildModel(buildFile);
			buildModel.load();

			if (!file.exists() || !file.isDirectory())
				file.mkdirs();

			save(new File(file, ICoreConstants.BUILD_FILENAME_DESCRIPTOR), prop, "Marker File"); //$NON-NLS-1$ 
			XMLPrintHandler.writeFile(doc, new File(file, ICoreConstants.FEATURE_FILENAME_DESCRIPTOR));
		} catch (DOMException e1) {
		} catch (FactoryConfigurationError e1) {
		} catch (ParserConfigurationException e1) {

					}
				}
			}
			XMLPrintHandler.writeFile(doc, new File(file, ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR));
		} catch (DOMException e1) {
		} catch (FactoryConfigurationError e1) {
		} catch (ParserConfigurationException e1) {




/*******************************************************************************
 * Copyright (c) 2006, 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.core.exports;

import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.build.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.ifeature.IFeature;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.core.iproduct.*;
import org.eclipse.pde.internal.core.iproduct.IProduct;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.w3c.dom.Element;

public class ProductExportOperation extends FeatureExportOperation {
	private static final String STATUS_MESSAGE = "!MESSAGE"; //$NON-NLS-1$
	private static final String STATUS_ENTRY = "!ENTRY"; //$NON-NLS-1$
	private static final String STATUS_SUBENTRY = "!SUBENTRY"; //$NON-NLS-1$
	private static final String ECLIPSE_APP_MACOS = "Eclipse.app/Contents/MacOS"; //$NON-NLS-1$
	private static final String ECLIPSE_APP_CONTENTS = "Eclipse.app/Contents"; //$NON-NLS-1$
	private String fFeatureLocation;
	private String fRoot;
	private IProduct fProduct;

	protected static String errorMessage;

	public static void setErrorMessage(String message) {
		errorMessage = message;
	}

	public static String getErrorMessage() {
		return errorMessage;
	}

	public static IStatus parseErrorMessage(CoreException e) {
		if (errorMessage == null)
			return null;

		MultiStatus status = null;
		StringTokenizer tokenizer = new StringTokenizer(errorMessage, "\n"); //$NON-NLS-1$
		for (; tokenizer.hasMoreTokens();) {
			String line = tokenizer.nextToken().trim();
			if (line.startsWith(STATUS_ENTRY) && tokenizer.hasMoreElements()) {
				String next = tokenizer.nextToken();
				if (next.startsWith(STATUS_MESSAGE)) {
					status = new MultiStatus(PDECore.PLUGIN_ID, 0, next.substring(8), null);
				}
			} else if (line.startsWith(STATUS_SUBENTRY) && tokenizer.hasMoreElements() && status != null) {
				String next = tokenizer.nextToken();
				if (next.startsWith(STATUS_MESSAGE)) {
					status.add(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, next.substring(8)));
				}
			}
		}
		if (status != null)
			return status;

		//parsing didn't work, just set the message
		return new MultiStatus(PDECore.PLUGIN_ID, 0, new IStatus[] {e.getStatus()}, errorMessage, null);
	}

	public ProductExportOperation(FeatureExportInfo info, String name, IProduct product, String root) {
		super(info, name);
		fProduct = product;
		fRoot = root;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#run(org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IStatus run(IProgressMonitor monitor) {
		String[][] configurations = fInfo.targets;
		if (configurations == null)
			configurations = new String[][] {{TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL()}};

		cleanupBuildRepo();
		errorMessage = null;

		try {
			monitor.beginTask("", 10); //$NON-NLS-1$
			try {
				// create a feature to wrap all plug-ins and features
				String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
				fFeatureLocation = fBuildTempLocation + File.separator + featureID;

				createFeature(featureID, fFeatureLocation, configurations, true);
				createBuildPropertiesFile(fFeatureLocation, configurations);
				doExport(featureID, null, fFeatureLocation, configurations, new SubProgressMonitor(monitor, 8));
			} catch (IOException e) {
				PDECore.log(e);
			} catch (InvocationTargetException e) {
				return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e.getTargetException());
			} catch (CoreException e) {
				if (errorMessage != null)
					return parseErrorMessage(e);
				return e.getStatus();
			} finally {
				// Clean up generated files
				for (int j = 0; j < fInfo.items.length; j++) {
					try {
						deleteBuildFiles(fInfo.items[j]);
					} catch (CoreException e) {
						PDECore.log(e);
					}
				}
				cleanup(null, new SubProgressMonitor(monitor, 1));
			}

			if (hasAntErrors()) {
				return new Status(IStatus.WARNING, PDECore.PLUGIN_ID, NLS.bind(PDECoreMessages.FeatureExportOperation_CompilationErrors, fInfo.destinationDirectory));
			}

		} finally {
			monitor.done();
			errorMessage = null;
		}
		return Status.OK_STATUS;
	}

	protected boolean groupedConfigurations() {
		// we never group product exports
		return false;
	}

	private void cleanupBuildRepo() {
		File metadataTemp = new File(fBuildTempMetadataLocation);
		if (metadataTemp.exists()) {
			//make sure our build metadata repo is clean
			deleteDir(metadataTemp);
		}
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#getPaths()
	 */
	protected String[] getPaths() {
		String[] paths = super.getPaths();
		String[] all = new String[paths.length + 1];
		all[0] = fFeatureLocation + File.separator + ICoreConstants.FEATURE_FILENAME_DESCRIPTOR;
		System.arraycopy(paths, 0, all, 1, paths.length);
		return all;
	}

	private void createBuildPropertiesFile(String featureLocation, String[][] configurations) {
		File file = new File(featureLocation);
		if (!file.exists() || !file.isDirectory())
			file.mkdirs();

		boolean hasLaunchers = PDECore.getDefault().getFeatureModelManager().getDeltaPackFeature() != null;
		Properties properties = new Properties();
		if (!hasLaunchers && configurations.length > 0) {
			String rootPrefix = IBuildPropertiesConstants.ROOT_PREFIX + configurations[0][0] + "." + configurations[0][1] + "." + configurations[0][2]; //$NON-NLS-1$ //$NON-NLS-2$
			properties.put(rootPrefix, getRootFileLocations(hasLaunchers));
			if (TargetPlatform.getOS().equals("macosx")) { //$NON-NLS-1$
				String plist = createMacInfoPList();
				if (plist != null)
					properties.put(rootPrefix + ".folder." + ECLIPSE_APP_CONTENTS, "absolute:file:" + plist); //$NON-NLS-1$ //$NON-NLS-2$
				properties.put(rootPrefix + ".folder." + ECLIPSE_APP_MACOS, getLauncherLocations(hasLaunchers)); //$NON-NLS-1$
				properties.put(rootPrefix + ".permissions.755", ECLIPSE_APP_MACOS + "/" + getLauncherName()); //$NON-NLS-1$ //$NON-NLS-2$
			} else {
				properties.put(rootPrefix, getLauncherLocations(hasLaunchers)); //To copy a folder
				properties.put(rootPrefix + ".permissions.755", getLauncherName()); //$NON-NLS-1$
				if (TargetPlatform.getWS().equals("motif") && TargetPlatform.getOS().equals("linux")) { //$NON-NLS-1$ //$NON-NLS-2$
					properties.put(rootPrefix + ".permissions.755", "libXm.so.2"); //$NON-NLS-1$ //$NON-NLS-2$
				}
			}
		}

		IJREInfo jreInfo = fProduct.getJREInfo();
		for (int i = 0; i < configurations.length; i++) {
			String[] config = configurations[i];
			File vm = jreInfo != null ? jreInfo.getJVMLocation(config[0]) : null;

			if (vm != null) {
				String rootPrefix = IBuildPropertiesConstants.ROOT_PREFIX + config[0] + "." + config[1] + //$NON-NLS-1$
						"." + config[2]; //$NON-NLS-1$
				properties.put(rootPrefix + ".folder.jre", "absolute:" + vm.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
				String perms = (String) properties.get(rootPrefix + ".permissions.755"); //$NON-NLS-1$
				if (perms != null) {
					StringBuffer buffer = new StringBuffer(perms);
					buffer.append(","); //$NON-NLS-1$
					buffer.append("jre/bin/java"); //$NON-NLS-1$
					properties.put(rootPrefix + ".permissions.755", buffer.toString()); //$NON-NLS-1$
				}
			}
		}

		if (fInfo.exportSource && fInfo.exportSourceBundle) {
			properties.put(IBuildPropertiesConstants.PROPERTY_INDIVIDUAL_SOURCE, "true"); //$NON-NLS-1$
			List workspacePlugins = Arrays.asList(PluginRegistry.getWorkspaceModels());
			for (int i = 0; i < fInfo.items.length; i++) {
				if (fInfo.items[i] instanceof IFeatureModel) {
					IFeature feature = ((IFeatureModel) fInfo.items[i]).getFeature();
					properties.put("generate.feature@" + feature.getId().trim() + ".source", feature.getId()); //$NON-NLS-1$ //$NON-NLS-2$
				} else {
					BundleDescription bundle = null;
					if (fInfo.items[i] instanceof IPluginModelBase) {
						bundle = ((IPluginModelBase) fInfo.items[i]).getBundleDescription();
					}
					if (bundle == null) {
						if (fInfo.items[i] instanceof BundleDescription)
							bundle = (BundleDescription) fInfo.items[i];
					}
					if (bundle == null)
						continue;

					//it doesn't matter if we generate extra properties for platforms we aren't exporting for
					if (workspacePlugins.contains(PluginRegistry.findModel(bundle))) {
						properties.put("generate.plugin@" + bundle.getSymbolicName().trim() + ".source", bundle.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
					}
				}
			}
		}
		save(new File(file, ICoreConstants.BUILD_FILENAME_DESCRIPTOR), properties, "Build Configuration"); //$NON-NLS-1$
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#publishingP2Metadata()
	 */
	protected boolean publishingP2Metadata() {
		return fInfo.exportMetadata;
	}

	private String getLauncherLocations(boolean hasLaunchers) {
		//get the launchers for the eclipse install
		StringBuffer buffer = new StringBuffer();
		if (!hasLaunchers) {
			File homeDir = new File(TargetPlatform.getLocation());
			if (homeDir.exists() && homeDir.isDirectory()) {
				// try to retrieve the exact eclipse launcher path
				// see bug 205833
				File file = null;
				if (System.getProperties().get("eclipse.launcher") != null) { //$NON-NLS-1$
					String launcherPath = System.getProperties().get("eclipse.launcher").toString(); //$NON-NLS-1$
					file = new File(launcherPath);
				}

				if (file != null && file.exists() && !file.isDirectory()) {
					appendAbsolutePath(buffer, file);
				} else if (TargetPlatform.getOS().equals("macosx")) { //$NON-NLS-1$)
					appendEclipsePath(buffer, new File(homeDir, ECLIPSE_APP_MACOS));
				} else {
					appendEclipsePath(buffer, homeDir);
				}
			}
		}
		return buffer.toString();
	}

	private String getRootFileLocations(boolean hasLaunchers) {
		//Get the files that go in the root of the eclipse install, excluding the launcher
		StringBuffer buffer = new StringBuffer();
		if (!hasLaunchers) {
			File homeDir = new File(TargetPlatform.getLocation());
			if (homeDir.exists() && homeDir.isDirectory()) {
				File file = new File(homeDir, "startup.jar"); //$NON-NLS-1$
				if (file.exists())
					appendAbsolutePath(buffer, file);

				file = new File(homeDir, "libXm.so.2"); //$NON-NLS-1$
				if (file.exists()) {
					appendAbsolutePath(buffer, file);
				}
			}
		}

		return buffer.toString();
	}

	private void appendEclipsePath(StringBuffer buffer, File homeDir) {
		File file = null;
		file = new File(homeDir, "eclipse"); //$NON-NLS-1$
		if (file.exists()) {
			appendAbsolutePath(buffer, file);
		}
		file = new File(homeDir, "eclipse.exe"); //$NON-NLS-1$
		if (file.exists()) {
			appendAbsolutePath(buffer, file);
		}
	}

	private void appendAbsolutePath(StringBuffer buffer, File file) {
		if (buffer.length() > 0)
			buffer.append(","); //$NON-NLS-1$

		buffer.append("absolute:file:"); //$NON-NLS-1$
		buffer.append(file.getAbsolutePath());
	}

	protected HashMap createAntBuildProperties(String[][] configs) {
		HashMap properties = super.createAntBuildProperties(configs);
		properties.put(IXMLConstants.PROPERTY_LAUNCHER_NAME, getLauncherName());

		if (fProduct.includeLaunchers()) {
			properties.put("excludeLaunchers", IBuildPropertiesConstants.TRUE); //$NON-NLS-1$
		}

		ILauncherInfo info = fProduct.getLauncherInfo();
		if (info != null) {
			String icons = ""; //$NON-NLS-1$
			for (int i = 0; i < configs.length; i++) {
				String images = null;
				if (configs[i][0].equals("win32")) { //$NON-NLS-1$
					images = getWin32Images(info);
				} else if (configs[i][0].equals("solaris")) { //$NON-NLS-1$
					images = getSolarisImages(info);
				} else if (configs[i][0].equals("linux")) { //$NON-NLS-1$
					images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON));
				} else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$
					images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON));
				}
				if (images != null) {
					if (icons.length() > 0)
						icons += ","; //$NON-NLS-1$
					icons += images;
				}

			}
			if (icons != null && icons.length() > 0)
				properties.put(IXMLConstants.PROPERTY_LAUNCHER_ICONS, icons);
		}

		fAntBuildProperties.put(IXMLConstants.PROPERTY_COLLECTING_FOLDER, fRoot);
		fAntBuildProperties.put(IXMLConstants.PROPERTY_ARCHIVE_PREFIX, fRoot);

		return properties;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#setP2MetaDataProperties(java.util.Map)
	 */
	protected void setP2MetaDataProperties(Map map) {
		if (fInfo.exportMetadata) {
			if (PDECore.getDefault().getFeatureModelManager().getDeltaPackFeature() == null)
				map.put(IXMLConstants.PROPERTY_LAUNCHER_PROVIDER, "org.eclipse.pde.container.feature"); //$NON-NLS-1$
			map.put(IXMLConstants.TARGET_P2_METADATA, IBuildPropertiesConstants.TRUE);
			map.put(IBuildPropertiesConstants.PROPERTY_P2_FLAVOR, P2Utils.P2_FLAVOR_DEFAULT);
			map.put(IBuildPropertiesConstants.PROPERTY_P2_PUBLISH_ARTIFACTS, IBuildPropertiesConstants.TRUE);
			map.put(IBuildPropertiesConstants.PROPERTY_P2_COMPRESS, IBuildPropertiesConstants.TRUE);
			map.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, Boolean.toString(publishingP2Metadata()));
			try {
				map.put(IBuildPropertiesConstants.PROPERTY_P2_BUILD_REPO, new File(fBuildTempMetadataLocation).toURL().toString());
				map.put(IBuildPropertiesConstants.PROPERTY_P2_METADATA_REPO, new File(fInfo.destinationDirectory + "/repository").toURL().toString()); //$NON-NLS-1$
				map.put(IBuildPropertiesConstants.PROPERTY_P2_ARTIFACT_REPO, new File(fInfo.destinationDirectory + "/repository").toURL().toString()); //$NON-NLS-1$
				map.put(IBuildPropertiesConstants.PROPERTY_P2_METADATA_REPO_NAME, NLS.bind(PDECoreMessages.ProductExportOperation_0, fProduct.getProductId()));
				map.put(IBuildPropertiesConstants.PROPERTY_P2_ARTIFACT_REPO_NAME, NLS.bind(PDECoreMessages.ProductExportOperation_0, fProduct.getProductId()));
			} catch (MalformedURLException e) {
				PDECore.log(e);
			}
		}
	}

	private String getLauncherName() {
		ILauncherInfo info = fProduct.getLauncherInfo();
		if (info != null) {
			String name = info.getLauncherName();
			if (name != null && name.length() > 0) {
				name = name.trim();
				if (name.endsWith(".exe")) //$NON-NLS-1$
					name = name.substring(0, name.length() - 4);
				return name;
			}
		}
		return "eclipse"; //$NON-NLS-1$
	}

	private String getWin32Images(ILauncherInfo info) {
		StringBuffer buffer = new StringBuffer();
		if (info.usesWinIcoFile()) {
			append(buffer, info.getIconPath(ILauncherInfo.P_ICO_PATH));
		} else {
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_16_LOW));
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_16_HIGH));
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_32_HIGH));
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_32_LOW));
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_48_HIGH));
			append(buffer, info.getIconPath(ILauncherInfo.WIN32_48_LOW));
		}
		return buffer.length() > 0 ? buffer.toString() : null;
	}

	private String getSolarisImages(ILauncherInfo info) {
		StringBuffer buffer = new StringBuffer();
		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_LARGE));
		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_MEDIUM));
		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_SMALL));
		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_TINY));
		return buffer.length() > 0 ? buffer.toString() : null;
	}

	private void append(StringBuffer buffer, String path) {
		path = getExpandedPath(path);
		if (path != null) {
			if (buffer.length() > 0)
				buffer.append(","); //$NON-NLS-1$
			buffer.append(path);
		}
	}

	private String getExpandedPath(String path) {
		if (path == null || path.length() == 0)
			return null;
		IResource resource = PDECore.getWorkspace().getRoot().findMember(new Path(path));
		if (resource != null) {
			IPath fullPath = resource.getLocation();
			return fullPath == null ? null : fullPath.toOSString();
		}
		return null;
	}

	protected void setupGenerator(BuildScriptGenerator generator, String featureID, String versionId, String[][] configs, String featureLocation) throws CoreException {
		super.setupGenerator(generator, featureID, versionId, configs, featureLocation);
		generator.setGenerateVersionsList(true);
		if (fProduct != null)
			generator.setProduct(fProduct.getModel().getInstallLocation());
	}

	private String createMacInfoPList() {
		String entryName = TargetPlatformHelper.getTargetVersion() >= 3.3 ? "macosx/Info.plist" //$NON-NLS-1$
				: "macosx/Info.plist.32"; //$NON-NLS-1$
		URL url = PDECore.getDefault().getBundle().getEntry(entryName);
		if (url == null)
			return null;

		File plist = null;
		InputStream in = null;
		String location = fFeatureLocation;

		try {
			in = url.openStream();
			File dir = new File(location, ECLIPSE_APP_CONTENTS);
			dir.mkdirs();
			plist = new File(dir, "Info.plist"); //$NON-NLS-1$
			CoreUtility.readFile(in, plist);
			return plist.getAbsolutePath();
		} catch (IOException e) {
			// nothing to do
		} finally {
			try {
				if (in != null)
					in.close();
			} catch (IOException e) {
			}
		}
		return null;
	}

	protected void setAdditionalAttributes(Element plugin, BundleDescription bundle) {
		plugin.setAttribute("unpack", Boolean.toString(CoreUtility.guessUnpack(bundle))); //$NON-NLS-1$
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/ibundle/IBundleModel.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-20 Link Here
14	import org.eclipse.pde.core.IModelChangeProvider;	14	import org.eclipse.pde.core.IModelChangeProvider;
15		15
16	/**	16	/**
17	* This model is created from the "META-INF/MANIFEST.MF" file that represents	17	* This model is created from the <code>META-INF/MANIFEST.MF</code> file that represents
18	* the plug-in manifest in Eclipse 3.0 OSGi format.	18	* the plug-in manifest in Eclipse 3.0 OSGi format.
19	* <p>	19	* <p>
20	* If this model is editable, isEditable() will return true and the model	20	* If this model is editable, isEditable() will return true and the model

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/ifeature/IFeatureModel.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-21 Link Here
15		15
16	/**	16	/**
17	* This model type is designed to hold data loaded from	17	* This model type is designed to hold data loaded from
18	* "feature.xml" file of an Eclipse feature.	18	* feature.xml file of an Eclipse feature.
19	*/	19	*/
20	public interface IFeatureModel extends IModel, IModelChangeProvider {	20	public interface IFeatureModel extends IModel, IModelChangeProvider {
21	/**	21	/**




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.core.runtime.IPath;
import org.eclipse.pde.core.IEditableModel;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;
import org.osgi.framework.Constants;

	 */
	protected Extensions createExtensions() {
		Extensions extensions = super.createExtensions();
		extensions.setIsFragment(fUnderlyingResource.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR));
		return extensions;
	}






import java.net.URI;
import java.util.*;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.*;
import org.eclipse.jdt.core.*;

public class BundleProjectDescription implements IBundleProjectDescription {

	private IProject fProject;
	private IPath fRoot;
	private String fSymbolicName;
	private String fBundleName;
	private String fBundleVendor;

	private IPackageExportDescription[] fExports;
	private IPath[] fBinIncludes;
	private WorkspacePluginModelBase fModel;
	private IBundleProjectService fService;

	private static final String[] EQUINOX_HEADERS = new String[] {ICoreConstants.ECLIPSE_AUTOSTART, Constants.BUNDLE_ACTIVATIONPOLICY, ICoreConstants.ECLIPSE_LAZYSTART};


	}

	/**
	 * Returns the bundle project service.
	 * 
	 * @return bundle project service
	 */
	IBundleProjectService getBundleProjectService() {
		if (fService == null) {
			fService = (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
		}
		return fService;
	}

	/**
	 * Initialize settings from the given project.
	 * 
	 * @param project project
	 * @exception CoreException if unable to initialize
	 */
	private void initiaize(IProject project) throws CoreException {
		IContainer root = PDEProject.getBundleRoot(project);
		if (root != project) {
			setBundleRoot(root.getProjectRelativePath());
		}
		IPluginModelBase model = PluginRegistry.findModel(project);
		if (model != null) {
			IPluginBase base = model.getPluginBase();

					} catch (BundleException e) {
						throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, e.getMessage(), e));
					}
					setHost(getBundleProjectService().newHost(frag.getPluginId(), getRange(elements[0].getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE))));
				} else {
					setHost(getBundleProjectService().newHost(frag.getPluginId(), getRange(frag.getPluginVersion())));
				}
			}
			if (base instanceof BundlePluginBase) {

						while (iterator.hasNext()) {
							String libName = (String) iterator.next();
							IBundleClasspathEntry[] entries = getClasspathEntries(project, build, libName);
							if (entries != null) {
								for (int i = 0; i < entries.length; i++) {
									collect.add(entries[i]);
								}
							}
						}
						classpath = (IBundleClasspathEntry[]) collect.toArray(new IBundleClasspathEntry[collect.size()]);

						IPackageImportDescription[] imports = new IPackageImportDescription[packages.length];
						for (int i = 0; i < packages.length; i++) {
							ImportPackageObject pkg = packages[i];
							imports[i] = getBundleProjectService().newPackageImport(pkg.getName(), getRange(pkg.getVersion()), pkg.isOptional());
						}
						setPackageImports(imports);
					}

									friends[j] = pfs[j].getName();
								}
							}
							exports[i] = getBundleProjectService().newPackageExport(exp.getName(), getVersion(exp.getVersion()), !exp.isInternal(), friends);
						}
						setPackageExports(exports);
					}

						IRequiredBundleDescription[] req = new IRequiredBundleDescription[bundles.length];
						for (int i = 0; i < bundles.length; i++) {
							RequireBundleObject rb = bundles[i];
							req[i] = getBundleProjectService().newRequiredBundle(rb.getId(), getRange(rb.getVersion()), rb.isOptional(), rb.isReexported());
						}
						setRequiredBundles(req);
					}

				entry = build.getEntry(IBuildEntry.OUTPUT_PREFIX + libraryName);
				if (entry == null) {
					// no source or class file folder
					return new IBundleClasspathEntry[] {getBundleProjectService().newBundleClasspathEntry(null, null, new Path(libraryName))};
				}
				// base the entries on class file folders
				return getClasspathEntries(project, entry, true);

				IPath path = new Path(tokens[i]);
				IBundleClasspathEntry spec = null;
				if (binary) {
					spec = getBundleProjectService().newBundleClasspathEntry(null, path, lib);
				} else {
					IJavaProject jp = JavaCore.create(project);
					IClasspathEntry[] rawClasspath = jp.getRawClasspath();
					IPath output = null;
					if (jp.exists()) {
						IClasspathEntry[] rawClasspath = jp.getRawClasspath();
						for (int j = 0; j < rawClasspath.length; j++) {
							IClasspathEntry cpe = rawClasspath[j];
							if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
								if (cpe.getPath().removeFirstSegments(1).equals(path)) {
									output = cpe.getOutputLocation();
									if (output != null) {
										output = output.removeFirstSegments(1);
									}
									break;
								}
								break;
							}
						}
					}
					spec = getBundleProjectService().newBundleClasspathEntry(path, output, lib);
				}
				bces[i] = spec;
			}

		ProjectModifyOperation operation = new ProjectModifyOperation();
		operation.execute(monitor, this);
		fModel = operation.getModel();
		fService = null;
	}

	/**

		return fBinIncludes;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.core.project.IBundleProjectDescription#setBundleRoot(org.eclipse.core.runtime.IPath)
	 */
	public void setBundleRoot(IPath path) {
		fRoot = path;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.core.project.IBundleProjectDescription#getBundleRoot()
	 */
	public IPath getBundleRoot() {
		return fRoot;
	}

}




/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.core.project;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.osgi.service.resolver.VersionRange;
import org.eclipse.pde.core.project.*;
import org.osgi.framework.Version;

/**
 * Factory class for creating bundle project descriptions and associated artifacts.
 * 
 * @noinstantiate This class is not intended to be instantiated by clients.
 * @since 3.6
 */
public final class BundleProjectService implements IBundleProjectService {

	private static IBundleProjectService fgDefault;

	/**
	 * Returns the bundle project service.
	 * 
	 * @return bundle project service
	 */
	public static synchronized IBundleProjectService getDefault() {
		if (fgDefault == null) {
			fgDefault = new BundleProjectService();
		}
		return fgDefault;
	}

	/**
	 * Constructs a new service.
	 */
	private BundleProjectService() {
	}

	/**
	 * Returns a bundle description for the given project.
	 * If the project does not exist, the description can be used to create
	 * a new bundle project. If the project does exist, the description can be used to
	 * modify a project.
	 *  
	 * @param project project
	 * @return bundle description for the associated project
	 * @exception CoreException if unable to create a description on an existing project
	 */
	public IBundleProjectDescription getDescription(IProject project) throws CoreException {
		return new BundleProjectDescription(project);
	}

	/**
	 * Creates and returns a new host description.
	 * 
	 * @param name symbolic name of the host
	 * @param range version constraint or <code>null</code>
	 * @return host description
	 */
	public IHostDescription newHost(String name, VersionRange range) {
		return new HostDescriptoin(name, range);
	}

	/**
	 * Creates and returns a new package import description.
	 * 
	 * @param name fully qualified name of imported package
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the import is optional
	 * @return package import description
	 */
	public IPackageImportDescription newPackageImport(String name, VersionRange range, boolean optional) {
		return new PackageImportDescription(name, range, optional);
	}

	/**
	 * Constructs a new package export description.
	 * 
	 * @param name fully qualified package name
	 * @param version version or <code>null</code>
	 * @param api whether the package is considered API
	 * @param friends symbolic names of bundles that are friends, or <code>null</code>; when 
	 *  friends are specified the package will not be API
	 * @return package export description
	 */
	public IPackageExportDescription newPackageExport(String name, Version version, boolean api, String[] friends) {
		return new PackageExportDescription(name, version, friends, api);
	}

	/**
	 * Creates and returns a new required bundle description.
	 * 
	 * @param name symbolic name of required bundle
	 * @param range version constraint or <code>null</code>
	 * @param optional whether the required bundle is optional
	 * @param export whether the required bundle is re-exported
	 * @return required bundle description
	 */
	public IRequiredBundleDescription newRequiredBundle(String name, VersionRange range, boolean optional, boolean export) {
		return new RequiredBundleDescription(name, range, export, optional);
	}

	/**
	 * Creates and returns a new bundle classpath entry defining the relationship
	 * between a source, binaries, and library on the Bundle-Classpath header.
	 * <p>
	 * When a source folder is specified, the binary folder defines its output
	 * folder, or may be <code>null</code> to indicate that the project's default output
	 * folder is used by the source folder. When only a binary folder is specified, there
	 * is no source associated with the folder. When no source or binary are specified,
	 * it indicates the library is included in the project as an archive.
	 * </p>
	 * @param sourceFolder source folder or <code>null</code>
	 * @param binaryFolder binary folder or <code>null</code>
	 * @param library associated entry on the Bundle-Classpath header or <code>null</code>
	 * 	to indicate default entry "."
	 */
	public IBundleClasspathEntry newBundleClasspathEntry(IPath sourceFolder, IPath binaryFolder, IPath library) {
		return new BundleClasspathSpecification(sourceFolder, binaryFolder, library);
	}

	/**
	 * Sets the location within the project where the root of the bundle and its associated
	 * artifacts will reside, or <code>null</code> to indicate the default bundle root location
	 * should be used (project folder).
	 * <p>
	 * The bundle root is the folder containing the <code>META-INF/</code> folder. When the bundle
	 * root location is modified, existing bundle artifacts at the old root are not moved or modified.
	 * When creating a new bundle project {@link IBundleProjectDescription#setBundleRoot(IPath)} can 
	 * be used to specify an initial bundle root location. To modify the bundle root location of an
	 * existing project, this method must be used.
	 * </p>
	 * @param project project that must exist and be open
	 * @param bundleRoot project relative path to bundle root artifacts in the project or <code>null</code>
	 * @throws CoreException if setting the root fails
	 */
	public void setBundleRoot(IProject project, IPath bundleRoot) throws CoreException {
		PDEProject.setBundleRoot(project, project.getFolder(bundleRoot));
	}
}




/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.core.project;

import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;
import org.osgi.service.prefs.BackingStoreException;

/**
 * Utility class to resolve plug-in and bundle files relative to a project 
 * specific bundle root location.
 * 
 * @since 3.6
 */
public class PDEProject {

	/**
	 * Preference key for the project relative bundle root path
	 */
	public static final String BUNDLE_ROOT_PATH = "BUNDLE_ROOT_PATH"; //$NON-NLS-1$

	/**
	 * Returns the container in the specified project that corresponds to the
	 * root of bundle related artifacts. May return the project itself
	 * or a folder within the project.
	 * 
	 * @param project project
	 * @return container corresponding to the bundle root
	 */
	public static IContainer getBundleRoot(IProject project) {
		ProjectScope scope = new ProjectScope(project);
		IEclipsePreferences node = scope.getNode(PDECore.PLUGIN_ID);
		if (node != null) {
			String string = node.get(BUNDLE_ROOT_PATH, null);
			if (string != null) {
				IPath path = Path.fromPortableString(string);
				return project.getFolder(path);
			}
		}
		return project;
	}

	/**
	 * Sets the root of the bundle related artifacts in the specified project
	 * to the specified container. When <code>null</code> is specified, the 
	 * bundle root will be the project itself. The container must be within
	 * the specified project.
	 * 
	 * @param project project
	 * @param root project relative bundle root path, or <code>null</code> (or an empty path)
	 *  to indicate the root of the bundle is the root of the project
	 * @exception CoreException if unable to set the bundle root to the specified container
	 */
	public static void setBundleRoot(IProject project, IContainer root) throws CoreException {
		if (root != null && !root.getProject().equals(project)) {
			throw new IllegalArgumentException("root must be contained in the given project"); //$NON-NLS-1$
		}
		ProjectScope scope = new ProjectScope(project);
		IEclipsePreferences node = scope.getNode(PDECore.PLUGIN_ID);
		if (node != null) {
			IPath path = null;
			if (root != null) {
				path = root.getProjectRelativePath();
			}
			if (path != null && path.isEmpty()) {
				path = null;
			}
			String value = null;
			if (path != null) {
				value = path.toPortableString();
			}
			if (value == null) {
				node.remove(BUNDLE_ROOT_PATH);
			} else {
				node.put(BUNDLE_ROOT_PATH, value);
			}
			try {
				node.flush();
				// update model manager
				PDECore.getDefault().getModelManager().bundleRootChanged(project);
			} catch (BackingStoreException e) {
				throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, e.getMessage(), e));
			}
		} else {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, "Failed to retrieve project scope preference settings")); //$NON-NLS-1$
		}
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>MANIFEST.MF</code> file.
	 * 
	 * @param project project
	 * @return <code>MANIFEST.MF</code> file that may or may not exist
	 */
	public static IFile getManifest(IProject project) {
		return getBundleRelativeFile(project, ICoreConstants.MANIFEST_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>build.properties</code>file.
	 * 
	 * @param project project
	 * @return <code>build.properties</code> file that may or may not exist
	 */
	public static IFile getBuildProperties(IProject project) {
		return getBundleRelativeFile(project, ICoreConstants.BUILD_PROPERTIES_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>plugin.xml</code>file.
	 * 
	 * @param project project
	 * @return <code>plugin.xml</code> file that may or may not exist
	 */
	public static IFile getPluginXml(IProject project) {
		return getBundleRelativeFile(project, ICoreConstants.PLUGIN_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>fragment.xml</code>file.
	 * 
	 * @param project project
	 * @return <code>fragment.xml</code> file that may or may not exist
	 */
	public static IFile getFragmentXml(IProject project) {
		return getBundleRelativeFile(project, ICoreConstants.FRAGMENT_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>feature.xml</code>file.
	 * 
	 * @param project project
	 * @return <code>feature.xml</code> file that may or may not exist
	 */
	public static IFile getFeatureXml(IProject project) {
		return getBundleRelativeFile(project, ICoreConstants.FEATURE_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>.options</code>file.
	 * 
	 * @param project project
	 * @return <code>.options</code> file that may or may not exist
	 */
	public static IFile getOptionsFile(IProject project) {
		return getBundleRelativeFile(project, new Path(ICoreConstants.OPTIONS_FILENAME));
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>OSGI-INF/</code>folder.
	 * 
	 * @param project project
	 * @return <code>OSGI-INF/</code> folder that may or may not exist
	 */
	public static IFolder getOSGiInf(IProject project) {
		return getBundleRelativeFolder(project, ICoreConstants.OSGI_INF_PATH);
	}

	/**
	 * Returns the resource in the specified project corresponding to its
	 * <code>META-INF/</code>folder.
	 * 
	 * @param project project
	 * @return <code>META-INF/</code> folder that may or may not exist
	 */
	public static IFolder getMetaInf(IProject project) {
		return getBundleRelativeFolder(project, new Path(ICoreConstants.MANIFEST_FOLDER_NAME));
	}

	/**
	 * Returns a file relative to the bundle root of the specified project.
	 * 
	 * @param project project
	 * @param path bundle root relative path
	 * @return file that may or may not exist
	 */
	public static IFile getBundleRelativeFile(IProject project, IPath path) {
		return getBundleRoot(project).getFile(path);
	}

	/**
	 * Returns a folder relative to the bundle root of the specified project.
	 * 
	 * @param project project
	 * @param path bundle root relative path
	 * @return folder that may or may not exist
	 */
	public static IFolder getBundleRelativeFolder(IProject project, IPath path) {
		return getBundleRoot(project).getFolder(path);
	}

	// TODO: schema folder?

	// TODO: localization file

	// TODO: plugin_customization.ini ?

}

Lines 50-56 Link Here

(-)src/org/eclipse/pde/internal/core/project/ProjectModifyOperation.java (-5 / +18 lines)
50	public void execute(IProgressMonitor monitor, IBundleProjectDescription description) throws CoreException {	50	public void execute(IProgressMonitor monitor, IBundleProjectDescription description) throws CoreException {
51	// retrieve current description of the project to detect differences	51	// retrieve current description of the project to detect differences
52	IProject project = description.getProject();	52	IProject project = description.getProject();
53	IBundleProjectDescription before = Factory.getDescription(project);	53	IBundleProjectService service = (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
		54	IBundleProjectDescription before = service.getDescription(project);
		55	boolean considerRoot = !project.exists();
54	String taskName = null;	56	String taskName = null;
55	if (project.exists()) {	57	if (project.exists()) {
56	taskName = Messages.ProjectModifyOperation_0;	58	taskName = Messages.ProjectModifyOperation_0;
Lines 65-71 Link Here
65	}	67	}
66	}	68	}
67	SubMonitor sub = SubMonitor.convert(monitor, taskName, 6);	69	SubMonitor sub = SubMonitor.convert(monitor, taskName, 6);
		70	// create and open project
68	createProject(description);	71	createProject(description);
		72	// set bundle root for new projects
		73	if (considerRoot) {
		74	IFolder folder = null;
		75	IPath root = description.getBundleRoot();
		76	if (root != null && !root.isEmpty()) {
		77	folder = project.getFolder(root);
		78	CoreUtility.createFolder(folder);
		79	}
		80	PDEProject.setBundleRoot(project, folder);
		81	}
69	sub.worked(1);	82	sub.worked(1);
70	configureNatures(description);	83	configureNatures(description);
71	sub.worked(1);	84	sub.worked(1);
Lines 286-296 Link Here
286	*/	299	*/
287	private void configureManifest(IBundleProjectDescription description, IBundleProjectDescription before) throws CoreException {	300	private void configureManifest(IBundleProjectDescription description, IBundleProjectDescription before) throws CoreException {
288	IProject project = description.getProject();	301	IProject project = description.getProject();
289	IFile manifest = project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);	302	IFile manifest = PDEProject.getManifest(project);
290	if (description.getHost() == null) {	303	if (description.getHost() == null) {
291	fModel = new WorkspaceBundlePluginModel(manifest, project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));	304	fModel = new WorkspaceBundlePluginModel(manifest, PDEProject.getPluginXml(project));
292	} else {	305	} else {
293	fModel = new WorkspaceBundleFragmentModel(manifest, project.getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR));	306	fModel = new WorkspaceBundleFragmentModel(manifest, PDEProject.getFragmentXml(project));
294	}	307	}
295		308
296	IPluginBase pluginBase = fModel.getPluginBase();	309	IPluginBase pluginBase = fModel.getPluginBase();
Lines 585-591 Link Here
585		598
586	private void configureBuildPropertiesFile(IBundleProjectDescription description, IBundleProjectDescription before) throws CoreException {	599	private void configureBuildPropertiesFile(IBundleProjectDescription description, IBundleProjectDescription before) throws CoreException {
587	IProject project = description.getProject();	600	IProject project = description.getProject();
588	IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);	601	IFile file = PDEProject.getBuildProperties(project);
589	WorkspaceBuildModel model = new WorkspaceBuildModel(file);	602	WorkspaceBuildModel model = new WorkspaceBuildModel(file);
590	IBuildModelFactory factory = model.getFactory();	603	IBuildModelFactory factory = model.getFactory();
591		604




/*******************************************************************************
 * Copyright (c) 2009, 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.core.target;

import java.io.File;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.build.site.PluginPathFinder;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.ifeature.*;
import org.eclipse.pde.internal.core.target.provisional.*;

/**
 * A container of the bundles contained in a feature.
 * 
 * @since 3.5
 */
public class FeatureBundleContainer extends AbstractBundleContainer {

	/**
	 * Constant describing the type of bundle container 
	 */
	public static final String TYPE = "Feature"; //$NON-NLS-1$

	/**
	 * Feature symbolic name 
	 */
	private String fId;

	/**
	 * Feature version or <code>null</code>
	 */
	private String fVersion;

	/**
	 * Install location which may contain string substitution variables
	 */
	private String fHome;

	/**
	 * Constructs a new feature bundle container for the feature at the specified
	 * location. Plug-ins are resolved in the plug-ins directory of the given home
	 * directory. When version is unspecified, the most recent version is used.
	 * 
	 * @param home root directory containing the features directory which
	 *  may contain string substitution variables
	 * @param name feature symbolic name
	 * @param version feature version, or <code>null</code> if unspecified
	 */
	FeatureBundleContainer(String home, String name, String version) {
		fId = name;
		fVersion = version;
		fHome = home;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getLocation(boolean)
	 */
	public String getLocation(boolean resolve) throws CoreException {
		if (resolve) {
			return resolveHomeLocation().toOSString();
		}
		return fHome;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#getType()
	 */
	public String getType() {
		return TYPE;
	}

	/**
	 * Returns the symbolic name of the feature this bundle container resolves from
	 * 
	 * @return string feature id (symbolic name)
	 */
	public String getFeatureId() {
		return fId;
	}

	/**
	 * Returns the version of the feature this bundle container resolves from if
	 * a version was specified.
	 * 
	 * @return string feature version or <code>null</code>
	 */
	public String getFeatureVersion() {
		return fVersion;
	}

	/**
	 * Returns the home location with all variables resolved as a path.
	 * 
	 * @return resolved home location
	 * @throws CoreException
	 */
	private IPath resolveHomeLocation() throws CoreException {
		return new Path(resolveVariables(fHome));
	}

	/**
	 * Resolves and returns the directory containing the feature.
	 * 
	 * @return feature directory
	 * @throws CoreException if unable to resolve
	 */
	private File resolveFeatureLocation() throws CoreException {
		IPath home = resolveHomeLocation();
		File[] featurePaths = PluginPathFinder.getFeaturePaths(home.toOSString());
		if (featurePaths.length == 0) {
			// no features are included with the install/home location
			IPath path = home.append("features"); //$NON-NLS-1$
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_0, path.toOSString())));
		}
		// if a specific version is specified, find it
		if (fVersion != null) {
			StringBuffer buf = new StringBuffer();
			String name = buf.append(fId).append("_").append(fVersion).toString(); //$NON-NLS-1$
			for (int i = 0; i < featurePaths.length; i++) {
				File feature = featurePaths[i];
				if (feature.getName().equals(name)) {
					return feature;
				}
			}
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_1, fId)));
		}
		// use most recent version
		List versions = new ArrayList();
		StringBuffer buf = new StringBuffer();
		String prefix = buf.append(fId).append("_").toString(); //$NON-NLS-1$
		for (int i = 0; i < featurePaths.length; i++) {
			String name = featurePaths[i].getName();
			if (name.startsWith(prefix)) {
				versions.add(featurePaths[i]);
			}
		}
		if (versions.isEmpty()) {
			throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_1, fId)));
		}
		Collections.sort(versions, new Comparator() {
			public int compare(Object o1, Object o2) {
				return ((File) o1).getName().compareTo(((File) o2).getName());
			}
		});
		return (File) versions.get(versions.size() - 1);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#resolveBundles(org.eclipse.pde.internal.core.target.provisional.ITargetDefinition, org.eclipse.core.runtime.IProgressMonitor)
	 */
	protected IResolvedBundle[] resolveBundles(ITargetDefinition definition, IProgressMonitor monitor) throws CoreException {
		IFeatureModel model = null;
		try {
			if (monitor.isCanceled()) {
				return new IResolvedBundle[0];
			}
			File location = resolveFeatureLocation();
			File manifest = new File(location, ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
			if (!manifest.exists() || !manifest.isFile()) {
				throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_2, fId)));
			}
			model = ExternalFeatureModelManager.createModel(manifest);
			if (model == null || !model.isLoaded()) {
				throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_2, fId)));
			}
			// search bundles in plug-ins directory
			ITargetPlatformService service = (ITargetPlatformService) PDECore.getDefault().acquireService(ITargetPlatformService.class.getName());
			if (service == null) {
				throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, Messages.FeatureBundleContainer_4));
			}
			File dir = new File(manifest.getParentFile().getParentFile().getParentFile(), "plugins"); //$NON-NLS-1$
			if (!dir.exists() || !dir.isDirectory()) {
				throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, NLS.bind(Messages.FeatureBundleContainer_5, fId)));
			}
			if (monitor.isCanceled()) {
				return new IResolvedBundle[0];
			}

			IBundleContainer container = service.newDirectoryContainer(dir.getAbsolutePath());
			container.resolve(definition, monitor);
			IResolvedBundle[] bundles = container.getBundles();
			IFeature feature = model.getFeature();
			IFeaturePlugin[] plugins = feature.getPlugins();
			List matchInfos = new ArrayList(plugins.length);
			for (int i = 0; i < plugins.length; i++) {
				if (monitor.isCanceled()) {
					return new IResolvedBundle[0];
				}
				IFeaturePlugin plugin = plugins[i];
				// only include if plug-in matches environment
				if (isMatch(definition.getArch(), plugin.getArch(), Platform.getOSArch()) && isMatch(definition.getNL(), plugin.getNL(), Platform.getNL()) && isMatch(definition.getOS(), plugin.getOS(), Platform.getOS()) && isMatch(definition.getWS(), plugin.getWS(), Platform.getWS())) {
					matchInfos.add(new BundleInfo(plugin.getId(), plugin.getVersion(), null, BundleInfo.NO_LEVEL, false));
				}
			}

			// Because we used the directory container to get our bundles, we need to replace their parent
			for (int i = 0; i < bundles.length; i++) {
				bundles[i].setParentContainer(this);
			}
			return AbstractBundleContainer.getMatchingBundles(bundles, (BundleInfo[]) matchInfos.toArray(new BundleInfo[matchInfos.size()]), null, this);
		} finally {
			if (model != null) {
				model.dispose();
			}
		}
	}

	/**
	 * Returns whether the given target environment setting matches that of a fragments.
	 * 
	 * @param targetValue value in target definition
	 * @param fragmentValue value in fragment
	 * @param runningValue value of current running platform
	 * @return whether the fragment should be considered
	 */
	private boolean isMatch(String targetValue, String fragmentValue, String runningValue) {
		if (fragmentValue == null) {
			// unspecified, so it is a match
			return true;
		}
		if (targetValue == null) {
			return runningValue.equals(fragmentValue);
		}
		return targetValue.equals(fragmentValue);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer#isContentEqual(org.eclipse.pde.internal.core.target.impl.AbstractBundleContainer)
	 */
	public boolean isContentEqual(AbstractBundleContainer container) {
		if (container instanceof FeatureBundleContainer) {
			FeatureBundleContainer fbc = (FeatureBundleContainer) container;
			return fHome.equals(fbc.fHome) && fId.equals(fbc.fId) && isNullOrEqual(fVersion, fVersion) && super.isContentEqual(container);
		}
		return false;
	}

	private boolean isNullOrEqual(Object o1, Object o2) {
		if (o1 == null) {
			return o2 == null;
		}
		if (o2 == null) {
			return false;
		}
		return o1.equals(o2);
	}

	/* (non-Javadoc)
	 * @see java.lang.Object#toString()
	 */
	public String toString() {
		return new StringBuffer().append("Feature ").append(fId).append(' ').append(fVersion).append(' ').append(fHome).append(' ').append(getIncludedBundles() == null ? "All" : Integer.toString(getIncludedBundles().length)).append(" included").toString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
	}

	/* (non-Javadoc)
	 * @see org.eclipse.pde.internal.core.target.provisional.IBundleContainer#getVMArguments()
	 */
	public String[] getVMArguments() {
		return null;
	}
}
}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/util/ManifestUtils.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2008 IBM Corporation and others.	2	* Copyright (c) 2006, 2010 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 18-23 Link Here
18	import org.eclipse.pde.core.build.IBuildEntry;	18	import org.eclipse.pde.core.build.IBuildEntry;
19	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	19	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
20	import org.eclipse.pde.internal.core.ibundle.IManifestHeader;	20	import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
		21	import org.eclipse.pde.internal.core.project.PDEProject;
21		22
22	public class ManifestUtils {	23	public class ManifestUtils {
23		24
Lines 74-80 Link Here
74	}	75	}
75		76
76	public final static IBuild getBuild(IProject project) {	77	public final static IBuild getBuild(IProject project) {
77	IFile buildProps = project.getFile("build.properties"); //$NON-NLS-1$	78	IFile buildProps = PDEProject.getBuildProperties(project);
78	if (buildProps.exists()) {	79	if (buildProps.exists()) {
79	WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);	80	WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);
80	if (model != null)	81	if (model != null)

Lines 13-23 Link Here

(-)text/org/eclipse/pde/internal/core/text/build/BuildEntry.java (-3 / +61 lines)
13	import java.io.PrintWriter;	13	import java.io.PrintWriter;
14	import java.util.ArrayList;	14	import java.util.ArrayList;
15	import java.util.StringTokenizer;	15	import java.util.StringTokenizer;
16	import org.eclipse.core.runtime.CoreException;	16	import org.eclipse.core.resources.*;
		17	import org.eclipse.core.runtime.*;
17	import org.eclipse.jface.text.IDocument;	18	import org.eclipse.jface.text.IDocument;
18	import org.eclipse.jface.text.TextUtilities;	19	import org.eclipse.jface.text.TextUtilities;
19	import org.eclipse.pde.core.build.*;	20	import org.eclipse.pde.core.build.*;
20	import org.eclipse.pde.internal.core.PDECore;	21	import org.eclipse.pde.internal.core.PDECore;
		22	import org.eclipse.pde.internal.core.project.PDEProject;
21	import org.eclipse.pde.internal.core.text.IDocumentKey;	23	import org.eclipse.pde.internal.core.text.IDocumentKey;
22	import org.eclipse.pde.internal.core.text.IEditingModel;	24	import org.eclipse.pde.internal.core.text.IEditingModel;
23	import org.eclipse.pde.internal.core.util.PropertiesUtil;	25	import org.eclipse.pde.internal.core.util.PropertiesUtil;
Lines 155-162 Link Here
155		157
156	public void processEntry(String value) {	158	public void processEntry(String value) {
157	StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$	159	StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$
		160	IPath root = getRootPath();
158	while (stok.hasMoreTokens()) {	161	while (stok.hasMoreTokens()) {
159	fTokens.add(stok.nextToken().trim());	162	String token = stok.nextToken().trim();
		163	token = fromRelative(token, root);
		164	fTokens.add(token);
160	}	165	}
161	}	166	}
162		167
Lines 168-175 Link Here
168	buffer.append(PropertiesUtil.createWritableName(fName));	173	buffer.append(PropertiesUtil.createWritableName(fName));
169	buffer.append(" = "); //$NON-NLS-1$	174	buffer.append(" = "); //$NON-NLS-1$
170	int indentLength = fName.length() + 3;	175	int indentLength = fName.length() + 3;
		176	IPath rootPath = getRootPath();
171	for (int i = 0; i < fTokens.size(); i++) {	177	for (int i = 0; i < fTokens.size(); i++) {
172	buffer.append(PropertiesUtil.createEscapedValue(fTokens.get(i).toString()));	178	String token = fTokens.get(i).toString();
		179	token = toRelative(token, rootPath);
		180	buffer.append(PropertiesUtil.createEscapedValue(token));
173	if (i < fTokens.size() - 1) {	181	if (i < fTokens.size() - 1) {
174	buffer.append(",\\"); //$NON-NLS-1$	182	buffer.append(",\\"); //$NON-NLS-1$
175	buffer.append(fLineDelimiter);	183	buffer.append(fLineDelimiter);
Lines 272-275 Link Here
272	getModel().fireModelObjectChanged(this, getName(), null, token);	280	getModel().fireModelObjectChanged(this, getName(), null, token);
273	}	281	}
274		282
		283	/**
		284	* Returns the path that this entries tokens are relative to, or <code>null</code> if none.
		285	*
		286	* @return relative root path, or <code>null</code>
		287	*/
		288	IPath getRootPath() {
		289	if (fName.startsWith(IBuildEntry.JAR_PREFIX) \|\| fName.startsWith(IBuildEntry.OUTPUT_PREFIX)) {
		290	IResource resource = getModel().getUnderlyingResource();
		291	if (resource != null) {
		292	IProject project = resource.getProject();
		293	if (project != null) {
		294	IContainer root = PDEProject.getBundleRoot(project);
		295	if (root != null && !root.equals(project)) {
		296	// translation required for source. and output. entries
		297	return root.getProjectRelativePath();
		298	}
		299	}
		300	}
		301	}
		302	return null;
		303	}
		304
		305	/**
		306	* Makes the token a bundle root relative path
		307	*
		308	* @param token token
		309	* @param root bundle root path
		310	* @return bundle relative token
		311	*/
		312	String toRelative(String token, IPath root) {
		313	if (root == null) {
		314	return token;
		315	}
		316	return (new Path(token)).makeRelativeTo(root).toPortableString();
		317	}
		318
		319	/**
		320	* Makes the token a project relative path
		321	*
		322	* @param token token
		323	* @param root bundle root path
		324	* @return project relative token
		325	*/
		326	String fromRelative(String token, IPath root) {
		327	if (root == null) {
		328	return token;
		329	}
		330	return root.append(new Path(token)).toPortableString();
		331	}
		332
275	}	333	}




/*******************************************************************************
 * Copyright (c) 2008, 2010 Code 9 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

 *     Code 9 Corporation - initial API and implementation
 *     Chris Aniszczyk <caniszczyk@gmail.com>
 *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
 *     IBM - ongoing maintenance
 *******************************************************************************/
package org.eclipse.pde.internal.ds.ui.wizards;


import org.eclipse.pde.core.build.IBuildEntry;
import org.eclipse.pde.core.build.IBuildModel;
import org.eclipse.pde.core.build.IBuildModelFactory;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.ibundle.IBundleModel;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ds.core.IDSComponent;
import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;

	private void writeBuildProperties(final IProject project,
			SubProgressMonitor monitor) {

		PDEModelUtility.modifyModel(new ModelModification(PDEProject
				.getBuildProperties(project)) {
			protected void modifyModel(IBaseModel model,
					IProgressMonitor monitor) throws CoreException {
				if (!(model instanceof IBuildModel))
					return;
				IFile file = PDEProject.getBuildProperties(project);
				if (file.exists()) {
					WorkspaceBuildModel wbm = new WorkspaceBuildModel(file);
					wbm.load();




/*******************************************************************************
 * Copyright (c) 2008, 2010 Code 9 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

 *     Code 9 Corporation - initial API and implementation
 *     Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
 *     Simon Archer <sarcher@us.ibm.com> - bug 248519
 *     IBM - ongoing maintenance
 *******************************************************************************/
package org.eclipse.pde.internal.ds.ui.wizards;


import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ds.ui.Activator;
import org.eclipse.pde.internal.ds.ui.Messages;
import org.eclipse.pde.internal.ds.ui.SWTUtil;
import org.eclipse.pde.internal.ds.ui.SharedImages;
import org.eclipse.pde.internal.ui.util.PDEModelUtility;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;

		try {
			if (project.hasNature(PDE.PLUGIN_NATURE)) {
				WorkspaceBundlePluginModel model = new WorkspaceBundlePluginModel(
						PDEProject.getManifest(project),
						null);
				model.load();
				String header = model.getBundleModel().getBundle().getHeader(
						Constants.BUNDLE_SYMBOLICNAME);




/*******************************************************************************
 * Copyright (c) 2003, 2010 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.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.launching.IPDEConstants;
import org.eclipse.pde.internal.launching.PDELaunchingPlugin;

					}
				}
			}
			IFile[] otherFiles = new IFile[] {PDEProject.getManifest(project), PDEProject.getBuildProperties(project)};
			for (int i = 0; i < otherFiles.length; i++) {
				IFile file = otherFiles[i];
				if (file != null) {
					long fileTimeStamp = file.getRawLocation().toFile().lastModified();
					if (timeStamp < fileTimeStamp)




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.osgi.util.NLS;
import org.eclipse.pde.core.IBaseModel;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDEManager;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;

		IFile file = ((IFile) marker.getResource());
		ModelModification modification = null;
		// if file we are externalizing is not manifest, try to pass manifest in if it exists
		if (!file.getName().equals(ICoreConstants.MANIFEST_FILENAME)) {
			IFile manifest = PDEProject.getManifest(file.getProject());
			if (manifest.exists()) {
				modification = new ModelModification(manifest, file) {
					protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {




/*******************************************************************************
 * Copyright (c) 2008, 2010 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.pde.core.IBaseModel;
import org.eclipse.pde.core.plugin.IPluginImport;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.bundle.*;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.util.ModelModification;

		 * @see org.eclipse.pde.internal.ui.correction.java.JavaResolutionFactory.AbstractManifestChange#getModifiedElement()
		 */
		public Object getModifiedElement() {
			IFile[] files = new IFile[] {PDEProject.getManifest(getProject()), PDEProject.getPluginXml(getProject())};
			for (int i = 0; i < files.length; i++) {
				if (files[i].exists())
					return files[i];
					return file;
			}
			return super.getModifiedElement();
		}

		 * @see org.eclipse.pde.internal.ui.correction.java.JavaResolutionFactory.AbstractManifestChange#getModifiedElement()
		 */
		public Object getModifiedElement() {
			IFile file = PDEProject.getManifest(getProject());
			if (file.exists())
				return file;
			return super.getModifiedElement();

		 * @see org.eclipse.pde.internal.ui.correction.java.JavaResolutionFactory.AbstractManifestChange#getModifiedElement()
		 */
		public Object getModifiedElement() {
			IFile file = PDEProject.getManifest(getProject());
			if (file.exists())
				return file;
			return super.getModifiedElement();




/*******************************************************************************
 *  Copyright (c) 2006, 2010 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.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.WorkspaceModelManager;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.ui.*;

						Iterator it = projects.iterator();
						while (it.hasNext()) {
							IProject project = (IProject) it.next();
							IFile file = PDEProject.getManifest(project);
							if (file == null || !file.exists())
								file = PDEProject.getPluginXml(project);
							if (file == null || !file.exists())
								file = PDEProject.getFragmentXml(project);
							if (file == null || !file.exists())
								MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.OpenManifestsAction_title, NLS.bind(PDEUIMessages.OpenManifestsAction_cannotFind, project.getName()));
							else





	protected void handleBuildCheckStateChange(boolean wasTopParentChecked) {
		IResource resource = fParentResource;
		String resourceName = fParentResource.getProjectRelativePath().makeRelativeTo(fBundleRoot.getProjectRelativePath()).toPortableString();
		IBuild build = fBuildModel.getBuild();
		IBuildEntry includes = build.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
		IBuildEntry excludes = build.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);

					if (event.getNewValue().equals(".")) //$NON-NLS-1$
						return;
					// adding token
					IFile file = fBundleRoot.getFile(new Path(event.getNewValue().toString()));
					if (!file.exists())
						return;
					fParentResource = fOriginalResource = file;

					if (event.getOldValue().equals(".")) //$NON-NLS-1$
						return;
					// removing token
					IFile file = fBundleRoot.getFile(new Path(event.getOldValue().toString()));
					if (!file.exists())
						return;
					fParentResource = fOriginalResource = file;





import java.util.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.action.*;
import org.eclipse.jface.viewers.*;
import org.eclipse.pde.core.IModelChangedEvent;
import org.eclipse.pde.core.IModelChangedListener;
import org.eclipse.pde.core.build.*;
import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.pde.internal.ui.editor.context.InputContext;


	protected CheckboxTreeViewer fTreeViewer;
	private boolean fDoRefresh = false;
	protected IContainer fBundleRoot;
	protected IBuildModel fBuildModel;
	protected IResource fOriginalResource, fParentResource;
	protected boolean isChecked;

	public class TreeContentProvider extends DefaultContentProvider implements ITreeContentProvider {

		public Object[] getElements(Object parent) {
			if (parent instanceof IContainer) {
				try {
					return ((IContainer) parent).members();
				} catch (CoreException e) {
					PDEPlugin.logException(e);
				}

		Composite container = createClientContainer(section, 2, toolkit);
		fBuildModel = getBuildModel();
		if (fBuildModel.getUnderlyingResource() != null)
			fBundleRoot = PDEProject.getBundleRoot(fBuildModel.getUnderlyingResource().getProject());

		fTreeViewer = new CheckboxTreeViewer(toolkit.createTree(container, SWT.CHECK));
		fTreeViewer.setContentProvider(new TreeContentProvider());


	protected IResource handleAllUnselected(IResource resource, String name) {
		IResource parent = resource.getParent();
		if (parent.equals(fBundleRoot)) {
			return resource;
		}
		try {

							return;
						Vector fileExt = new Vector();
						String[] inclTokens, exclTokens = new String[0];
						if (fBundleRoot == null || includes == null)
							return;
						inclTokens = includes.getTokens();
						if (excludes != null)

							if (resource.equals(".") || resource.equals("./") || resource.equals(".\\")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
								// ignore - should be root directory
							} else if (resource.lastIndexOf(IPath.SEPARATOR) == resource.length() - 1) {
								IFolder folder = fBundleRoot.getFolder(new Path(resource));
								if (!folder.exists())
									continue;
								fTreeViewer.setSubtreeChecked(folder, isIncluded);

								if (isIncluded)
									fileExt.add(resource.substring(2));
							} else {
								IFile file = fBundleRoot.getFile(new Path(resource));
								if (!file.exists())
									continue;
								fTreeViewer.setChecked(file, isIncluded);

						if (fileExt.size() == 0)
							return;
						try {
							IResource[] members = fBundleRoot.members();
							for (int i = 0; i < members.length; i++) {
								if (!(members[i] instanceof IFolder) && (fileExt.contains(members[i].getFileExtension()))) {
									fTreeViewer.setChecked(members[i], includes.contains("*." //$NON-NLS-1$

				if (includes.contains(resourceName))
					includes.removeToken(resourceName);
				if (includes.contains("*." + resource.getFileExtension())) { //$NON-NLS-1$
					IResource[] members = fBundleRoot.members();
					for (int i = 0; i < members.length; i++) {
						if (!(members[i] instanceof IFolder) && !members[i].getName().equals(resource.getName()) && (resource.getFileExtension().equals(members[i].getFileExtension()))) {
							includes.addToken(members[i].getName());

								&& libraries.length != 0) {
							for (int j = 0; j < libraries.length; j++) {
								String libName = libraries[j].getName().substring(7);
								IPath path = fBundleRoot.getFile(new Path(libName)).getProjectRelativePath().makeRelativeTo(fBundleRoot.getProjectRelativePath());
								if (path.segmentCount() == 1 && !includes.contains(libName) && !libName.equals(resource.getName()))
									includes.addToken(libName);
							}

	public void initialize() {
		if (fTreeViewer.getInput() == null) {
			fTreeViewer.setUseHashlookup(true);
			fTreeViewer.setInput(fBundleRoot);
		}
		fBuildModel.addModelChangedListener(this);
	}

Lines 54-60 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/build/SrcSection.java (-1 / +1 lines)
54		54
55	protected void handleBuildCheckStateChange(boolean wasTopParentChecked) {	55	protected void handleBuildCheckStateChange(boolean wasTopParentChecked) {
56	IResource resource = fParentResource;	56	IResource resource = fParentResource;
57	String resourceName = fParentResource.getFullPath().removeFirstSegments(1).toString();	57	String resourceName = fParentResource.getProjectRelativePath().makeRelativeTo(fBundleRoot.getProjectRelativePath()).toPortableString();
58	IBuild build = fBuildModel.getBuild();	58	IBuild build = fBuildModel.getBuild();
59	IBuildEntry includes = build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);	59	IBuildEntry includes = build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);
60	IBuildEntry excludes = build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);	60	IBuildEntry excludes = build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.build.IBuildObject;
import org.eclipse.pde.internal.core.ifeature.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.*;
import org.eclipse.pde.internal.ui.editor.build.*;

				if (resource != null)
					input = new FileEditorInput((IFile) resource);
				else {
					File file = new File(model.getInstallLocation(), ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
					IFileStore store = EFS.getStore(file.toURI());
					input = new FileStoreEditorInput(store);
				}

		IFile featureFile = null;

		String name = file.getName().toLowerCase(Locale.ENGLISH);
		if (name.equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
			featureFile = file;
			buildFile = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
		} else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			buildFile = file;
			featureFile = createFeatureFile(project);
		}

		if (fInputContextManager == null)
			return;
		String name = file.getName();
		if (name.equalsIgnoreCase(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
			/*
			 * IEditorInput in = new FileEditorInput(file);
			 * inputContextManager.putContext(in, new FeatureInputContext(this,
			 * in, false));
			 */
		} else if (name.equalsIgnoreCase(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			if (!fInputContextManager.hasContext(BuildInputContext.CONTEXT_ID)) {
				IEditorInput in = new FileEditorInput(file);
				fInputContextManager.putContext(in, new BuildInputContext(this, in, false));

		File buildFile = null;
		File featureFile = null;
		String name = file.getName().toLowerCase(Locale.ENGLISH);
		if (name.equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
			featureFile = file;
			File dir = file.getParentFile();
			buildFile = new File(dir, ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
		} else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			buildFile = file;
			File dir = file.getParentFile();
			featureFile = createFeatureFile(dir);

	}

	private File createFeatureFile(File dir) {
		File pluginFile = new File(dir, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
		return pluginFile;
	}

	private IFile createFeatureFile(IProject project) {
		return PDEProject.getFeatureXml(project);
		return featureFile;
	}

	protected void createStorageContexts(InputContextManager manager, IStorageEditorInput input) {
		String name = input.getName().toLowerCase(Locale.ENGLISH);
		if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			manager.putContext(input, new BuildInputContext(this, input, true));
		} else if (name.startsWith(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
			manager.putContext(input, new FeatureInputContext(this, input, true));
		}
	}


	public void showEditorInput(IEditorInput editorInput) {
		String name = editorInput.getName();
		if (name.equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
			setActivePage(0);
		} else {
			setActivePage(getPageCount() - 3);




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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

package org.eclipse.pde.internal.ui.editor.feature;

import org.eclipse.core.resources.IFile;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.ui.*;
import org.eclipse.ui.ide.ResourceUtil;

public class FeatureEditorMatchingStrategy implements IEditorMatchingStrategy {

	private static final String BP = "build.properties"; //$NON-NLS-1$
	private static final String FX = "feature.xml"; //$NON-NLS-1$

	public boolean matches(IEditorReference editorRef, IEditorInput input) {
		if (!(input instanceof IFileEditorInput))
			return false;

				return false;
			// build.properties matches with editors that have a feature.xml file
			// as their input and that feature.xml is at the root
			if (inputFile.getName().equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR)) {
				if (currInputFile.getName().equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR))
					return inputFile.getProjectRelativePath().toString().equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
				return inputFile.equals(currInputFile);
			} else if (inputFile.getName().equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
				if (currInputFile.getName().equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR))
					return currInputFile.getProjectRelativePath().toString().equals(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
				return inputFile.equals(currInputFile);
			}
			return false;




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.text.*;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ClasspathHelper;
import org.eclipse.pde.internal.core.TargetPlatformHelper;
import org.eclipse.pde.internal.core.converter.PDEPluginConverter;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.text.edits.*;

public class CreateManifestOperation implements IRunnableWithProgress {


	private void trimOldManifest() throws BadLocationException, CoreException {
		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
		IProject project = fModel.getUnderlyingResource().getProject();
		IFile file = fModel.isFragmentModel() ? PDEProject.getFragmentXml(project) : PDEProject.getPluginXml(project);
		try {
			manager.connect(file.getFullPath(), LocationKind.NORMALIZE, null);
			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath(), LocationKind.NORMALIZE);

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/editor/plugin/DependencyManagementSection.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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-36 Link Here
31	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	31	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
32	import org.eclipse.pde.internal.core.plugin.ExternalPluginModel;	32	import org.eclipse.pde.internal.core.plugin.ExternalPluginModel;
33	import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;	33	import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
		34	import org.eclipse.pde.internal.core.project.PDEProject;
34	import org.eclipse.pde.internal.core.text.build.BuildEntry;	35	import org.eclipse.pde.internal.core.text.build.BuildEntry;
35	import org.eclipse.pde.internal.launching.ILaunchingPreferenceConstants;	36	import org.eclipse.pde.internal.launching.ILaunchingPreferenceConstants;
36	import org.eclipse.pde.internal.launching.PDELaunchingPlugin;	37	import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
Lines 339-345 Link Here
339	InputContext context = getPage().getPDEEditor().getContextManager().findContext(BuildInputContext.CONTEXT_ID);	340	InputContext context = getPage().getPDEEditor().getContextManager().findContext(BuildInputContext.CONTEXT_ID);
340	if (context == null) {	341	if (context == null) {
341	if (createIfMissing) {	342	if (createIfMissing) {
342	IFile buildFile = getPage().getPDEEditor().getCommonProject().getFile("build.properties"); //$NON-NLS-1$	343	IFile buildFile = PDEProject.getBuildProperties(getPage().getPDEEditor().getCommonProject());
343	try {	344	try {
344	buildFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());	345	buildFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
345	} catch (CoreException e) {	346	} catch (CoreException e) {




/*******************************************************************************
 *  Copyright (c) 2000, 2010 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.pde.internal.core.build.IBuildObject;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;
import org.eclipse.pde.internal.core.plugin.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.editor.*;

		boolean fragment = false;

		String name = file.getName().toLowerCase(Locale.ENGLISH);
		if (name.equals(ICoreConstants.MANIFEST_FILENAME_LOWER_CASE)) {
			if (container instanceof IFolder)
				container = container.getParent();
			manifestFile = file;
			buildFile = container.getFile(ICoreConstants.BUILD_PROPERTIES_PATH);
			pluginFile = createPluginFile(container);
		} else if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			pluginFile = file;
			fragment = name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR);
			buildFile = container.getFile(ICoreConstants.BUILD_PROPERTIES_PATH);
			manifestFile = container.getFile(ICoreConstants.MANIFEST_PATH);
		}

		if (fInputContextManager == null)
			return;
		String name = file.getName();
		if (name.equalsIgnoreCase(ICoreConstants.MANIFEST_FILENAME)) {
			if (!fInputContextManager.hasContext(BundleInputContext.CONTEXT_ID)) {
				IEditorInput in = new FileEditorInput(file);
				fInputContextManager.putContext(in, new BundleInputContext(this, in, false));
			}
		} else if (name.equalsIgnoreCase(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR)) {
			if (!fInputContextManager.hasContext(PluginInputContext.CONTEXT_ID)) {
				IEditorInput in = new FileEditorInput(file);
				fInputContextManager.putContext(in, new PluginInputContext(this, in, false, false));
			}
		} else if (name.equalsIgnoreCase(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			if (!fInputContextManager.hasContext(PluginInputContext.CONTEXT_ID)) {
				IEditorInput in = new FileEditorInput(file);
				fInputContextManager.putContext(in, new PluginInputContext(this, in, false, true));
			}
		} else if (name.equalsIgnoreCase(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			if (!fInputContextManager.hasContext(BuildInputContext.CONTEXT_ID)) {
				IEditorInput in = new FileEditorInput(file);
				fInputContextManager.putContext(in, new BuildInputContext(this, in, false));

		if (fInputContextManager.hasContext(PluginInputContext.CONTEXT_ID))
			return;
		IProject project = fInputContextManager.getCommonProject();
		WorkspacePluginModelBase model = null;
		IFile file = null;
		if (fInputContextManager.getAggregateModel() instanceof IFragmentModel) {
			file = PDEProject.getFragmentXml(project);
			model = new WorkspaceFragmentModel(file, false);
		} else {
			file = PDEProject.getPluginXml(project);
			model = new WorkspacePluginModel(file, false);
		}

		IPluginBase pluginBase = model.getPluginBase(true);
		try {

		IEditorInput in = new FileEditorInput(file);
		fInputContextManager.putContext(in, new PluginInputContext(this, in, false, false));

		updateBuildProperties(file.getName());
	}

	private void updateBuildProperties(String filename) {

		File buildFile = null;
		File pluginFile = null;
		String name = file.getName().toLowerCase(Locale.ENGLISH);
		if (name.equals(ICoreConstants.MANIFEST_FILENAME_LOWER_CASE)) {
			manifestFile = file;
			File dir = file.getParentFile().getParentFile();
			buildFile = new File(dir, ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
			pluginFile = createPluginFile(dir);
		} else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			buildFile = file;
			File dir = file.getParentFile();
			pluginFile = createPluginFile(dir);
			manifestFile = new File(dir, ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);
		} else if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			pluginFile = file;
			File dir = file.getParentFile();
			buildFile = new File(dir, ICoreConstants.BUILD_FILENAME_DESCRIPTOR);

			if (pluginFile.exists()) {
				IFileStore store = EFS.getStore(pluginFile.toURI());
				IEditorInput in = new FileStoreEditorInput(store);
				manager.putContext(in, new PluginInputContext(this, in, file == pluginFile, name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)));
			}
			if (buildFile.exists()) {
				IFileStore store = EFS.getStore(buildFile.toURI());

		}

		String name = input.getName().toLowerCase(Locale.ENGLISH);
		if (name.startsWith(ICoreConstants.MANIFEST_FILENAME_LOWER_CASE)) {
			manager.putContext(input, new BundleInputContext(this, input, true));
		} else if (name.startsWith(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			manager.putContext(input, new BuildInputContext(this, input, true));
		} else if (name.startsWith(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR)) {
			manager.putContext(input, new PluginInputContext(this, input, true, false));
		} else if (name.startsWith(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			manager.putContext(input, new PluginInputContext(this, input, true, true));
		}
	}


			if (zip.getEntry(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR) != null) {
				input = new JarEntryEditorInput(new JarEntryFile(zip, ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR));
				manager.putContext(input, new BundleInputContext(this, input, storage.getName().equals(ICoreConstants.MANIFEST_FILENAME)));
			}

			if (zip.getEntry(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) != null) {
				input = new JarEntryEditorInput(new JarEntryFile(zip, ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
				manager.putContext(input, new PluginInputContext(this, input, storage.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), false));
			} else if (zip.getEntry(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) != null) {
				input = new JarEntryEditorInput(new JarEntryFile(zip, ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR));
				manager.putContext(input, new PluginInputContext(this, input, storage.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR), true));
			}

			if (zip.getEntry(ICoreConstants.BUILD_FILENAME_DESCRIPTOR) != null) {
				input = new JarEntryEditorInput(new JarEntryFile(zip, ICoreConstants.BUILD_FILENAME_DESCRIPTOR));
				manager.putContext(input, new BuildInputContext(this, input, storage.getName().equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)));
			}
		} finally {
			try {

		InputContext context = null;
		if (object instanceof IFile) {
			String name = ((IFile) object).getName();
			if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
				context = fInputContextManager.findContext(PluginInputContext.CONTEXT_ID);
			else if (name.equals(ICoreConstants.MANIFEST_FILENAME))
				context = fInputContextManager.findContext(BundleInputContext.CONTEXT_ID);
			else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR))
				context = fInputContextManager.findContext(BuildInputContext.CONTEXT_ID);
		} else if (object instanceof IBuildObject) {
			context = fInputContextManager.findContext(BuildInputContext.CONTEXT_ID);

	public void showEditorInput(IEditorInput editorInput) {
		String name = editorInput.getName();
		String id = getActivePageInstance().getId();
		if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			if (!BuildInputContext.CONTEXT_ID.equals(id))
				setActivePage(SHOW_SOURCE ? BuildInputContext.CONTEXT_ID : BuildPage.PAGE_ID);
		} else if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			if (!PluginInputContext.CONTEXT_ID.equals(id)) {
				if (SHOW_SOURCE) {
					setActivePage(PluginInputContext.CONTEXT_ID);




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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


				// If a MANIFEST.MF file is being opened, make sure we return a positive match
				// only if it is colocated with the plugin.xml/fragment.xml file already open
				if (inputFile.getName().equals(ICoreConstants.MANIFEST_FILENAME)) {
					IContainer parent = inputFile.getParent();
					return parent instanceof IFolder && parent.getName().equals("META-INF") //$NON-NLS-1$
							&& parent.getParent().equals(editorFile.getParent());


				// if a plugin.xml/fragment.xml is being opened, make sure we return a positive match
				// only if the editor that is open is associated with a colocated MANIFEST.MF
				if (inputFile.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || inputFile.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
					IContainer parent = inputFile.getParent();
					IFile file = parent.getFile(ICoreConstants.MANIFEST_PATH);
					return file.exists() && editorFile.equals(file);


				// if a build.properties is being opened, only return a positive match
				// if an editor is already open on a sibling plugin.xml/fragment.xml or a META-INF/MANIFEST.MF
				if (inputFile.getName().equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
					IContainer parent = inputFile.getParent();
					if (parent.equals(editorFile.getParent())) {
						return editorFile.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || editorFile.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR);
					}
					IFile file = parent.getFile(ICoreConstants.MANIFEST_PATH);
					return file.exists() && editorFile.equals(file);




/*******************************************************************************
 * Copyright (c) 2005, 2010 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.pde.core.build.IBuildEntry;
import org.eclipse.pde.core.build.IBuildModel;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.util.ModelModification;
import org.eclipse.pde.internal.ui.util.PDEModelUtility;

					addBundleLocalization(change, monitor, pluginChange);

				// Update build.properties file (if exists & not already done)
				IFile buildProps = PDEProject.getBuildProperties(changeFile.getFile().getProject());
				if (buildProps != null && buildProps.exists() && !fFileChanges.containsKey(buildProps)) {
					getChangeForBuild(buildProps, monitor, pluginChange, change.getBundleLocalization());
				}

		change.setEdit(edit);
		// mark a plugin.xml or a fragment.xml as PLUGIN2 type so they will be compared
		// with the PluginContentMergeViewer
		String textType = file.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || file.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) ? "PLUGIN2" //$NON-NLS-1$
				file.getName().equals("fragment.xml") ? //$NON-NLS-1$
		"PLUGIN2" //$NON-NLS-1$
				: file.getFileExtension();
		change.setTextType(textType);
		parentChange.add(change);


	private void addBundleLocalization(ModelChange change, IProgressMonitor mon, CompositeChange parent) {
		IPluginModelBase base = change.getParentModel();
		IFile manifest = PDEProject.getManifest(base.getUnderlyingResource().getProject());
		// if the edit for this manifest file is in the HashMap, then we must have added
		// the localization already since it is checked first (this must be the second or subsequent
		// change to the manifest for this plug-in)




/*******************************************************************************
 * Copyright (c) 2008, 2010 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.jface.wizard.IWizardContainer;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.TargetPlatformHelper;
import org.eclipse.pde.internal.core.plugin.ExternalPluginModelBase;
import org.eclipse.pde.internal.ui.PDEPlugin;

	private static final String PROPERTIES_EXTENSION = ".properties"; //$NON-NLS-1$
	private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$

	private static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
	private static final String BUILD_PROPERTIES = "build.properties"; //$NON-NLS-1$

	private static final String BIN = "/bin/"; //$NON-NLS-1$
	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
	private static final String BACKSLASH = "\\"; //$NON-NLS-1$

			add(new AbstractFilter(false) {
				public boolean matches(Object object) {
					String path = object.toString();
					return path.indexOf(BIN) != -1 || path.endsWith(SLASH) || path.endsWith(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
				}
			});


			add(new AbstractFilter(false) {
				public boolean matches(Object object) {
					String path = object.toString();
					return path.indexOf(BIN) != -1 || path.endsWith(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
				}
			});





/*******************************************************************************
 *  Copyright (c) 2006, 2010 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.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.WorkspaceModelManager;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.bundle.*;
import org.eclipse.pde.internal.core.util.IdUtil;
import org.eclipse.pde.internal.ui.PDEUIMessages;

	}

	protected Change createManifestChange(IProgressMonitor monitor) throws CoreException {
		IFile manifest = PDEProject.getManifest(fProject);
		if (manifest.exists()) {
			monitor.beginTask("", 4); //$NON-NLS-1$
			try {

						// The project/resources get refactored before the TextChange is applied, therefore we need their future locations
						IProject newProject = ((IWorkspaceRoot) manifest.getProject().getParent()).getProject(newText);

						MovedTextFileChange change = new MovedTextFileChange("", PDEProject.getManifest(newProject), manifest); //$NON-NLS-1$
						MultiTextEdit edit = new MultiTextEdit();
						edit.addChildren(listener.getTextOperations());
						change.setEdit(edit);




/*******************************************************************************
 *  Copyright (c) 2007, 2010 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.jface.text.BadLocationException;
import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.bundle.*;
import org.eclipse.pde.internal.ui.util.PDEModelUtility;
import org.eclipse.text.edits.*;

			if (res == null)
				return;
			IProject proj = res.getProject();
			IFile file = PDEProject.getManifest(proj);
			if (file.exists())
				fChange = updateBundleHeader(file, monitor);
		} finally {




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.jdt.core.*;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.PDEUIMessages;

public class ManifestPackageMoveParticipant extends PDEMoveParticipant {

			IPackageFragment fragment = (IPackageFragment) element;
			IJavaProject javaProject = (IJavaProject) fragment.getAncestor(IJavaElement.JAVA_PROJECT);
			IProject project = javaProject.getProject();
			if (PDEProject.getManifest(project).exists()) {
				fProject = javaProject.getProject();
				fElements = new HashMap();
				fElements.put(fragment, getNewName(getArguments().getDestination(), element));

	}

	protected void addChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
		IFile file = PDEProject.getManifest(fProject);
		if (file.exists()) {
			IProject destProject = getDestinationProject();
			if (destProject != null && !fProject.equals(destProject)) {
				MoveFromChange change = BundleManifestChange.createMovePackageChange(file, fElements.keySet().toArray(), pm);
				if (change != null) {
					result.add(change);
					IFile dest = PDEProject.getManifest(destProject);
					if (dest.exists()) {
						Change second = BundleManifestChange.createMoveToPackageChange(dest, change, pm);
						if (second != null)




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.jdt.core.*;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.WorkspaceModelManager;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.PDEUIMessages;

public class ManifestTypeMoveParticipant extends PDEMoveParticipant {

		return false;
	}

	protected void addChange(CompositeChange result, IFile file, IProgressMonitor pm) throws CoreException {
		IFile file = fProject.getFile(filename);
		if (file.exists()) {
			Change change = PluginManifestChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), getTextChange(file), pm);
			if (change != null)

	}

	protected void addChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
		IFile file = PDEProject.getManifest(fProject);
		if (file.exists()) {
			Change change = BundleManifestChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), pm);
			if (change != null)




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.HashMap;
import java.util.Iterator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.*;
import org.eclipse.ltk.core.refactoring.*;
import org.eclipse.ltk.core.refactoring.participants.*;
import org.eclipse.pde.internal.core.project.PDEProject;

public abstract class PDEMoveParticipant extends MoveParticipant implements ISharableParticipant {


		CompositeChange result = new CompositeChange(getName());
		addChange(result, pm);
		if (isInterestingForExtensions()) {
			addChange(result, PDEProject.getPluginXml(fProject), pm);
			addChange(result, PDEProject.getFragmentXml(fProject), pm);
		}
		return (result.getChildren().length == 0) ? null : result;
	}

	protected abstract boolean isInterestingForExtensions();

	protected void addChange(CompositeChange result, IFile file, IProgressMonitor pm) throws CoreException {
	}

	// add main change (whether to Manifest or build.properties)




/*******************************************************************************
 * Copyright (c) 2005, 2010 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.jdt.core.IJavaElement;
import org.eclipse.ltk.core.refactoring.*;
import org.eclipse.ltk.core.refactoring.participants.*;
import org.eclipse.pde.internal.core.project.PDEProject;

public abstract class PDERenameParticipant extends RenameParticipant implements ISharableParticipant {


		addBundleManifestChange(result, pm);
		if (updateBuildProperties())
			addBuildPropertiesChange(result, pm);
		addChange(result, PDEProject.getPluginXml(fProject), pm);
		addChange(result, PDEProject.getFragmentXml(fProject), pm);
		return (result.getChildren().length == 0) ? null : result;
	}

	private void addChange(CompositeChange result, IFile file, IProgressMonitor pm) throws CoreException {
		IFile file = fProject.getFile(filename);
		if (file.exists()) {
			Change change = PluginManifestChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), getTextChange(file), pm);
			if (change != null)

	}

	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
		addBundleManifestChange(PDEProject.getManifest(fProject), result, pm);
	}

	protected void addBundleManifestChange(IFile file, CompositeChange result, IProgressMonitor pm) throws CoreException {

	}

	protected void addBuildPropertiesChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
		IFile file = PDEProject.getBuildProperties(fProject);
		if (file.exists()) {
			Change change = BuildPropertiesChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), pm);
			if (change != null)

Lines 17-22 Link Here

(-)src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java (-1 / +2 lines)
17	import org.eclipse.jface.text.IDocument;	17	import org.eclipse.jface.text.IDocument;
18	import org.eclipse.ltk.core.refactoring.*;	18	import org.eclipse.ltk.core.refactoring.*;
19	import org.eclipse.pde.core.plugin.*;	19	import org.eclipse.pde.core.plugin.*;
		20	import org.eclipse.pde.internal.core.ICoreConstants;
20	import org.eclipse.pde.internal.core.PDECore;	21	import org.eclipse.pde.internal.core.PDECore;
21	import org.eclipse.pde.internal.core.ischema.*;	22	import org.eclipse.pde.internal.core.ischema.*;
22	import org.eclipse.pde.internal.core.schema.SchemaRegistry;	23	import org.eclipse.pde.internal.core.schema.SchemaRegistry;
Lines 39-45 Link Here
39		40
40	try {	41	try {
41	PluginModelBase model;	42	PluginModelBase model;
42	if ("fragment.xml".equals(file.getName())) //$NON-NLS-1$	43	if (ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR.equals(file.getName()))
43	model = new FragmentModel(document, false);	44	model = new FragmentModel(document, false);
44	else	45	else
45	model = new PluginModel(document, false);	46	model = new PluginModel(document, false);




/*******************************************************************************
 *  Copyright (c) 2007, 2010 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.ltk.core.refactoring.participants.*;
import org.eclipse.pde.core.IBaseModel;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.util.ModelModification;
import org.eclipse.pde.internal.ui.util.PDEModelUtility;

		IResource res = base.getUnderlyingResource();
		if (res != null) {
			IProject proj = res.getProject();
			IFile file = PDEProject.getPluginXml(proj);
			if (file.exists())
				return file;
		}




/*******************************************************************************
 * Copyright (c) 2007, 2010 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.core.runtime.IProgressMonitor;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.WorkspaceModelManager;
import org.eclipse.pde.internal.core.project.PDEProject;

public abstract class ResourceMoveParticipant extends PDEMoveParticipant {


		return false;
	}

	protected void addChange(CompositeChange result, IFile file, IProgressMonitor pm) throws CoreException {
		IFile file = fProject.getFile(filename);
		if (file.exists()) {
			Change change = PluginManifestChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), getTextChange(file), pm);
			if (change != null)

	}

	protected void addChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
		IFile file = PDEProject.getBuildProperties(fProject);
		if (file.exists()) {
			Change change = BuildPropertiesChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), pm);
			if (change != null)
				result.add(change);
		}
		file = PDEProject.getManifest(fProject);
		if (file.exists()) {
			Change change = BundleManifestChange.createRenameChange(file, fElements.keySet().toArray(), getNewNames(), pm);
			if (change != null)




import org.eclipse.pde.internal.core.converter.PluginConverter;
import org.eclipse.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.plugin.PluginImport;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;
import org.eclipse.pde.internal.core.text.bundle.*;
import org.eclipse.pde.internal.ui.PDEUIMessages;

	}

	protected final IBuild getBuild() {
		IFile buildProps = PDEProject.getBuildProperties(fProject);
		if (buildProps != null) {
			WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);
			if (model != null)

			} else
				addRequireBundles(plugins, pbase, build.getEntry(IBuildEntry.SECONDARY_DEPENDENCIES));
			try {
				build.write("", new PrintWriter(new FileOutputStream(PDEProject.getBuildProperties(fProject).getFullPath().toFile()))); //$NON-NLS-1$ //$NON-NLS-2$
			} catch (FileNotFoundException e) {
			}
		} else {

Lines 253-259 Link Here

(-)src/org/eclipse/pde/internal/ui/shared/target/AddFeatureContainersPage.java (-1 / +1 lines)
253	for (int i = 0; i < dirs.length; i++) {	253	for (int i = 0; i < dirs.length; i++) {
254	File dir = dirs[i];	254	File dir = dirs[i];
255	if (dir.isDirectory()) {	255	if (dir.isDirectory()) {
256	File manifest = new File(dir, "feature.xml"); //$NON-NLS-1$	256	File manifest = new File(dir, ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
257	if (manifest.exists()) {	257	if (manifest.exists()) {
258	IStatus status = doLoadFeature(dir, manifest, result);	258	IStatus status = doLoadFeature(dir, manifest, result);
259	if (status != null)	259	if (status != null)

Lines 14-19 Link Here

(-)src/org/eclipse/pde/internal/ui/util/ModelModification.java (-6 / +8 lines)
14	import org.eclipse.core.resources.IProject;	14	import org.eclipse.core.resources.IProject;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
16	import org.eclipse.pde.core.IBaseModel;	16	import org.eclipse.pde.core.IBaseModel;
		17	import org.eclipse.pde.internal.core.ICoreConstants;
		18	import org.eclipse.pde.internal.core.project.PDEProject;
17		19
18	/**	20	/**
19	* ModelModification class used my the PDEModelUtility	21	* ModelModification class used my the PDEModelUtility
Lines 54-65 Link Here
54	* @param project	56	* @param project
55	*/	57	*/
56	public ModelModification(IProject project) {	58	public ModelModification(IProject project) {
57	IFile xml = project.getFile(PDEModelUtility.F_PLUGIN);	59	IFile xml = PDEProject.getPluginXml(project);
58	if (!xml.exists())	60	if (!xml.exists())
59	xml = project.getFile(PDEModelUtility.F_FRAGMENT);	61	xml = PDEProject.getFragmentXml(project);
60	if (!xml.exists())	62	if (!xml.exists())
61	xml = null;	63	xml = null;
62	IFile manifest = project.getFile(PDEModelUtility.F_MANIFEST_FP);	64	IFile manifest = PDEProject.getManifest(project);
63	if (!manifest.exists() && xml != null)	65	if (!manifest.exists() && xml != null)
64	singleFileModification(xml);	66	singleFileModification(xml);
65	else if (manifest.exists())	67	else if (manifest.exists())
Lines 74-80 Link Here
74	fModelFile = fXMLFile;	76	fModelFile = fXMLFile;
75	else if (fPropertiesFile != null)	77	else if (fPropertiesFile != null)
76	fModelFile = fPropertiesFile;	78	fModelFile = fPropertiesFile;
77	fIsBundleModel = file.getName().equals(PDEModelUtility.F_MANIFEST);	79	fIsBundleModel = file.getName().equals(ICoreConstants.MANIFEST_FILENAME);
78	}	80	}
79		81
80	private void createFullBundleModification(IFile bundleFile, IFile xmlFile) {	82	private void createFullBundleModification(IFile bundleFile, IFile xmlFile) {
Lines 90-98 Link Here
90	if (file == null)	92	if (file == null)
91	return;	93	return;
92	String name = file.getName();	94	String name = file.getName();
93	if (name.equals(PDEModelUtility.F_MANIFEST))	95	if (name.equals(ICoreConstants.MANIFEST_FILENAME))
94	fManifestFile = file;	96	fManifestFile = file;
95	else if (name.equals(PDEModelUtility.F_PLUGIN) \|\| name.equals(PDEModelUtility.F_FRAGMENT))	97	else if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) \|\| name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
96	fXMLFile = file;	98	fXMLFile = file;
97	else if (name.endsWith(PDEModelUtility.F_PROPERTIES))	99	else if (name.endsWith(PDEModelUtility.F_PROPERTIES))
98	fPropertiesFile = file;	100	fPropertiesFile = file;




import org.eclipse.pde.core.IBaseModel;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.ISharedExtensionsModel;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.bundle.BundleFragmentModel;
import org.eclipse.pde.internal.core.bundle.BundlePluginModel;
import org.eclipse.pde.internal.core.ibundle.IBundleModel;

 */
public class PDEModelUtility {

	public static final String F_MANIFEST = "MANIFEST.MF"; //$NON-NLS-1$
	public static final String F_MANIFEST_FP = "META-INF/" + F_MANIFEST; //$NON-NLS-1$
	public static final String F_PLUGIN = "plugin.xml"; //$NON-NLS-1$
	public static final String F_FRAGMENT = "fragment.xml"; //$NON-NLS-1$
	public static final String F_PROPERTIES = ".properties"; //$NON-NLS-1$
	public static final String F_BUILD = "build" + F_PROPERTIES; //$NON-NLS-1$

	// bundle / xml various Object[] indices
	private static final int F_Bi = 0; // the manifest.mf-related object will always be 1st

			return;
		// mark a plugin.xml or a fragment.xml as PLUGIN2 type so they will be compared
		// with the PluginContentMergeViewer
		String textType = name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) ? "PLUGIN2" //$NON-NLS-1$
				: file.getFileExtension();
		"PLUGIN2" //$NON-NLS-1$
				: file.getFileExtension(); 
		// if the file extension is null, the setTextType method will use type "txt", so no null guard needed
		change.setTextType(textType);
	}

	private static PDEFormEditor getOpenEditor(ModelModification modification) {
		IProject project = modification.getFile().getProject();
		String name = modification.getFile().getName();
		if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.MANIFEST_FILENAME)) {
			return getOpenManifestEditor(project);
		} else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			PDEFormEditor openEditor = getOpenBuildPropertiesEditor(project);
			if (openEditor == null)
				openEditor = getOpenManifestEditor(project);

			return null;
		String name = modification.getFile().getName();
		IBaseModel model = null;
		if (name.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || name.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR)) {
			model = openEditor.getAggregateModel();
			if (model instanceof IBundlePluginModelBase)
				model = ((IBundlePluginModelBase) model).getExtensionsModel();
		} else if (name.equals(ICoreConstants.BUILD_FILENAME_DESCRIPTOR)) {
			if (openEditor instanceof BuildEditor) {
				model = openEditor.getAggregateModel();
			} else if (openEditor instanceof ManifestEditor) {

				if (page instanceof BuildSourcePage)
					model = ((BuildSourcePage) page).getInputContext().getModel();
			}
		} else if (name.equals(ICoreConstants.MANIFEST_FILENAME)) {
			model = openEditor.getAggregateModel();
			if (model instanceof IBundlePluginModelBase)
				return model;

	}

	private static IModelTextChangeListener createListener(String filename, IDocument doc, boolean generateEditNames) {
		if (filename.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) || filename.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
			return new XMLTextChangeListener(doc, generateEditNames);
		else if (filename.equals(ICoreConstants.MANIFEST_FILENAME))
			return new BundleTextChangeListener(doc, generateEditNames);
		else if (filename.endsWith(F_PROPERTIES))
			return new PropertiesTextChangeListener(doc, generateEditNames);

	private static AbstractEditingModel prepareAbstractEditingModel(IFile file, IDocument doc, boolean generateEditNames) {
		AbstractEditingModel model;
		String filename = file.getName();
		if (filename.equals(ICoreConstants.MANIFEST_FILENAME))
			model = new BundleModel(doc, true);
		else if (filename.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
			model = new FragmentModel(doc, true);
		else if (filename.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR))
			model = new PluginModel(doc, true);
		else if (filename.endsWith(F_PROPERTIES))
			model = new BuildModel(doc, true);

Lines 502-510 Link Here

(-)src/org/eclipse/pde/internal/ui/views/plugins/PluginsView.java (-3 / +1 lines)
502	String fileName = adapter.getFile().getName();	502	String fileName = adapter.getFile().getName();
503	String lcFileName = fileName.toLowerCase(Locale.ENGLISH);	503	String lcFileName = fileName.toLowerCase(Locale.ENGLISH);
504	ImageDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(fileName);	504	ImageDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(fileName);
505	if (lcFileName.equals("plugin.xml") //$NON-NLS-1$	505	if (lcFileName.equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) \|\| lcFileName.equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) \|\| lcFileName.equals(ICoreConstants.MANIFEST_FILENAME_LOWER_CASE)) {
506	\|\| lcFileName.equals("fragment.xml") //$NON-NLS-1$
507	\|\| lcFileName.equals("manifest.mf")) { //$NON-NLS-1$
508	fOpenManifestAction.setImageDescriptor(desc);	506	fOpenManifestAction.setImageDescriptor(desc);
509	manager.add(fOpenManifestAction);	507	manager.add(fOpenManifestAction);
510	manager.add(new Separator());	508	manager.add(new Separator());

Lines 30-35 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/exports/AntGeneratingExportWizard.java (-1 / +2 lines)
30	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	30	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
31	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;	31	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
32	import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;	32	import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
		33	import org.eclipse.pde.internal.core.project.PDEProject;
33	import org.eclipse.pde.internal.ui.*;	34	import org.eclipse.pde.internal.ui.*;
34	import org.eclipse.pde.internal.ui.build.BaseBuildAction;	35	import org.eclipse.pde.internal.ui.build.BaseBuildAction;
35	import org.eclipse.swt.SWT;	36	import org.eclipse.swt.SWT;
Lines 75-81 Link Here
75	File file = new File(installLocation, "build.xml"); //$NON-NLS-1$	76	File file = new File(installLocation, "build.xml"); //$NON-NLS-1$
76	if (file.exists()) {	77	if (file.exists()) {
77	try {	78	try {
78	IFile buildFile = underlyingResource.getProject().getFile("build.properties"); //$NON-NLS-1$	79	IFile buildFile = PDEProject.getBuildProperties(underlyingResource.getProject());
79	IBuildModel buildModel = new WorkspaceBuildModel(buildFile);	80	IBuildModel buildModel = new WorkspaceBuildModel(buildFile);
80	buildModel.load();	81	buildModel.load();
81	if (buildModel != null) {	82	if (buildModel != null) {

Lines 20-27 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizardPage.java (-3 / +2 lines)
20	import org.eclipse.pde.core.IModel;	20	import org.eclipse.pde.core.IModel;
21	import org.eclipse.pde.core.plugin.IPluginModelBase;	21	import org.eclipse.pde.core.plugin.IPluginModelBase;
22	import org.eclipse.pde.core.plugin.PluginRegistry;	22	import org.eclipse.pde.core.plugin.PluginRegistry;
23	import org.eclipse.pde.internal.core.PDECore;	23	import org.eclipse.pde.internal.core.*;
24	import org.eclipse.pde.internal.core.WorkspaceModelManager;
25	import org.eclipse.pde.internal.ui.IHelpContextIds;	24	import org.eclipse.pde.internal.ui.IHelpContextIds;
26	import org.eclipse.pde.internal.ui.PDEUIMessages;	25	import org.eclipse.pde.internal.ui.PDEUIMessages;
27	import org.eclipse.pde.internal.ui.util.PersistablePluginObject;	26	import org.eclipse.pde.internal.ui.util.PersistablePluginObject;
Lines 59-65 Link Here
59	}	58	}
60		59
61	private boolean hasBuildProperties(IPluginModelBase model) {	60	private boolean hasBuildProperties(IPluginModelBase model) {
62	File file = new File(model.getInstallLocation(), "build.properties"); //$NON-NLS-1$	61	File file = new File(model.getInstallLocation(), ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
63	return file.exists();	62	return file.exists();
64	}	63	}
65		64




import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.pde.core.build.IBuildEntry;
import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
import org.eclipse.pde.internal.core.ifeature.*;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.swt.widgets.Shell;

		} else {
			fProject.create(monitor);
			fProject.open(monitor);
			file = PDEProject.getFeatureXml(fProject);
			monitor.worked(3);
		}
		if (file.exists())

	}

	protected void createBuildProperties() throws CoreException {
		IFile file = PDEProject.getBuildProperties(fProject);
		if (!file.exists()) {
			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
			IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
			ientry.addToken(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
			String library = fFeatureData.library;
			if (library != null) {
				String source = fFeatureData.getSourceFolderName();

	}

	protected IFile createFeature() throws CoreException {
		IFile file = PDEProject.getFeatureXml(fProject);
		WorkspaceFeatureModel model = new WorkspaceFeatureModel();
		model.setFile(file);
		IFeature feature = model.getFeature();

Lines 22-27 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java (-1 / +2 lines)
22	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	22	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
23	import org.eclipse.pde.internal.core.ifeature.*;	23	import org.eclipse.pde.internal.core.ifeature.*;
24	import org.eclipse.pde.internal.core.natures.PDE;	24	import org.eclipse.pde.internal.core.natures.PDE;
		25	import org.eclipse.pde.internal.core.project.PDEProject;
25	import org.eclipse.pde.internal.ui.PDEPlugin;	26	import org.eclipse.pde.internal.ui.PDEPlugin;
26	import org.eclipse.pde.internal.ui.PDEUIMessages;	27	import org.eclipse.pde.internal.ui.PDEUIMessages;
27	import org.eclipse.team.core.RepositoryProvider;	28	import org.eclipse.team.core.RepositoryProvider;
Lines 226-232 Link Here
226	}	227	}
227		228
228	private void createBuildProperties(IProject project) {	229	private void createBuildProperties(IProject project) {
229	IFile file = project.getFile("build.properties"); //$NON-NLS-1$	230	IFile file = PDEProject.getBuildProperties(project);
230	if (!file.exists()) {	231	if (!file.exists()) {
231	WorkspaceBuildModel model = new WorkspaceBuildModel(file);	232	WorkspaceBuildModel model = new WorkspaceBuildModel(file);
232	IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$	233	IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$




/*******************************************************************************
 * Copyright (c) 2000, 2009 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.imports;

import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.*;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.feature.ExternalFeatureModel;
import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
import org.eclipse.pde.internal.ui.util.SWTUtil;
import org.eclipse.pde.internal.ui.wizards.ListUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.progress.IProgressService;

public class FeatureImportWizardPage extends WizardPage {

	private static final String SETTINGS_DROPLOCATION = "droplocation"; //$NON-NLS-1$
	private static final String SETTINGS_DOOTHER = "doother"; //$NON-NLS-1$
	private static final String SETTINGS_NOT_BINARY = "notbinary"; //$NON-NLS-1$

	private Label fOtherLocationLabel;
	private Button fRuntimeLocationButton;
	private Button fBrowseButton;
	private Combo fDropLocation;
	private boolean fSelfSetLocation;
	private String fCurrDropLocation;

	private CheckboxTableViewer fFeatureViewer;
	private TablePart fTablePart;
	private IFeatureModel[] fModels;

	private Button fBinaryButton;

	class ContentProvider extends DefaultContentProvider implements IStructuredContentProvider {
		public Object[] getElements(Object parent) {
			if (fModels != null)
				return fModels;
			return new Object[0];
		}
	}

	class TablePart extends WizardCheckboxTablePart {
		public TablePart() {
			super(null, new String[] {PDEUIMessages.FeatureImportWizardPage_reload, PDEUIMessages.WizardCheckboxTablePart_selectAll, PDEUIMessages.WizardCheckboxTablePart_deselectAll});
			setSelectAllIndex(1);
			setDeselectAllIndex(2);
		}

		public void updateCounter(int count) {
			super.updateCounter(count);
			dialogChanged();
		}

		protected StructuredViewer createStructuredViewer(Composite parent, int style, FormToolkit toolkit) {
			StructuredViewer viewer = super.createStructuredViewer(parent, style, toolkit);
			viewer.setComparator(ListUtil.FEATURE_COMPARATOR);
			return viewer;
		}

		protected void buttonSelected(Button button, int index) {
			if (index == 0)
				loadFeatureTable();
			else
				super.buttonSelected(button, index);
		}
	}

	public FeatureImportWizardPage() {
		super("FeatureImportWizardPage"); //$NON-NLS-1$
		setTitle(PDEUIMessages.FeatureImportWizard_FirstPage_title);
		setDescription(PDEUIMessages.FeatureImportWizard_FirstPage_desc);
		fTablePart = new TablePart();
		PDEPlugin.getDefault().getLabelProvider().connect(this);
	}

	/*
	 * @see IDialogPage#createControl(Composite)
	 */
	public void createControl(Composite parent) {
		initializeDialogUnits(parent);

		Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(3, false));

		fRuntimeLocationButton = new Button(composite, SWT.CHECK);
		fillHorizontal(fRuntimeLocationButton, 3, false);
		fRuntimeLocationButton.setText(PDEUIMessages.FeatureImportWizard_FirstPage_runtimeLocation);

		fOtherLocationLabel = new Label(composite, SWT.NULL);
		fOtherLocationLabel.setText(PDEUIMessages.FeatureImportWizard_FirstPage_otherFolder);

		fDropLocation = new Combo(composite, SWT.DROP_DOWN);
		fillHorizontal(fDropLocation, 1, true);

		fBrowseButton = new Button(composite, SWT.PUSH);
		fBrowseButton.setText(PDEUIMessages.FeatureImportWizard_FirstPage_browse);
		fBrowseButton.setLayoutData(new GridData());
		SWTUtil.setButtonDimensionHint(fBrowseButton);

		creatFeatureTable(composite);

		fBinaryButton = new Button(composite, SWT.CHECK);
		GridData gd = fillHorizontal(fBinaryButton, 3, false);
		gd.verticalIndent = 5;
		fBinaryButton.setText(PDEUIMessages.FeatureImportWizard_FirstPage_binaryImport);

		initializeFields(getDialogSettings());
		hookListeners();

		setControl(composite);
		dialogChanged();
		Dialog.applyDialogFont(composite);
		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.FEATURE_IMPORT_FIRST_PAGE);
	}

	private String getTargetHome() {
		PDEPreferencesManager preferences = PDECore.getDefault().getPreferencesManager();
		return preferences.getString(ICoreConstants.PLATFORM_PATH);
	}

	private void hookListeners() {
		fRuntimeLocationButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				setOtherEnabled(!fRuntimeLocationButton.getSelection());
				setLocation(fRuntimeLocationButton.getSelection() ? getTargetHome() : fCurrDropLocation);
				loadFeatureTable();
			}
		});
		fDropLocation.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				validateDropLocation();
				if (!fRuntimeLocationButton.getSelection()) {
					String newLoc = fDropLocation.getText();
					if (getMessageType() != WARNING && !newLoc.equals(fCurrDropLocation) && !fSelfSetLocation)
						setMessage(PDEUIMessages.FeatureImportWizardPage_reloadLocation, WARNING);
					fCurrDropLocation = newLoc;
				}
			}
		});
		fBrowseButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				IPath chosen = chooseDropLocation();
				if (chosen != null) {
					setLocation(chosen.toOSString());
					loadFeatureTable();
				}
			}
		});
	}

	private GridData fillHorizontal(Control control, int span, boolean grab) {
		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
		gd.horizontalSpan = span;
		gd.grabExcessHorizontalSpace = grab;
		control.setLayoutData(gd);
		return gd;
	}

	private void initializeFields(IDialogSettings initialSettings) {
		String[] dropItems = new String[0];
		boolean doOther = false;
		boolean binary = true;

		if (initialSettings != null) {
			doOther = initialSettings.getBoolean(SETTINGS_DOOTHER);
			binary = !initialSettings.getBoolean(SETTINGS_NOT_BINARY);

			ArrayList items = new ArrayList();
			for (int i = 0; i < 6; i++) {
				String curr = initialSettings.get(SETTINGS_DROPLOCATION + String.valueOf(i));
				if (curr != null && !items.contains(curr))
					items.add(curr);
			}
			if (items.size() == 0)
				items.add(""); //$NON-NLS-1$
			dropItems = (String[]) items.toArray(new String[items.size()]);
		}
		fDropLocation.setItems(dropItems);
		fRuntimeLocationButton.setSelection(!doOther);
		setOtherEnabled(doOther);
		fCurrDropLocation = doOther ? dropItems[0] : getTargetHome();
		setLocation(fCurrDropLocation);
		fBinaryButton.setSelection(binary);

		validateDropLocation();

		loadFeatureTable();
	}

	private void setOtherEnabled(boolean enabled) {
		fOtherLocationLabel.setEnabled(enabled);
		fDropLocation.setEnabled(enabled);
		fBrowseButton.setEnabled(enabled);
	}

	public void storeSettings(boolean finishPressed) {
		IDialogSettings settings = getDialogSettings();
		boolean other = !fRuntimeLocationButton.getSelection();
		boolean binary = fBinaryButton.getSelection();
		if (finishPressed || fDropLocation.getText().length() > 0 && other) {
			settings.put(SETTINGS_DROPLOCATION + String.valueOf(0), fDropLocation.getText());
			String[] items = fDropLocation.getItems();
			int nEntries = Math.min(items.length, 5);
			for (int i = 0; i < nEntries; i++)
				settings.put(SETTINGS_DROPLOCATION + String.valueOf(i + 1), items[i]);
		}
		if (finishPressed) {
			settings.put(SETTINGS_DOOTHER, other);
			settings.put(SETTINGS_NOT_BINARY, !binary);
		}
	}

	/**
	 * Browses for a drop location.
	 */
	private IPath chooseDropLocation() {
		DirectoryDialog dialog = new DirectoryDialog(getShell());
		dialog.setFilterPath(fDropLocation.getText());
		dialog.setText(PDEUIMessages.FeatureImportWizard_messages_folder_title);
		dialog.setMessage(PDEUIMessages.FeatureImportWizard_messages_folder_message);
		String res = dialog.open();
		return res != null ? new Path(res) : null;
	}

	private void validateDropLocation() {
		String errorMessage = null;
		if (isOtherLocation()) {
			IPath curr = getDropLocation();
			if (curr.segmentCount() == 0)
				errorMessage = PDEUIMessages.FeatureImportWizard_errors_locationMissing;
			else if (!Path.ROOT.isValidPath(fDropLocation.getText()))
				errorMessage = PDEUIMessages.FeatureImportWizard_errors_buildFolderInvalid;
			else {
				File file = curr.toFile();
				if (!file.exists() || !file.isDirectory())
					errorMessage = PDEUIMessages.FeatureImportWizard_errors_buildFolderMissing;
			}
		}
		setErrorMessage(errorMessage);
		setPageComplete(errorMessage == null);
		fTablePart.setButtonEnabled(0, errorMessage == null);
	}

	public boolean isBinary() {
		return fBinaryButton.getSelection();
	}

	/**
	 * Returns the drop location.
	 */
	public IPath getDropLocation() {
		return new Path(fDropLocation.getText().trim());
	}

	public boolean isOtherLocation() {
		return !fRuntimeLocationButton.getSelection();
	}

	private void loadFeatureTable() {
		IFeatureModel[] models = getModels();
		fFeatureViewer.setInput(PDEPlugin.getDefault());
		if (models != null) {
			// warning had been issued for unreloaded location
			if (getMessageType() == WARNING)
				setMessage(null, WARNING);
			if (!fRuntimeLocationButton.getSelection()) {
				String currItem = fDropLocation.getText();
				if (fDropLocation.indexOf(currItem) == -1) {
					fDropLocation.add(currItem, 0);
					if (fDropLocation.getItemCount() > 6)
						fDropLocation.remove(6);
					storeSettings(false);
				}
			}
			fFeatureViewer.setCheckedElements(models);
		}
		fTablePart.updateCounter(models != null ? models.length : 0);
		fTablePart.getTableViewer().refresh();

		fTablePart.setButtonEnabled(1, models != null && models.length > 0);
		fTablePart.setButtonEnabled(2, models != null && models.length > 0);

		dialogChanged();
	}

	public void creatFeatureTable(Composite parent) {
		Composite container = new Composite(parent, SWT.NONE);
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		layout.marginHeight = layout.marginWidth = 0;
		container.setLayout(layout);
		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		gd.horizontalSpan = 3;
		gd.verticalIndent = 5;
		gd.heightHint = gd.widthHint = 300;
		container.setLayoutData(gd);

		fTablePart.createControl(container);
		fFeatureViewer = fTablePart.getTableViewer();
		fFeatureViewer.setContentProvider(new ContentProvider());
		fFeatureViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
	}

	public void dispose() {
		super.dispose();
		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
	}

	public IFeatureModel[] getModels() {
		final IPath home = getDropLocation();
		final boolean useRuntimeLocation = fRuntimeLocationButton.getSelection() || getTargetHome().equals(fDropLocation.getText().trim());
		IRunnableWithProgress runnable = new IRunnableWithProgress() {
			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
				monitor.beginTask(PDEUIMessages.FeatureImportWizard_messages_updating, IProgressMonitor.UNKNOWN);
				ArrayList result = new ArrayList();
				if (useRuntimeLocation) {
					IFeatureModel[] allModels = PDECore.getDefault().getFeatureModelManager().getModels();
					for (int i = 0; i < allModels.length; i++)
						if (allModels[i].getUnderlyingResource() == null)
							result.add(allModels[i]);
				} else {
					MultiStatus errors = doLoadFeatures(result, createPath(home));
					if (errors != null && errors.getChildren().length > 0)
						PDEPlugin.log(errors);
				}
				fModels = (IFeatureModel[]) result.toArray(new IFeatureModel[result.size()]);
				monitor.done();
			}
		};
		IProgressService pservice = PlatformUI.getWorkbench().getProgressService();
		try {
			pservice.busyCursorWhile(runnable);
		} catch (InvocationTargetException e) {
		} catch (InterruptedException e) {
		}
		return fModels;
	}

	private File createPath(IPath dropLocation) {
		File featuresDir = new File(dropLocation.toFile(), ICoreConstants.FEATURE_FOLDER_NAME);
		if (featuresDir.exists())
			return featuresDir;
		return null;
	}

	private MultiStatus doLoadFeatures(ArrayList result, File path) {
		if (path == null)
			return null;
		File[] dirs = path.listFiles();
		if (dirs == null)
			return null;
		ArrayList resultStatus = new ArrayList();
		for (int i = 0; i < dirs.length; i++) {
			File dir = dirs[i];
			if (dir.isDirectory()) {
				File manifest = new File(dir, ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
				if (manifest.exists()) {
					IStatus status = doLoadFeature(dir, manifest, result);
					if (status != null)
						resultStatus.add(status);
				}
			}
		}
		return new MultiStatus(IPDEUIConstants.PLUGIN_ID, IStatus.OK, (IStatus[]) resultStatus.toArray(new IStatus[resultStatus.size()]), PDEUIMessages.FeatureImportWizard_DetailedPage_problemsLoading, null);
	}

	private IStatus doLoadFeature(File dir, File manifest, ArrayList result) {
		ExternalFeatureModel model = new ExternalFeatureModel();
		model.setInstallLocation(dir.getAbsolutePath());
		IStatus status = null;

		InputStream stream = null;

		try {
			stream = new BufferedInputStream(new FileInputStream(manifest));
			model.load(stream, false);
			if (!model.isValid()) {
				status = new Status(IStatus.WARNING, IPDEUIConstants.PLUGIN_ID, IStatus.OK, NLS.bind(PDEUIMessages.FeatureImportWizardPage_importHasInvalid, dir), null);
			}
		} catch (Exception e) {
			// Errors in the file
			status = new Status(IStatus.ERROR, IPDEUIConstants.PLUGIN_ID, IStatus.OK, e.getMessage(), e);
		}
		if (stream != null) {
			try {
				stream.close();
			} catch (IOException e) {
			}
		}
		if (status == null)
			result.add(model);
		return status;
	}

	public IFeatureModel[] getSelectedModels() {
		Object[] selected = fFeatureViewer.getCheckedElements();
		IFeatureModel[] result = new IFeatureModel[selected.length];
		System.arraycopy(selected, 0, result, 0, selected.length);
		return result;
	}

	private void dialogChanged() {
		String message = null;
		if (fFeatureViewer != null && fFeatureViewer.getTable().getItemCount() == 0)
			message = PDEUIMessages.FeatureImportWizard_messages_noFeatures;

		setMessage(message, IMessageProvider.INFORMATION);
		setPageComplete(fTablePart.getSelectionCount() > 0);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
	 */
	public boolean isPageComplete() {
		return fTablePart.getSelectionCount() > 0;
	}

	private void setLocation(String location) {
		fSelfSetLocation = true;
		fDropLocation.setText(location);
		fSelfSetLocation = false;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.io.IOException;
import java.util.*;
import java.util.jar.JarFile;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import org.eclipse.core.resources.*;

import org.eclipse.pde.internal.core.bundle.WorkspaceBundleModel;
import org.eclipse.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;

			monitor.beginTask("", 4); //$NON-NLS-1$

			// Extract the source, track build entries and package locations
			WorkspaceBuildModel buildModel = new WorkspaceBuildModel(PDEProject.getBuildProperties(project));
			Map packageLocations = new HashMap(); // maps package path to a src folder 
			boolean sourceFound = extractSourceFolders(project, model, buildModel, packageLocations, new SubProgressMonitor(monitor, 1));
			// If no source was found previously, check if there was a source folder (src) inside the binary plug-in

	 * @param base
	 */
	private void modifyBundleClasspathHeader(IProject project, IPluginModelBase base) {
		IFile file = PDEProject.getManifest(project);
		if (file.exists()) {
			WorkspaceBundleModel bmodel = new WorkspaceBundleModel(file);
			IBundle bundle = bmodel.getBundle();

		}

		// If the build.properties file has a default source folder we need a java nature
		IFile buildProperties = PDEProject.getBuildProperties(project);
		if (buildProperties.exists()) {
			WorkspaceBuildModel buildModel = new WorkspaceBuildModel(buildProperties);
			buildModel.load();

Lines 24-29 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java (-1 / +2 lines)
24	import org.eclipse.pde.core.plugin.PluginRegistry;	24	import org.eclipse.pde.core.plugin.PluginRegistry;
25	import org.eclipse.pde.internal.core.WorkspaceModelManager;	25	import org.eclipse.pde.internal.core.WorkspaceModelManager;
26	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	26	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
		27	import org.eclipse.pde.internal.core.project.PDEProject;
27	import org.eclipse.pde.internal.ui.*;	28	import org.eclipse.pde.internal.ui.*;
28	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;	29	import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
29	import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;	30	import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
Lines 241-247 Link Here
241	try {	242	try {
242	IBuildModel buildModel = model.getBuildModel();	243	IBuildModel buildModel = model.getBuildModel();
243	if (buildModel == null) {	244	if (buildModel == null) {
244	IFile buildFile = model.getUnderlyingResource().getProject().getFile("build.properties"); //$NON-NLS-1$	245	IFile buildFile = PDEProject.getBuildProperties(model.getUnderlyingResource().getProject());
245	if (buildFile.exists()) {	246	if (buildFile.exists()) {
246	buildModel = new WorkspaceBuildModel(buildFile);	247	buildModel = new WorkspaceBuildModel(buildFile);
247	buildModel.load();	248	buildModel.load();




/*******************************************************************************
 * Copyright (c) 2000, 2010 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.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.search.dependencies.AddNewBinaryDependenciesOperation;
import org.eclipse.pde.internal.ui.wizards.IProjectProvider;

			if (resources[j] instanceof IFile) {
				if (".project".equals(resources[j].getName()) //$NON-NLS-1$
						|| ".classpath".equals(resources[j] //$NON-NLS-1$
								.getName()) || ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR.equals(resources[j].getName()) || ICoreConstants.BUILD_FILENAME_DESCRIPTOR.equals(resources[j].getName())) {
								.getName()) || "build.properties".equals(resources[j] //$NON-NLS-1$
								.getName())) {
					continue;
				}
				// resource at the root, export root

		}
		if (requiredProjects.size() <= 0)
			return;
		IFile file = PDEProject.getManifest(javaProject.getProject());
		try {
			// TODO format manifest
			Manifest manifest = new Manifest(file.getContents());

		IProject other = workspaceRoot.getProject(entry.getPath().segment(0));
		if (!PDE.hasPluginNature(other))
			return false;
		if (PDEProject.getFragmentXml(other).exists())
			return false;
		try {
			InputStream is = PDEProject.getManifest(other).getContents();
			try {
				Manifest mf = new Manifest(is);
				if (mf.getMainAttributes().getValue(Constants.FRAGMENT_HOST) != null)

		}

		// delete manifest.mf imported from libraries
		IFile importedManifest = PDEProject.getManifest(project);
		if (importedManifest.exists()) {
			importedManifest.delete(true, false, monitor);
			if (!fData.hasBundleStructure()) {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java (-6 / +10 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 30-35 Link Here
30	import org.eclipse.pde.internal.core.ibundle.*;	30	import org.eclipse.pde.internal.core.ibundle.*;
31	import org.eclipse.pde.internal.core.natures.PDE;	31	import org.eclipse.pde.internal.core.natures.PDE;
32	import org.eclipse.pde.internal.core.plugin.*;	32	import org.eclipse.pde.internal.core.plugin.*;
		33	import org.eclipse.pde.internal.core.project.PDEProject;
33	import org.eclipse.pde.internal.core.util.CoreUtility;	34	import org.eclipse.pde.internal.core.util.CoreUtility;
34	import org.eclipse.pde.internal.ui.PDEPlugin;	35	import org.eclipse.pde.internal.ui.PDEPlugin;
35	import org.eclipse.pde.internal.ui.PDEUIMessages;	36	import org.eclipse.pde.internal.ui.PDEUIMessages;
Lines 90-96 Link Here
90	}	91	}
91		92
92	private void createBuildPropertiesFile(IProject project) throws CoreException {	93	private void createBuildPropertiesFile(IProject project) throws CoreException {
93	IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);	94	IFile file = PDEProject.getBuildProperties(project);
94	if (!file.exists()) {	95	if (!file.exists()) {
95	WorkspaceBuildModel model = new WorkspaceBuildModel(file);	96	WorkspaceBuildModel model = new WorkspaceBuildModel(file);
96	IBuildModelFactory factory = model.getFactory();	97	IBuildModelFactory factory = model.getFactory();
Lines 133-149 Link Here
133	}	134	}
134		135
135	private void createManifest(IProject project) throws CoreException {	136	private void createManifest(IProject project) throws CoreException {
		137	IFile fragmentXml = PDEProject.getFragmentXml(project);
		138	IFile pluginXml = PDEProject.getPluginXml(project);
136	if (fData.hasBundleStructure()) {	139	if (fData.hasBundleStructure()) {
		140	IFile manifest = PDEProject.getManifest(project);
137	if (fData instanceof IFragmentFieldData) {	141	if (fData instanceof IFragmentFieldData) {
138	fModel = new WorkspaceBundleFragmentModel(project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR), project.getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR));	142	fModel = new WorkspaceBundleFragmentModel(manifest, fragmentXml);
139	} else {	143	} else {
140	fModel = new WorkspaceBundlePluginModel(project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR), project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));	144	fModel = new WorkspaceBundlePluginModel(manifest, pluginXml);
141	}	145	}
142	} else {	146	} else {
143	if (fData instanceof IFragmentFieldData) {	147	if (fData instanceof IFragmentFieldData) {
144	fModel = new WorkspaceFragmentModel(project.getFile(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR), false);	148	fModel = new WorkspaceFragmentModel(fragmentXml, false);
145	} else {	149	} else {
146	fModel = new WorkspacePluginModel(project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), false);	150	fModel = new WorkspacePluginModel(pluginXml, false);
147	}	151	}
148	}	152	}
149	IPluginBase pluginBase = fModel.getPluginBase();	153	IPluginBase pluginBase = fModel.getPluginBase();




/*******************************************************************************
 *  Copyright (c) 2005, 2010 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.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.plugin.WorkspaceFragmentModel;
import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.bundle.BundleSymbolicNameHeader;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;

	protected IFile getFile() {
		IPluginModelBase model = PluginRegistry.findModel(fPluginId);
		IProject project = model.getUnderlyingResource().getProject();
		return model instanceof IFragmentModel ? PDEProject.getFragmentXml(project) : PDEProject.getPluginXml(project);
		return project.getFile(filename);
	}

	protected IPluginModelBase getModel(IFile file) {
		if (ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR.equals(file.getName()))
			return new WorkspacePluginModel(file, false);
		return new WorkspaceFragmentModel(file, false);
	}




/*******************************************************************************
 * Copyright (c) 2007, 2010 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.pde.core.build.IBuildEntry;
import org.eclipse.pde.core.build.IBuildModel;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.text.build.BuildModel;
import org.eclipse.pde.internal.core.text.build.PropertiesTextChangeListener;
import org.eclipse.pde.internal.core.util.PDETextHelper;

		pluginCustomModel.save();

		// add the file to build.properties
		IFile buildProps = PDEProject.getBuildProperties(fProject);
		if (buildProps.exists()) {
			WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);
			model.load();




/*******************************************************************************
 * Copyright (c) 2007, 2010 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.pde.internal.core.ibundle.IBundle;
import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.core.util.IdUtil;
import org.eclipse.pde.internal.ui.PDEPlugin;

		loadClasspathEntries(projectToConvert, monitor);
		loadLibraryName(projectToConvert);

		createManifestFile(PDEProject.getManifest(projectToConvert), monitor);

		IFile buildFile = PDEProject.getBuildProperties(projectToConvert);
		if (!buildFile.exists()) {
			WorkspaceBuildModel model = new WorkspaceBuildModel(buildFile);
			IBuild build = model.getBuild(true);
			IBuildEntry entry = model.getFactory().createEntry(IBuildEntry.BIN_INCLUDES);
			if (PDEProject.getPluginXml(projectToConvert).exists())
				entry.addToken(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
			if (PDEProject.getManifest(projectToConvert).exists())
				entry.addToken(ICoreConstants.MANIFEST_FOLDER_NAME);
			for (int i = 0; i < fLibEntries.length; i++) {
				entry.addToken(fLibEntries[i]);

	}

	private void organizeExports(final IProject project) {
		PDEModelUtility.modifyModel(new ModelModification(PDEProject.getManifest(project)) {
			protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
				if (!(model instanceof IBundlePluginModelBase))
					return;




/*******************************************************************************
 * Copyright (c) 2005, 2010 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.pde.internal.core.*;
import org.eclipse.pde.internal.core.ibundle.*;
import org.eclipse.pde.internal.core.ischema.*;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.core.schema.SchemaRegistry;
import org.eclipse.pde.internal.core.text.*;
import org.eclipse.pde.internal.core.text.bundle.*;

		IExtensions ext = modelBase.getExtensions();
		if (ext.getExtensionPoints().length > 0 || ext.getExtensions().length > 0)
			return null;
		IFile pluginFile = (modelBase instanceof IBundleFragmentModel) ? PDEProject.getFragmentXml(project) : PDEProject.getPluginXml(project);
		IFile pluginFile = project.getFile(name);
		return new DeleteResourceChange(pluginFile.getFullPath(), true);
	}


Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifestsAction.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 19-25 Link Here
19	import org.eclipse.jface.viewers.ISelection;	19	import org.eclipse.jface.viewers.ISelection;
20	import org.eclipse.jface.viewers.IStructuredSelection;	20	import org.eclipse.jface.viewers.IStructuredSelection;
21	import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;	21	import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
22	import org.eclipse.pde.internal.core.ICoreConstants;	22	import org.eclipse.pde.internal.core.project.PDEProject;
23	import org.eclipse.pde.internal.ui.PDEPlugin;	23	import org.eclipse.pde.internal.ui.PDEPlugin;
24	import org.eclipse.pde.internal.ui.PDEUIMessages;	24	import org.eclipse.pde.internal.ui.PDEUIMessages;
25	import org.eclipse.pde.internal.ui.refactoring.PDERefactor;	25	import org.eclipse.pde.internal.ui.refactoring.PDERefactor;
Lines 55-61 Link Here
55	proj = ((IFile) element).getProject();	55	proj = ((IFile) element).getProject();
56	else if (element instanceof IProject)	56	else if (element instanceof IProject)
57	proj = (IProject) element;	57	proj = (IProject) element;
58	if (proj != null && proj.exists(ICoreConstants.MANIFEST_PATH))	58	if (proj != null && PDEProject.getManifest(proj).exists())
59	projects.add(proj);	59	projects.add(proj);
60	}	60	}
61	if (projects.size() > 0) {	61	if (projects.size() > 0) {

Lines 10-15 Link Here

(-)src/org/eclipse/pde/ui/tests/model/xml/ManifestEditorSpellCheckTestCase.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.model.xml;	11	package org.eclipse.pde.ui.tests.model.xml;
12		12
		13	import org.eclipse.pde.internal.core.ICoreConstants;
		14
13	import junit.framework.Test;	15	import junit.framework.Test;
14	import junit.framework.TestSuite;	16	import junit.framework.TestSuite;
15		17
Lines 63-69 Link Here
63	public void testNoSpellingAnnotation(){	65	public void testNoSpellingAnnotation(){
64		66
65	try {	67	try {
66	createAndOpenFile("plugin.xml", fDocument.get());	68	createAndOpenFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR, fDocument.get());
67	} catch (CoreException e) {	69	} catch (CoreException e) {
68	fail(e.getMessage());	70	fail(e.getMessage());
69	e.printStackTrace();	71	e.printStackTrace();




/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.ui.tests.project;

import org.eclipse.pde.core.project.IBundleProjectService;

import org.eclipse.pde.internal.core.PDECore;

import junit.framework.TestCase;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.core.project.*;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.osgi.framework.Version;

/**
 * Tests flexible bundle root location within PDE projects.
 * @since 3.6
 */
public class BundleRootTests extends TestCase {
	
	protected IBundleProjectService getBundleProjectService() {
		return (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
	}
	
	/**
	 * Creates and returns a project for the test case.
	 * 
	 * @param test test case
	 * @return project test project
	 * @exception CoreException on failure
	 */
	protected IProject createProject() throws CoreException {
		String name = getName().toLowerCase().substring(4);
		name = "test." + name;
		IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
		assertFalse("Project should not exist", proj.exists());
		proj.create(null);
		proj.open(null);
		return proj;
	}
	
	/**
	 * Provides a project for the test case.
	 * 
	 * @param test test case
	 * @return project which does not yet exist
	 * @exception CoreException on failure
	 */
	protected IBundleProjectDescription newProject() throws CoreException {
		String name = getName().toLowerCase().substring(4);
		name = "test." + name;
		IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
		assertFalse("Project should not exist", proj.exists());
		IBundleProjectDescription description = getBundleProjectService().getDescription(proj);
		description.setSymbolicName(proj.getName());
		return description;
	}	

	/**
	 * Tests setting/getting the bundle root property for a project.
	 */
	public void testSetGetLocation() throws CoreException {
		IProject project = createProject();
		assertEquals("Bundle root unspecified - should be project itself", project, PDEProject.getBundleRoot(project));
		// set to something
		IFolder folder = project.getFolder(new Path("bundle/root"));
		PDEProject.setBundleRoot(project, folder);
		assertEquals("Wrong bundle root", folder, PDEProject.getBundleRoot(project));	
		// set to null
		PDEProject.setBundleRoot(project, null);
		assertEquals("Bundle root unspecified - should be project itself", project, PDEProject.getBundleRoot(project));
		// set to empty project itself
		PDEProject.setBundleRoot(project, project);
		assertEquals("Bundle root unspecified - should be project itself", project, PDEProject.getBundleRoot(project));
	}
	
	/**
	 * Test getting a root location from a non-existent project
	 */
	public void testGetOnNonExistantProject() {
		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getName());
		assertFalse("Project should not exist", project.exists());
		assertEquals("Root location should be project root", project, PDEProject.getBundleRoot(project));
	}
	
	/**
	 * Tests that IPluginModel.getInstallLocation() returns the bundle root location in a project.
	 * @throws CoreException 
	 */
	public void testPluginModelInstallLocation() throws CoreException {
		IBundleProjectDescription description = newProject();
		IProject project = description.getProject();
		IPath root = new Path("some/place");
		description.setBundleRoot(root);
		IBundleClasspathEntry cp1 = getBundleProjectService().newBundleClasspathEntry(new Path("src"), new Path("bin"), new Path("the.jar"));
		description.setBundleClassath(new IBundleClasspathEntry[]{cp1});
		IPath nls = new Path("plugin.properties");
		description.setLocalization(nls);
		description.apply(null);
		
		IPluginModelBase model = PluginRegistry.findModel(project);
		assertEquals("Wrong install location", project.getFolder(root).getLocation(), new Path(model.getInstallLocation()));
	}
	
	/**
	 * Minimal bundle project with a non-default root - set a symbolic name, and go.
	 * 
	 * @throws CoreException
	 */
	public void testBundleRoot() throws CoreException {
		IBundleProjectDescription description = newProject();
		IProject project = description.getProject();
		IPath root = new Path("bundle/root");
		description.setBundleRoot(root);
		IBundleClasspathEntry cp1 = getBundleProjectService().newBundleClasspathEntry(new Path("src"), new Path("bin"), new Path("the.jar"));
		description.setBundleClassath(new IBundleClasspathEntry[]{cp1});
		IPath nls = new Path("plugin.properties");
		description.setLocalization(nls);
		description.setActivator("org.eclipse.foo.SomeActivator");
		description.apply(null);
		
		IBundleProjectDescription d2 = getBundleProjectService().getDescription(project);
		
		assertEquals("Wrong bundle root", root, d2.getBundleRoot());
		assertEquals("Should be no activator", "org.eclipse.foo.SomeActivator", d2.getActivator());
		IPath[] binIncludes = d2.getBinIncludes();
		assertNull("Wrong number of entries on bin.includes", binIncludes);
		IBundleClasspathEntry[] classpath = d2.getBundleClasspath();
		assertNotNull("Wrong Bundle-Classpath", classpath);
		assertEquals("Wrong number of Bundle-Classpath entries", 1, classpath.length);
		assertEquals("Wrong Bundle-Classpath entry", cp1, classpath[0]);
		assertEquals("Wrong Bundle-Name", project.getName(), d2.getBundleName());
		assertNull("Wrong Bundle-Vendor", d2.getBundleVendor());
		assertEquals("Wrong version", "1.0.0.qualifier", d2.getBundleVersion().toString());
		assertEquals("Wrong default output folder", new Path("bin"), d2.getDefaultOutputFolder());
		assertNull("Wrong execution environments", d2.getExecutionEnvironments());
		assertNull("Wrong host", d2.getHost());
		assertEquals("Wrong localization", nls, d2.getLocalization());
		assertNull("Wrong project location URI", d2.getLocationURI());
		String[] natureIds = d2.getNatureIds();
		assertEquals("Wrong number of natures", 2, natureIds.length);
		assertEquals("Wrong nature", PDE.PLUGIN_NATURE, natureIds[0]);
		assertEquals("Wrong nature", JavaCore.NATURE_ID, natureIds[1]);
		assertNull("Wrong imports", d2.getPackageImports());
		assertNull("Wrong exports", d2.getPackageExports());
		assertEquals("Wrong project", project, d2.getProject());
		assertNull("Wrong required bundles", d2.getRequiredBundles());
		assertNull("Wrong target version", d2.getTargetVersion());
		assertEquals("Wrong symbolic name", project.getName(), d2.getSymbolicName());
		assertFalse("Wrong Equinox headers", d2.isEquinoxHeaders());
		assertFalse("Wrong singleton", d2.isSingleton());
	}
	
	/**
	 * Creates a bundle project at a root location, and then removes PDE/Java natures. Then attempts create
	 * a bundle project out of the existing data.
	 * 
	 * @throws CoreException
	 */
	public void testAssignRootToExistingProject() throws CoreException {
		testBundleRoot(); // create a simple bundle
		
		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("test.assignroottoexistingproject");
		
		// remove PDE nature
		IProjectDescription description = project.getDescription();
		description.setNatureIds(new String[]{JavaCore.NATURE_ID});
		project.setDescription(description, null);
		
		// remove existing root property
		PDEProject.setBundleRoot(project, null);
		
		IBundleProjectService service = getBundleProjectService();
		// reset the root
		Path root = new Path("bundle/root");
		service.setBundleRoot(project, root);
		
		// Resurrect the bundle project, with a modified version
		IBundleProjectDescription bpd = service.getDescription(project);
		bpd.setBundleVendor("Some Vendor");
		bpd.setBundleVersion(new Version("2.0.0"));
		bpd.setNatureIds(new String[]{PDE.PLUGIN_NATURE, JavaCore.NATURE_ID});
		bpd.apply(null);
		
		// validate
		IBundleProjectDescription d2 = service.getDescription(project);
		IPath nls = new Path("plugin.properties");
		IBundleClasspathEntry cp1 = service.newBundleClasspathEntry(new Path("src"), new Path("bin"), new Path("the.jar"));
		
		assertEquals("Wrong bundle root", root, d2.getBundleRoot());
		assertEquals("Should be no activator", "org.eclipse.foo.SomeActivator", d2.getActivator());
		IPath[] binIncludes = d2.getBinIncludes();
		assertNull("Wrong number of entries on bin.includes", binIncludes);
		IBundleClasspathEntry[] classpath = d2.getBundleClasspath();
		assertNotNull("Wrong Bundle-Classpath", classpath);
		assertEquals("Wrong number of Bundle-Classpath entries", 1, classpath.length);
		assertEquals("Wrong Bundle-Classpath entry", cp1, classpath[0]);
		assertEquals("Wrong Bundle-Name", project.getName(), d2.getBundleName());
		assertEquals("Wrong Bundle-Vendor", "Some Vendor", d2.getBundleVendor());
		assertEquals("Wrong version", "2.0.0", d2.getBundleVersion().toString());
		assertEquals("Wrong default output folder", new Path("bin"), d2.getDefaultOutputFolder());
		assertNull("Wrong execution environments", d2.getExecutionEnvironments());
		assertNull("Wrong host", d2.getHost());
		assertEquals("Wrong localization", nls, d2.getLocalization());
		assertNull("Wrong project location URI", d2.getLocationURI());
		String[] natureIds = d2.getNatureIds();
		assertEquals("Wrong number of natures", 2, natureIds.length);
		assertEquals("Wrong nature", PDE.PLUGIN_NATURE, natureIds[0]);
		assertEquals("Wrong nature", JavaCore.NATURE_ID, natureIds[1]);
		assertNull("Wrong imports", d2.getPackageImports());
		assertNull("Wrong exports", d2.getPackageExports());
		assertEquals("Wrong project", project, d2.getProject());
		assertNull("Wrong required bundles", d2.getRequiredBundles());
		assertNull("Wrong target version", d2.getTargetVersion());
		assertEquals("Wrong symbolic name", project.getName(), d2.getSymbolicName());
		assertFalse("Wrong Equinox headers", d2.isEquinoxHeaders());
		assertFalse("Wrong singleton", d2.isSingleton());
	}
}

Lines 10-15 Link Here

(-)src/org/eclipse/pde/ui/tests/project/ProjectCreationTests.java (-56 / +81 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.ui.tests.project;	11	package org.eclipse.pde.ui.tests.project;
12		12
		13	import org.eclipse.pde.core.project.IBundleProjectService;
		14
		15	import org.eclipse.pde.internal.core.PDECore;
		16
		17	import org.eclipse.pde.internal.core.ICoreConstants;
		18
13	import java.io.*;	19	import java.io.*;
14	import java.net.URL;	20	import java.net.URL;
15	import junit.framework.*;	21	import junit.framework.*;
Lines 29-35 Link Here
29	*/	35	*/
30	public class ProjectCreationTests extends TestCase {	36	public class ProjectCreationTests extends TestCase {
31		37
32	private static final IBundleClasspathEntry DEFAULT_BUNDLE_CLASSPATH_ENTRY = Factory.newBundleClasspathEntry(null, null, new Path("."));	38	protected static final IBundleClasspathEntry DEFAULT_BUNDLE_CLASSPATH_ENTRY;
		39
		40	static {
		41	DEFAULT_BUNDLE_CLASSPATH_ENTRY = getBundleProjectService().newBundleClasspathEntry(null, null, new Path("."));
		42	}
		43
		44	public static IBundleProjectService getBundleProjectService() {
		45	return (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
		46	}
33		47
34	public static Test suite() {	48	public static Test suite() {
35	return new TestSuite(ProjectCreationTests.class);	49	return new TestSuite(ProjectCreationTests.class);
Lines 47-53 Link Here
47	name = "test." + name;	61	name = "test." + name;
48	IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);	62	IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
49	assertFalse("Project should not exist", proj.exists());	63	assertFalse("Project should not exist", proj.exists());
50	IBundleProjectDescription description = Factory.getDescription(proj);	64	IBundleProjectDescription description = getBundleProjectService().getDescription(proj);
51	description.setSymbolicName(proj.getName());	65	description.setSymbolicName(proj.getName());
52	return description;	66	return description;
53	}	67	}
Lines 62-68 Link Here
62	IProject project = description.getProject();	76	IProject project = description.getProject();
63	description.apply(null);	77	description.apply(null);
64		78
65	IBundleProjectDescription d2 = Factory.getDescription(project);	79	IBundleProjectDescription d2 = getBundleProjectService().getDescription(project);
66		80
67	assertNull("Should be no activator", d2.getActivator());	81	assertNull("Should be no activator", d2.getActivator());
68	IPath[] binIncludes = d2.getBinIncludes();	82	IPath[] binIncludes = d2.getBinIncludes();
Lines 101-111 Link Here
101	public void testFragment() throws CoreException {	115	public void testFragment() throws CoreException {
102	IBundleProjectDescription description = newProject();	116	IBundleProjectDescription description = newProject();
103	IProject project = description.getProject();	117	IProject project = description.getProject();
104	IHostDescription host = Factory.newHost("some.host", null);	118	IBundleProjectService service = getBundleProjectService();
		119	IHostDescription host = service.newHost("some.host", null);
105	description.setHost(host);	120	description.setHost(host);
106	description.apply(null);	121	description.apply(null);
107		122
108	IBundleProjectDescription d2 = Factory.getDescription(project);	123	IBundleProjectDescription d2 = service.getDescription(project);
109		124
110	assertNull("Should be no activator", d2.getActivator());	125	assertNull("Should be no activator", d2.getActivator());
111	IPath[] binIncludes = d2.getBinIncludes();	126	IPath[] binIncludes = d2.getBinIncludes();
Lines 145-157 Link Here
145	IBundleProjectDescription description = newProject();	160	IBundleProjectDescription description = newProject();
146	IProject project = description.getProject();	161	IProject project = description.getProject();
147	description.setBundleVersion(new Version("1.2.2"));	162	description.setBundleVersion(new Version("1.2.2"));
148	IHostDescription host = Factory.newHost("some.host", new VersionRange(new Version("1.0.0"), true, new Version("2.0.0"), false));	163	IBundleProjectService service = getBundleProjectService();
		164	IHostDescription host = service.newHost("some.host", new VersionRange(new Version("1.0.0"), true, new Version("2.0.0"), false));
149	description.setHost(host);	165	description.setHost(host);
150	IBundleClasspathEntry e1 = Factory.newBundleClasspathEntry(new Path("frag"), new Path("bin"), new Path("frag.jar"));	166	IBundleClasspathEntry e1 = service.newBundleClasspathEntry(new Path("frag"), new Path("bin"), new Path("frag.jar"));
151	description.setBundleClassath(new IBundleClasspathEntry[]{e1});	167	description.setBundleClassath(new IBundleClasspathEntry[]{e1});
152	description.apply(null);	168	description.apply(null);
153		169
154	IBundleProjectDescription d2 = Factory.getDescription(project);	170	IBundleProjectDescription d2 = service.getDescription(project);
155		171
156	assertNull("Should be no activator", d2.getActivator());	172	assertNull("Should be no activator", d2.getActivator());
157	IPath[] binIncludes = d2.getBinIncludes();	173	IPath[] binIncludes = d2.getBinIncludes();
Lines 190-202 Link Here
190	public void testTwoSourceFoldersOneJar() throws CoreException {	206	public void testTwoSourceFoldersOneJar() throws CoreException {
191	IBundleProjectDescription description = newProject();	207	IBundleProjectDescription description = newProject();
192	IProject project = description.getProject();	208	IProject project = description.getProject();
193	IBundleClasspathEntry e1 = Factory.newBundleClasspathEntry(new Path("src1"), null, new Path("the.jar"));	209	IBundleProjectService service = getBundleProjectService();
194	IBundleClasspathEntry e2 = Factory.newBundleClasspathEntry(new Path("src2"), null, new Path("the.jar"));	210	IBundleClasspathEntry e1 = service.newBundleClasspathEntry(new Path("src1"), null, new Path("the.jar"));
		211	IBundleClasspathEntry e2 = service.newBundleClasspathEntry(new Path("src2"), null, new Path("the.jar"));
195	description.setBundleClassath(new IBundleClasspathEntry[]{e1, e2});	212	description.setBundleClassath(new IBundleClasspathEntry[]{e1, e2});
196	description.setBundleVersion(new Version("1.2.3"));	213	description.setBundleVersion(new Version("1.2.3"));
197	description.apply(null);	214	description.apply(null);
198		215
199	IBundleProjectDescription d2 = Factory.getDescription(project);	216	IBundleProjectDescription d2 = service.getDescription(project);
200		217
201	assertNull("Should be no activator", d2.getActivator());	218	assertNull("Should be no activator", d2.getActivator());
202	IPath[] binIncludes = d2.getBinIncludes();	219	IPath[] binIncludes = d2.getBinIncludes();
Lines 236-248 Link Here
236	public void testTwoSourceFoldersTwoJars() throws CoreException {	253	public void testTwoSourceFoldersTwoJars() throws CoreException {
237	IBundleProjectDescription description = newProject();	254	IBundleProjectDescription description = newProject();
238	IProject project = description.getProject();	255	IProject project = description.getProject();
239	IBundleClasspathEntry e1 = Factory.newBundleClasspathEntry(new Path("src1"), null, new Path("."));	256	IBundleProjectService service = getBundleProjectService();
240	IBundleClasspathEntry e2 = Factory.newBundleClasspathEntry(new Path("src2"), new Path("bin2"), new Path("two.jar"));	257	IBundleClasspathEntry e1 = service.newBundleClasspathEntry(new Path("src1"), null, new Path("."));
		258	IBundleClasspathEntry e2 = service.newBundleClasspathEntry(new Path("src2"), new Path("bin2"), new Path("two.jar"));
241	description.setBundleClassath(new IBundleClasspathEntry[]{e1, e2});	259	description.setBundleClassath(new IBundleClasspathEntry[]{e1, e2});
242	description.setBundleVersion(new Version("1.2.3"));	260	description.setBundleVersion(new Version("1.2.3"));
243	description.apply(null);	261	description.apply(null);
244		262
245	IBundleProjectDescription d2 = Factory.getDescription(project);	263	IBundleProjectDescription d2 = service.getDescription(project);
246		264
247	assertNull("Should be no activator", d2.getActivator());	265	assertNull("Should be no activator", d2.getActivator());
248	IPath[] binIncludes = d2.getBinIncludes();	266	IPath[] binIncludes = d2.getBinIncludes();
Lines 283-290 Link Here
283	IProject project = description.getProject();	301	IProject project = description.getProject();
284	description.setSingleton(true);	302	description.setSingleton(true);
285	description.apply(null);	303	description.apply(null);
286		304	IBundleProjectService service = getBundleProjectService();
287	IBundleProjectDescription d2 = Factory.getDescription(project);	305	IBundleProjectDescription d2 = service.getDescription(project);
288	assertNull("Should be no activator", d2.getActivator());	306	assertNull("Should be no activator", d2.getActivator());
289	IPath[] binIncludes = d2.getBinIncludes();	307	IPath[] binIncludes = d2.getBinIncludes();
290	assertNull("Wrong number of entries on bin.includes", binIncludes);	308	assertNull("Wrong number of entries on bin.includes", binIncludes);
Lines 324-339 Link Here
324	IProject project = description.getProject();	342	IProject project = description.getProject();
325	description.setSingleton(true);	343	description.setSingleton(true);
326	IPath src = new Path("src");	344	IPath src = new Path("src");
327	IBundleClasspathEntry spec = Factory.newBundleClasspathEntry(src, null, new Path("."));	345	IBundleProjectService service = getBundleProjectService();
		346	IBundleClasspathEntry spec = service.newBundleClasspathEntry(src, null, new Path("."));
328	description.setBundleClassath(new IBundleClasspathEntry[] {spec});	347	description.setBundleClassath(new IBundleClasspathEntry[] {spec});
329	IPackageExportDescription ex0 = Factory.newPackageExport("a.b.c", new Version("2.0.0"), true, null);	348	IPackageExportDescription ex0 = service.newPackageExport("a.b.c", new Version("2.0.0"), true, null);
330	IPackageExportDescription ex1 = Factory.newPackageExport("a.b.c.interal", null, false, null);	349	IPackageExportDescription ex1 = service.newPackageExport("a.b.c.interal", null, false, null);
331	IPackageExportDescription ex2 = Factory.newPackageExport("a.b.c.interal.x", null, false, new String[]{"x.y.z"});	350	IPackageExportDescription ex2 = service.newPackageExport("a.b.c.interal.x", null, false, new String[]{"x.y.z"});
332	IPackageExportDescription ex3 = Factory.newPackageExport("a.b.c.interal.y", new Version("1.2.3"), false, new String[]{"d.e.f", "g.h.i"});	351	IPackageExportDescription ex3 = service.newPackageExport("a.b.c.interal.y", new Version("1.2.3"), false, new String[]{"d.e.f", "g.h.i"});
333	description.setPackageExports(new IPackageExportDescription[]{ex0, ex1, ex2, ex3});	352	description.setPackageExports(new IPackageExportDescription[]{ex0, ex1, ex2, ex3});
334	description.apply(null);	353	description.apply(null);
335		354
336	IBundleProjectDescription d2 = Factory.getDescription(project);	355	IBundleProjectDescription d2 = service.getDescription(project);
337	assertNull("Should be no activator", d2.getActivator());	356	assertNull("Should be no activator", d2.getActivator());
338	IPath[] binIncludes = d2.getBinIncludes();	357	IPath[] binIncludes = d2.getBinIncludes();
339	assertNull("Wrong number of entries on bin.includes", binIncludes);	358	assertNull("Wrong number of entries on bin.includes", binIncludes);
Lines 379-396 Link Here
379	IProject project = description.getProject();	398	IProject project = description.getProject();
380	description.setSingleton(true);	399	description.setSingleton(true);
381	IPath src = new Path("src");	400	IPath src = new Path("src");
382	IBundleClasspathEntry spec = Factory.newBundleClasspathEntry(src, null, new Path("."));	401	IBundleProjectService service = getBundleProjectService();
		402	IBundleClasspathEntry spec = service.newBundleClasspathEntry(src, null, new Path("."));
383	description.setBundleClassath(new IBundleClasspathEntry[] {spec});	403	description.setBundleClassath(new IBundleClasspathEntry[] {spec});
384	description.apply(null);	404	description.apply(null);
385		405
386	// modify	406	// modify
387	IBundleProjectDescription modify = Factory.getDescription(project);	407	IBundleProjectDescription modify = service.getDescription(project);
388	IHostDescription host = Factory.newHost("host." + project.getName(), new VersionRange("[1.0.0,2.0.0)"));	408	IHostDescription host = service.newHost("host." + project.getName(), new VersionRange("[1.0.0,2.0.0)"));
389	modify.setHost(host);	409	modify.setHost(host);
390	modify.apply(null);	410	modify.apply(null);
391		411
392	// validate	412	// validate
393	IBundleProjectDescription d2 = Factory.getDescription(project);	413	IBundleProjectDescription d2 = service.getDescription(project);
394	assertNull("Should be no activator", d2.getActivator());	414	assertNull("Should be no activator", d2.getActivator());
395	IPath[] binIncludes = d2.getBinIncludes();	415	IPath[] binIncludes = d2.getBinIncludes();
396	assertNull("Wrong number of entries on bin.includes", binIncludes);	416	assertNull("Wrong number of entries on bin.includes", binIncludes);
Lines 431-457 Link Here
431	IProject project = description.getProject();	451	IProject project = description.getProject();
432	description.setSingleton(true);	452	description.setSingleton(true);
433	IPath src = new Path("src");	453	IPath src = new Path("src");
434	IBundleClasspathEntry spec = Factory.newBundleClasspathEntry(src, null, new Path("."));	454	IBundleProjectService service = getBundleProjectService();
		455	IBundleClasspathEntry spec = service.newBundleClasspathEntry(src, null, new Path("."));
435	description.setBundleClassath(new IBundleClasspathEntry[] {spec});	456	description.setBundleClassath(new IBundleClasspathEntry[] {spec});
436	description.setBinIncludes(new IPath[]{new Path("plugin.xml")});	457	description.setBinIncludes(new IPath[]{new Path(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR)});
437	description.setActivator("org.eclipse.foo.Activator");	458	description.setActivator("org.eclipse.foo.Activator");
438	description.setEqunioxHeaders(true);	459	description.setEqunioxHeaders(true);
439	description.setExecutionEnvironments(new String[]{"J2SE-1.4"});	460	description.setExecutionEnvironments(new String[]{"J2SE-1.4"});
440	IRequiredBundleDescription rb1 = Factory.newRequiredBundle(	461	IRequiredBundleDescription rb1 = service.newRequiredBundle(
441	"org.eclipse.core.resources",	462	"org.eclipse.core.resources",
442	new VersionRange(new Version(3,5,0), true, new Version(4,0,0), false),	463	new VersionRange(new Version(3,5,0), true, new Version(4,0,0), false),
443	true, false);	464	true, false);
444	IRequiredBundleDescription rb2 = Factory.newRequiredBundle("org.eclipse.core.variables", null, false, false);	465	IRequiredBundleDescription rb2 = service.newRequiredBundle("org.eclipse.core.variables", null, false, false);
445	description.setRequiredBundles(new IRequiredBundleDescription[]{rb1, rb2});	466	description.setRequiredBundles(new IRequiredBundleDescription[]{rb1, rb2});
446	IPackageImportDescription pi1 = Factory.newPackageImport("com.ibm.icu.text", null, false);	467	IPackageImportDescription pi1 = service.newPackageImport("com.ibm.icu.text", null, false);
447	description.setPackageImports(new IPackageImportDescription[]{pi1});	468	description.setPackageImports(new IPackageImportDescription[]{pi1});
448	description.apply(null);	469	description.apply(null);
449		470
450	IBundleProjectDescription d2 = Factory.getDescription(project);	471	IBundleProjectDescription d2 = service.getDescription(project);
451	assertEquals("Wrong activator", "org.eclipse.foo.Activator", d2.getActivator());	472	assertEquals("Wrong activator", "org.eclipse.foo.Activator", d2.getActivator());
452	IPath[] binIncludes = d2.getBinIncludes();	473	IPath[] binIncludes = d2.getBinIncludes();
453	assertEquals("Wrong number of entries on bin.includes", 1, binIncludes.length);	474	assertEquals("Wrong number of entries on bin.includes", 1, binIncludes.length);
454	assertEquals("Wrong bin.includes", new Path("plugin.xml"), binIncludes[0]);	475	assertEquals("Wrong bin.includes", new Path(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), binIncludes[0]);
455	IBundleClasspathEntry[] classpath = d2.getBundleClasspath();	476	IBundleClasspathEntry[] classpath = d2.getBundleClasspath();
456	assertNotNull("Bundle-Classpath should be specified", classpath);	477	assertNotNull("Bundle-Classpath should be specified", classpath);
457	assertEquals("Wrong number of bundle classpath entries", 1, classpath.length);	478	assertEquals("Wrong number of bundle classpath entries", 1, classpath.length);
Lines 496-526 Link Here
496	public void testModifyBundle() throws CoreException {	517	public void testModifyBundle() throws CoreException {
497	IBundleProjectDescription description = newProject();	518	IBundleProjectDescription description = newProject();
498	IProject project = description.getProject();	519	IProject project = description.getProject();
499	IPackageExportDescription ex0 = Factory.newPackageExport("a.b.c", new Version("2.0.0"), true, null);	520	IBundleProjectService service = getBundleProjectService();
500	IPackageExportDescription ex1 = Factory.newPackageExport("a.b.c.interal", null, false, null);	521	IPackageExportDescription ex0 = service.newPackageExport("a.b.c", new Version("2.0.0"), true, null);
501	IPackageExportDescription ex2 = Factory.newPackageExport("a.b.c.interal.x", null, false, new String[]{"x.y.z"});	522	IPackageExportDescription ex1 = service.newPackageExport("a.b.c.interal", null, false, null);
502	IPackageExportDescription ex3 = Factory.newPackageExport("a.b.c.interal.y", new Version("1.2.3"), false, new String[]{"d.e.f", "g.h.i"});	523	IPackageExportDescription ex2 = service.newPackageExport("a.b.c.interal.x", null, false, new String[]{"x.y.z"});
		524	IPackageExportDescription ex3 = service.newPackageExport("a.b.c.interal.y", new Version("1.2.3"), false, new String[]{"d.e.f", "g.h.i"});
503	description.setPackageExports(new IPackageExportDescription[]{ex0, ex1, ex2, ex3});	525	description.setPackageExports(new IPackageExportDescription[]{ex0, ex1, ex2, ex3});
504	description.apply(null);	526	description.apply(null);
505		527
506	// modify the project	528	// modify the project
507	IBundleProjectDescription modify = Factory.getDescription(project);	529	IBundleProjectDescription modify = service.getDescription(project);
508	IPath src = new Path("src");	530	IPath src = new Path("src");
509	IBundleClasspathEntry spec = Factory.newBundleClasspathEntry(src, null, new Path("a.jar"));	531	IBundleClasspathEntry spec = service.newBundleClasspathEntry(src, null, new Path("a.jar"));
510	modify.setBundleClassath(new IBundleClasspathEntry[] {spec});	532	modify.setBundleClassath(new IBundleClasspathEntry[] {spec});
511	IPackageExportDescription ex4 = Factory.newPackageExport("x.y.z.interal", null, false, new String[]{"zz.top"});	533	IPackageExportDescription ex4 = service.newPackageExport("x.y.z.interal", null, false, new String[]{"zz.top"});
512	modify.setPackageExports(new IPackageExportDescription[]{ex0, ex2, ex4, ex3}); // remove, add, re-order	534	modify.setPackageExports(new IPackageExportDescription[]{ex0, ex2, ex4, ex3}); // remove, add, re-order
513	modify.setBinIncludes(new IPath[]{new Path("plugin.xml")});	535	modify.setBinIncludes(new IPath[]{new Path(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR)});
514	modify.setActivator("org.eclipse.foo.Activator");	536	modify.setActivator("org.eclipse.foo.Activator");
515	modify.apply(null);	537	modify.apply(null);
516		538
517	// verify attributes	539	// verify attributes
518	IBundleProjectDescription d2 = Factory.getDescription(project);	540	IBundleProjectDescription d2 = service.getDescription(project);
519		541
520	assertEquals("Should be no activator", "org.eclipse.foo.Activator", d2.getActivator());	542	assertEquals("Should be no activator", "org.eclipse.foo.Activator", d2.getActivator());
521	IPath[] binIncludes = d2.getBinIncludes();	543	IPath[] binIncludes = d2.getBinIncludes();
522	assertEquals("Wrong number of entries on bin.includes", 1, binIncludes.length);	544	assertEquals("Wrong number of entries on bin.includes", 1, binIncludes.length);
523	assertEquals("Wrong bin.includes entry", new Path("plugin.xml"), binIncludes[0]);	545	assertEquals("Wrong bin.includes entry", new Path(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR), binIncludes[0]);
524	IBundleClasspathEntry[] classpath = d2.getBundleClasspath();	546	IBundleClasspathEntry[] classpath = d2.getBundleClasspath();
525	assertNotNull("Wrong Bundle-Classpath", classpath);	547	assertNotNull("Wrong Bundle-Classpath", classpath);
526	assertEquals("Wrong number of Bundle-Classpath entries", 1, classpath.length);	548	assertEquals("Wrong number of Bundle-Classpath entries", 1, classpath.length);
Lines 561-577 Link Here
561	public void testFragToBundle() throws CoreException {	583	public void testFragToBundle() throws CoreException {
562	IBundleProjectDescription description = newProject();	584	IBundleProjectDescription description = newProject();
563	IProject project = description.getProject();	585	IProject project = description.getProject();
564	IHostDescription host = Factory.newHost("some.host", null);	586	IBundleProjectService service = getBundleProjectService();
		587	IHostDescription host = service.newHost("some.host", null);
565	description.setHost(host);	588	description.setHost(host);
566	description.apply(null);	589	description.apply(null);
567		590
568	//modify to a bundle	591	//modify to a bundle
569	IBundleProjectDescription modify = Factory.getDescription(project);	592	IBundleProjectDescription modify = service.getDescription(project);
570	modify.setHost(null);	593	modify.setHost(null);
571	modify.apply(null);	594	modify.apply(null);
572		595
573	// validate	596	// validate
574	IBundleProjectDescription d2 = Factory.getDescription(project);	597	IBundleProjectDescription d2 = service.getDescription(project);
575		598
576	assertNull("Should be no activator", d2.getActivator());	599	assertNull("Should be no activator", d2.getActivator());
577	IPath[] binIncludes = d2.getBinIncludes();	600	IPath[] binIncludes = d2.getBinIncludes();
Lines 610-620 Link Here
610	public void testJarsAsBundle() throws CoreException, IOException {	633	public void testJarsAsBundle() throws CoreException, IOException {
611	IBundleProjectDescription description = newProject();	634	IBundleProjectDescription description = newProject();
612	IProject project = description.getProject();	635	IProject project = description.getProject();
613	IBundleClasspathEntry one = Factory.newBundleClasspathEntry(null, null, new Path("one.jar"));	636	IBundleProjectService service = getBundleProjectService();
614	IBundleClasspathEntry two = Factory.newBundleClasspathEntry(null, null, new Path("lib/two.jar"));	637	IBundleClasspathEntry one = service.newBundleClasspathEntry(null, null, new Path("one.jar"));
		638	IBundleClasspathEntry two = service.newBundleClasspathEntry(null, null, new Path("lib/two.jar"));
615	description.setBundleClassath(new IBundleClasspathEntry[]{one, two});	639	description.setBundleClassath(new IBundleClasspathEntry[]{one, two});
616	IPackageExportDescription exp1 = Factory.newPackageExport("org.eclipse.one", new Version("1.0.0"), true, null);	640	IPackageExportDescription exp1 = service.newPackageExport("org.eclipse.one", new Version("1.0.0"), true, null);
617	IPackageExportDescription exp2 = Factory.newPackageExport("org.eclipse.two", new Version("1.0.0"), true, null);	641	IPackageExportDescription exp2 = service.newPackageExport("org.eclipse.two", new Version("1.0.0"), true, null);
618	description.setPackageExports(new IPackageExportDescription[]{exp1, exp2});	642	description.setPackageExports(new IPackageExportDescription[]{exp1, exp2});
619	description.setBundleVersion(new Version("1.0.0"));	643	description.setBundleVersion(new Version("1.0.0"));
620	description.setExecutionEnvironments(new String[]{"J2SE-1.5"});	644	description.setExecutionEnvironments(new String[]{"J2SE-1.5"});
Lines 623-629 Link Here
623	createBogusJar(project.getFile("one.jar"));	647	createBogusJar(project.getFile("one.jar"));
624	createBogusJar(project.getFile(new Path("lib/two.jar")));	648	createBogusJar(project.getFile(new Path("lib/two.jar")));
625		649
626	IBundleProjectDescription d2 = Factory.getDescription(project);	650	IBundleProjectDescription d2 = service.getDescription(project);
627		651
628	assertNull("Should be no activator", d2.getActivator());	652	assertNull("Should be no activator", d2.getActivator());
629	IPath[] binIncludes = d2.getBinIncludes();	653	IPath[] binIncludes = d2.getBinIncludes();
Lines 691-701 Link Here
691	public void testClassFolders() throws CoreException {	715	public void testClassFolders() throws CoreException {
692	IBundleProjectDescription description = newProject();	716	IBundleProjectDescription description = newProject();
693	IProject project = description.getProject();	717	IProject project = description.getProject();
694	IBundleClasspathEntry one = Factory.newBundleClasspathEntry(null, new Path("bin1"), new Path("one.jar"));	718	IBundleProjectService service = getBundleProjectService();
695	IBundleClasspathEntry two = Factory.newBundleClasspathEntry(null, new Path("bin2"), new Path("two.jar"));	719	IBundleClasspathEntry one = service.newBundleClasspathEntry(null, new Path("bin1"), new Path("one.jar"));
		720	IBundleClasspathEntry two = service.newBundleClasspathEntry(null, new Path("bin2"), new Path("two.jar"));
696	description.setBundleClassath(new IBundleClasspathEntry[]{one, two});	721	description.setBundleClassath(new IBundleClasspathEntry[]{one, two});
697	IPackageExportDescription exp1 = Factory.newPackageExport("org.eclipse.one", new Version("1.0.0"), true, null);	722	IPackageExportDescription exp1 = service.newPackageExport("org.eclipse.one", new Version("1.0.0"), true, null);
698	IPackageExportDescription exp2 = Factory.newPackageExport("org.eclipse.two", new Version("1.0.0"), true, null);	723	IPackageExportDescription exp2 = service.newPackageExport("org.eclipse.two", new Version("1.0.0"), true, null);
699	description.setPackageExports(new IPackageExportDescription[]{exp1, exp2});	724	description.setPackageExports(new IPackageExportDescription[]{exp1, exp2});
700	description.setBundleVersion(new Version("1.0.0"));	725	description.setBundleVersion(new Version("1.0.0"));
701	description.setExecutionEnvironments(new String[]{"J2SE-1.5"});	726	description.setExecutionEnvironments(new String[]{"J2SE-1.5"});
Lines 704-710 Link Here
704	project.getFolder("bin1").create(false, true, null);	729	project.getFolder("bin1").create(false, true, null);
705	project.getFolder("bin2").create(false, true, null);	730	project.getFolder("bin2").create(false, true, null);
706		731
707	IBundleProjectDescription d2 = Factory.getDescription(project);	732	IBundleProjectDescription d2 = service.getDescription(project);
708		733
709	assertNull("Should be no activator", d2.getActivator());	734	assertNull("Should be no activator", d2.getActivator());
710	IPath[] binIncludes = d2.getBinIncludes();	735	IPath[] binIncludes = d2.getBinIncludes();




/*******************************************************************************
 *  Copyright (c) 2007, 2010 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

package org.eclipse.pde.ui.tests.wizards;

import java.lang.reflect.InvocationTargetException;

import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.natures.PDE;
import org.eclipse.pde.internal.core.project.PDEProject;
import org.eclipse.pde.internal.ui.wizards.tools.ConvertProjectToPluginOperation;
import org.eclipse.pde.ui.tests.PDETestCase;
import org.eclipse.ui.PlatformUI;

		convertProject(project);

		assertTrue(project.hasNature(PDE.PLUGIN_NATURE));
		assertTrue(PDEProject.getManifest(project).exists());
		assertTrue(PDEProject.getBuildProperties(project).exists());
	}

	/**

		for (int i = 0; i < projects.length; i++) {
			IProject project = projects[i];
			assertTrue(project.hasNature(PDE.PLUGIN_NATURE));
			assertTrue(PDEProject.getManifest(project).exists());
			assertTrue(PDEProject.getBuildProperties(project).exists());
		}
	}


Return to bug 297895

Lines 975-978 Link Here

(-)src/org/eclipse/pde/internal/core/PluginModelManager.java (+15 lines)
975	fWorkspaceManager.removeExtensionDeltaListener(listener);	975	fWorkspaceManager.removeExtensionDeltaListener(listener);
976	}	976	}
977		977
		978	/**
		979	* Called when the bundle root for a project is changed.
		980	*
		981	* @param project
		982	*/
		983	public void bundleRootChanged(IProject project) {
		984	fWorkspaceManager.removeModel(project);
		985	if (fWorkspaceManager.isInterestingProject(project)) {
		986	fWorkspaceManager.createModel(project, false);
		987	Object model = fWorkspaceManager.getModel(project);
		988	fWorkspaceManager.addChange(model, IModelProviderEvent.MODELS_CHANGED);
		989	}
		990	fWorkspaceManager.processModelChanges();
		991	}
		992
978	}	993	}

Removed Link Here

(-)src/org/eclipse/pde/core/project/Factory.java (-110 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.pde.core.project;
12
13	import org.eclipse.core.resources.IProject;
14	import org.eclipse.core.runtime.CoreException;
15	import org.eclipse.core.runtime.IPath;
16	import org.eclipse.osgi.service.resolver.VersionRange;
17	import org.eclipse.pde.internal.core.project.*;
18	import org.osgi.framework.Version;
19
20	/**
21	* Factory class for creating bundle project descriptions and associated artifacts.
22	*
23	* @noinstantiate This class is not intended to be instantiated by clients.
24	* @since 3.6
25	*/
26	public final class Factory {
27
28	/**
29	* Returns a bundle description for the given project.
30	* If the project does not exist, the description can be used to create
31	* a new bundle project. If the project does exist, the description can be used to
32	* modify a project.
33	*
34	* @param project project
35	* @return bundle description for the associated project
36	* @exception CoreException if unable to create a description on an existing project
37	*/
38	public static IBundleProjectDescription getDescription(IProject project) throws CoreException {
39	return new BundleProjectDescription(project);
40	}
41
42	/**
43	* Creates and returns a new host description.
44	*
45	* @param name symbolic name of the host
46	* @param range version constraint or <code>null</code>
47	* @return host description
48	*/
49	public static IHostDescription newHost(String name, VersionRange range) {
50	return new HostDescriptoin(name, range);
51	}
52
53	/**
54	* Creates and returns a new package import description.
55	*
56	* @param name fully qualified name of imported package
57	* @param range version constraint or <code>null</code>
58	* @param optional whether the import is optional
59	* @return package import description
60	*/
61	public static IPackageImportDescription newPackageImport(String name, VersionRange range, boolean optional) {
62	return new PackageImportDescription(name, range, optional);
63	}
64
65	/**
66	* Constructs a new package export description.
67	*
68	* @param name fully qualified package name
69	* @param version version or <code>null</code>
70	* @param api whether the package is considered API
71	* @param friends symbolic names of bundles that are friends, or <code>null</code>; when
72	* friends are specified the package will not be API
73	* @return package export description
74	*/
75	public static IPackageExportDescription newPackageExport(String name, Version version, boolean api, String[] friends) {
76	return new PackageExportDescription(name, version, friends, api);
77	}
78
79	/**
80	* Creates and returns a new required bundle description.
81	*
82	* @param name symbolic name of required bundle
83	* @param range version constraint or <code>null</code>
84	* @param optional whether the required bundle is optional
85	* @param export whether the required bundle is re-exported
86	* @return required bundle description
87	*/
88	public static IRequiredBundleDescription newRequiredBundle(String name, VersionRange range, boolean optional, boolean export) {
89	return new RequiredBundleDescription(name, range, export, optional);
90	}
91
92	/**
93	* Creates and returns a new bundle classpath entry defining the relationship
94	* between a source, binaries, and library on the Bundle-Classpath header.
95	* <p>
96	* When a source folder is specified, the binary folder defines its output
97	* folder, or may be <code>null</code> to indicate that the project's default output
98	* folder is used by the source folder. When only a binary folder is specified, there
99	* is no source associated with the folder. When no source or binary are specified,
100	* it indicates the library is included in the project as an archive.
101	* </p>
102	* @param sourceFolder source folder or <code>null</code>
103	* @param binaryFolder binary folder or <code>null</code>
104	* @param library associated entry on the Bundle-Classpath header or <code>null</code>
105	* to indicate default entry "."
106	*/
107	public static IBundleClasspathEntry newBundleClasspathEntry(IPath sourceFolder, IPath binaryFolder, IPath library) {
108	return new BundleClasspathSpecification(sourceFolder, binaryFolder, library);
109	}
110	}

Lines 181-187 Link Here

(-)src/org/eclipse/pde/core/project/IBundleProjectDescription.java (-3 / +32 lines)
181	/**	181	/**
182	* Sets the value of the Bundle-Localization header for the described bundle.	182	* Sets the value of the Bundle-Localization header for the described bundle.
183	*	183	*
184	* @param path bundle relative path or <code>null</code>	184	* @param path bundle root relative path or <code>null</code>
185	*/	185	*/
186	public void setLocalization(IPath path);	186	public void setLocalization(IPath path);
187		187
Lines 405-411 Link Here
405	* Bundle-Classpath will be included. This sets any additional entries that	405	* Bundle-Classpath will be included. This sets any additional entries that
406	* are to be included.	406	* are to be included.
407	* </p>	407	* </p>
408	* @param paths project relative paths of files and folders to include	408	* @param paths bundle root relative paths of files and folders to include
409	* or <code>null</code> if none	409	* or <code>null</code> if none
410	*/	410	*/
411	public void setBinIncludes(IPath[] paths);	411	public void setBinIncludes(IPath[] paths);
Lines 418-425 Link Here
418	* Bundle-Classpath will be included. This returns any additional entries that	418	* Bundle-Classpath will be included. This returns any additional entries that
419	* are to be included.	419	* are to be included.
420	* </p>	420	* </p>
421	* @return files and folders on the <code>bin.includes</code> entry or <code>null</code>	421	* @return bundle root relative paths of files and folders on the <code>bin.includes</code>
		422	* entry or <code>null</code>
422	*/	423	*/
423	public IPath[] getBinIncludes();	424	public IPath[] getBinIncludes();
424		425
		426	/**
		427	* Sets the location within the project where the root of the bundle and its associated
		428	* artifacts will reside, or <code>null</code> to indicate the default bundle root location
		429	* should be used (project folder).
		430	* <p>
		431	* This has no effect on existing projects. This method is intended for use on descriptions
		432	* for new projects. To modify the bundle root of an existing project use
		433	* {@link Factory#setBundleRoot(IProject, IPath)}.
		434	* </p>
		435	* <p>
		436	* The bundle root is the folder containing the <code>META-INF/</code> folder. When a project
		437	* does not yet exist, bundle files will be created relative to the bundle root. When a project
		438	* already exists and the bundle root location is modified, existing bundle artifacts at the old
		439	* root are not moved or modified. Instead, the modify operation will update any existing bundle
		440	* files at the new root location, or create them if not yet present.
		441	* </p>
		442	* @param path project relative path to bundle root artifacts in the project or <code>null</code>
		443	*/
		444	public void setBundleRoot(IPath path);
		445
		446	/**
		447	* Returns the location within the project that is the root of the bundle related
		448	* artifacts, or <code>null</code> to indicate the default location (project folder).
		449	*
		450	* @return project relative bundle root path or <code>null</code>
		451	*/
		452	public IPath getBundleRoot();
		453
425	}	454	}

Lines 11-16 Link Here

(-)src/org/eclipse/pde/internal/core/ICoreConstants.java (+10 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.pde.internal.core;	12	package org.eclipse.pde.internal.core;
13		13
		14	import java.util.Locale;
14	import org.eclipse.core.runtime.IPath;	15	import org.eclipse.core.runtime.IPath;
15	import org.eclipse.core.runtime.Path;	16	import org.eclipse.core.runtime.Path;
16	import org.osgi.framework.Constants;	17	import org.osgi.framework.Constants;
Lines 71-76 Link Here
71	/** Constant for the string <code>META-INF/MANIFEST.MF</code> */	72	/** Constant for the string <code>META-INF/MANIFEST.MF</code> */
72	public final static String BUNDLE_FILENAME_DESCRIPTOR = "META-INF/MANIFEST.MF"; //$NON-NLS-1$	73	public final static String BUNDLE_FILENAME_DESCRIPTOR = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
73		74
		75	/** Constant for the string <code>MANIFEST.MF</code> */
		76	public final static String MANIFEST_FILENAME = "MANIFEST.MF"; //$NON-NLS-1$
		77
		78	/** Constant for the string <code>.options</code> */
		79	public final static String OPTIONS_FILENAME = ".options"; //$NON-NLS-1$
		80
		81	/** Constant for the string <code>manifest.mf</code> */
		82	public final static String MANIFEST_FILENAME_LOWER_CASE = MANIFEST_FILENAME.toLowerCase(Locale.ENGLISH);
		83
74	/** Constant for the string <code>build.properties</code> */	84	/** Constant for the string <code>build.properties</code> */
75	public final static String BUILD_FILENAME_DESCRIPTOR = "build.properties"; //$NON-NLS-1$	85	public final static String BUILD_FILENAME_DESCRIPTOR = "build.properties"; //$NON-NLS-1$
76		86

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/JavaElementChangeListener.java (-18 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 10-37 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.core;	11	package org.eclipse.pde.internal.core;
12		12
13	import java.io.File;	13	import java.io.*;
14	import java.io.FileInputStream;
15	import java.io.FileOutputStream;
16	import java.io.IOException;
17	import java.util.Enumeration;	14	import java.util.Enumeration;
18	import java.util.Properties;	15	import java.util.Properties;
19
20	import org.eclipse.core.resources.IProject;	16	import org.eclipse.core.resources.IProject;
21	import org.eclipse.core.runtime.IPath;	17	import org.eclipse.core.runtime.IPath;
22	import org.eclipse.jdt.core.ElementChangedEvent;	18	import org.eclipse.jdt.core.*;
23	import org.eclipse.jdt.core.IClasspathEntry;
24	import org.eclipse.jdt.core.IElementChangedListener;
25	import org.eclipse.jdt.core.IJavaElement;
26	import org.eclipse.jdt.core.IJavaElementDelta;
27	import org.eclipse.jdt.core.IJavaModel;
28	import org.eclipse.jdt.core.IJavaProject;
29	import org.eclipse.jdt.core.IPackageFragment;
30	import org.eclipse.jdt.core.IPackageFragmentRoot;
31	import org.eclipse.jdt.core.JavaCore;
32	import org.eclipse.jdt.core.JavaModelException;
33	import org.eclipse.pde.core.plugin.IPluginModelBase;	19	import org.eclipse.pde.core.plugin.IPluginModelBase;
34	import org.eclipse.pde.core.plugin.PluginRegistry;	20	import org.eclipse.pde.core.plugin.PluginRegistry;
		21	import org.eclipse.pde.internal.core.project.PDEProject;
35		22
36	public class JavaElementChangeListener implements IElementChangedListener {	23	public class JavaElementChangeListener implements IElementChangedListener {
37		24
Lines 120-126 Link Here
120		107
121	private boolean isInterestingProject(IJavaProject jProject) {	108	private boolean isInterestingProject(IJavaProject jProject) {
122	IProject project = jProject.getProject();	109	IProject project = jProject.getProject();
123	return WorkspaceModelManager.isPluginProject(project) && !WorkspaceModelManager.isBinaryProject(project) && !project.exists(ICoreConstants.MANIFEST_PATH);	110	return WorkspaceModelManager.isPluginProject(project) && !WorkspaceModelManager.isBinaryProject(project) && !PDEProject.getManifest(project).exists();
124	}	111	}
125		112
126	private void updateTable(IJavaElement element) {	113	private void updateTable(IJavaElement element) {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/TracingOptionsManager.java (-5 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 97-106 Link Here
97	ZipFile jarFile = null;	97	ZipFile jarFile = null;
98	try {	98	try {
99	if (pluginLocation.isDirectory())	99	if (pluginLocation.isDirectory())
100	return new File(pluginLocation, ".options").exists(); //$NON-NLS-1$	100	return new File(pluginLocation, ICoreConstants.OPTIONS_FILENAME).exists();
101		101
102	jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);	102	jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);
103	ZipEntry manifestEntry = jarFile.getEntry(".options"); //$NON-NLS-1$	103	ZipEntry manifestEntry = jarFile.getEntry(ICoreConstants.OPTIONS_FILENAME);
104	if (manifestEntry != null) {	104	if (manifestEntry != null) {
105	stream = jarFile.getInputStream(manifestEntry);	105	stream = jarFile.getInputStream(manifestEntry);
106	}	106	}
Lines 166-177 Link Here
166	ZipFile jarFile = null;	166	ZipFile jarFile = null;
167	try {	167	try {
168	if (pluginLocation.isDirectory()) {	168	if (pluginLocation.isDirectory()) {
169	File file = new File(pluginLocation, ".options"); //$NON-NLS-1$	169	File file = new File(pluginLocation, ICoreConstants.OPTIONS_FILENAME);
170	if (file.exists())	170	if (file.exists())
171	stream = new FileInputStream(file);	171	stream = new FileInputStream(file);
172	} else {	172	} else {
173	jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);	173	jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);
174	ZipEntry manifestEntry = jarFile.getEntry(".options"); //$NON-NLS-1$	174	ZipEntry manifestEntry = jarFile.getEntry(ICoreConstants.OPTIONS_FILENAME);
175	if (manifestEntry != null) {	175	if (manifestEntry != null) {
176	stream = jarFile.getInputStream(manifestEntry);	176	stream = jarFile.getInputStream(manifestEntry);
177	}	177	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/WorkspaceFeatureModelManager.java (-10 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2008 IBM Corporation and others.	2	* Copyright (c) 2006, 2010 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 11-24 Link Here
11	package org.eclipse.pde.internal.core;	11	package org.eclipse.pde.internal.core;
12		12
13	import java.util.HashMap;	13	import java.util.HashMap;
14		14	import org.eclipse.core.resources.*;
15	import org.eclipse.core.resources.IFile;
16	import org.eclipse.core.resources.IProject;
17	import org.eclipse.core.resources.IResourceChangeEvent;
18	import org.eclipse.core.resources.IResourceDelta;
19	import org.eclipse.pde.core.IModelProviderEvent;	15	import org.eclipse.pde.core.IModelProviderEvent;
20	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;	16	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
21	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	17	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
		18	import org.eclipse.pde.internal.core.project.PDEProject;
22		19
23	public class WorkspaceFeatureModelManager extends WorkspaceModelManager {	20	public class WorkspaceFeatureModelManager extends WorkspaceModelManager {
24		21
Lines 27-34 Link Here
27	}	24	}
28		25
29	protected void createModel(IProject project, boolean notify) {	26	protected void createModel(IProject project, boolean notify) {
30	if (project.exists(ICoreConstants.FEATURE_PATH)) {	27	IFile featureXml = PDEProject.getFeatureXml(project);
31	WorkspaceFeatureModel model = new WorkspaceFeatureModel(project.getFile(ICoreConstants.FEATURE_PATH));	28	if (featureXml.exists()) {
		29	WorkspaceFeatureModel model = new WorkspaceFeatureModel(featureXml);
32	loadModel(model, false);	30	loadModel(model, false);
33	if (fModels == null)	31	if (fModels == null)
34	fModels = new HashMap();	32	fModels = new HashMap();
Lines 40-47 Link Here
40		38
41	protected void handleFileDelta(IResourceDelta delta) {	39	protected void handleFileDelta(IResourceDelta delta) {
42	IFile file = (IFile) delta.getResource();	40	IFile file = (IFile) delta.getResource();
43	if (file.getProjectRelativePath().equals(ICoreConstants.FEATURE_PATH)) {	41	IProject project = file.getProject();
44	IProject project = file.getProject();	42	IFile featureXml = PDEProject.getFeatureXml(project);
		43	if (file.equals(featureXml)) {
45	Object model = getModel(project);	44	Object model = getModel(project);
46	int kind = delta.getKind();	45	int kind = delta.getKind();
47	if (kind == IResourceDelta.REMOVED && model != null) {	46	if (kind == IResourceDelta.REMOVED && model != null) {

Lines 11-22 Link Here

(-)src/org/eclipse/pde/internal/core/build/BuildEntry.java (-4 / +68 lines)
11	package org.eclipse.pde.internal.core.build;	11	package org.eclipse.pde.internal.core.build;
12		12
13	import java.io.PrintWriter;	13	import java.io.PrintWriter;
14	import java.util.StringTokenizer;	14	import java.util.*;
15	import java.util.Vector;	15	import org.eclipse.core.resources.*;
16	import org.eclipse.core.runtime.CoreException;	16	import org.eclipse.core.runtime.*;
17	import org.eclipse.pde.core.IModelChangedEvent;	17	import org.eclipse.pde.core.IModelChangedEvent;
18	import org.eclipse.pde.core.ModelChangedEvent;	18	import org.eclipse.pde.core.ModelChangedEvent;
19	import org.eclipse.pde.core.build.IBuildEntry;	19	import org.eclipse.pde.core.build.IBuildEntry;
		20	import org.eclipse.pde.internal.core.project.PDEProject;
20	import org.eclipse.pde.internal.core.util.PropertiesUtil;	21	import org.eclipse.pde.internal.core.util.PropertiesUtil;
21		22
22	public class BuildEntry extends BuildObject implements IBuildEntry {	23	public class BuildEntry extends BuildObject implements IBuildEntry {
Lines 48-57 Link Here
48	}	49	}
49		50
50	void processEntry(String value) {	51	void processEntry(String value) {
		52	IPath rootPath = getRootPath();
51	StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$	53	StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$
52	while (stok.hasMoreTokens()) {	54	while (stok.hasMoreTokens()) {
53	String token = stok.nextToken();	55	String token = stok.nextToken();
54	token = token.trim();	56	token = token.trim();
		57	token = fromRelative(token, rootPath);
55	tokens.add(token);	58	tokens.add(token);
56	}	59	}
57	}	60	}
Lines 85-91 Link Here
85	}	88	}
86		89
87	public void write(String indent, PrintWriter writer) {	90	public void write(String indent, PrintWriter writer) {
88	PropertiesUtil.writeKeyValuePair(indent, name, tokens.elements(), writer);	91	Enumeration elements = tokens.elements();
		92	IPath rootPath = getRootPath();
		93	if (rootPath != null) {
		94	// translation required for source. and output. entries
		95	Vector vector = new Vector();
		96	while (elements.hasMoreElements()) {
		97	String e = (String) elements.nextElement();
		98	vector.add(toRelative(e, rootPath));
		99	}
		100	elements = vector.elements();
		101	}
		102	PropertiesUtil.writeKeyValuePair(indent, name, elements, writer);
89	}	103	}
90		104
91	public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {	105	public void restoreProperty(String name, Object oldValue, Object newValue) throws CoreException {
Lines 93-96 Link Here
93	setName(newValue != null ? newValue.toString() : null);	107	setName(newValue != null ? newValue.toString() : null);
94	}	108	}
95	}	109	}
		110
		111	/**
		112	* Returns the path that this entries tokens are relative to, or <code>null</code> if none.
		113	*
		114	* @return relative root path, or <code>null</code>
		115	*/
		116	IPath getRootPath() {
		117	if (name.startsWith(IBuildEntry.JAR_PREFIX) \|\| name.startsWith(IBuildEntry.OUTPUT_PREFIX)) {
		118	IResource resource = getModel().getUnderlyingResource();
		119	if (resource != null) {
		120	IProject project = resource.getProject();
		121	if (project != null) {
		122	IContainer root = PDEProject.getBundleRoot(project);
		123	if (root != null && !root.equals(project)) {
		124	// translation required for source. and output. entries
		125	return root.getProjectRelativePath();
		126	}
		127	}
		128	}
		129	}
		130	return null;
		131	}
		132
		133	/**
		134	* Makes the token a bundle root relative path
		135	*
		136	* @param token token
		137	* @param root bundle root path or <code>null</code>
		138	* @return bundle relative token
		139	*/
		140	String toRelative(String token, IPath root) {
		141	if (root == null) {
		142	return token;
		143	}
		144	return (new Path(token)).makeRelativeTo(root).toPortableString();
		145	}
		146
		147	/**
		148	* Makes the token a project relative path
		149	*
		150	* @param token token
		151	* @param root bundle root path or <code>null</code>
		152	* @return project relative token
		153	*/
		154	String fromRelative(String token, IPath root) {
		155	if (root == null) {
		156	return token;
		157	}
		158	return root.append(new Path(token)).toPortableString();
		159	}
96	}	160	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/core/converter/PDEPluginConverter.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2008 IBM Corporation and others.	2	* Copyright (c) 2003, 2010 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 18-24 Link Here
18	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
19	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;	19	import org.eclipse.osgi.service.pluginconversion.PluginConversionException;
20	import org.eclipse.osgi.util.ManifestElement;	20	import org.eclipse.osgi.util.ManifestElement;
21	import org.eclipse.pde.internal.core.ICoreConstants;	21	import org.eclipse.pde.internal.core.project.PDEProject;
22	import org.osgi.framework.BundleException;	22	import org.osgi.framework.BundleException;
23		23
24	public class PDEPluginConverter {	24	public class PDEPluginConverter {
Lines 29-35 Link Here
29		29
30	public static void convertToOSGIFormat(IProject project, String target, Dictionary dictionary, HashMap newProps, IProgressMonitor monitor) throws CoreException {	30	public static void convertToOSGIFormat(IProject project, String target, Dictionary dictionary, HashMap newProps, IProgressMonitor monitor) throws CoreException {
31	try {	31	try {
32	File outputFile = new File(project.getLocation().append(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR).toOSString());	32	File outputFile = new File(PDEProject.getManifest(project).getLocation().toOSString());
33	File inputFile = new File(project.getLocation().toOSString());	33	File inputFile = new File(project.getLocation().toOSString());
34	PluginConverter converter = PluginConverter.getDefault();	34	PluginConverter converter = PluginConverter.getDefault();
35	converter.convertManifest(inputFile, outputFile, false, target, true, dictionary);	35	converter.convertManifest(inputFile, outputFile, false, target, true, dictionary);

Lines 1-124 Link Here

(-)src/org/eclipse/pde/internal/core/exports/FeatureBasedExportOperation.java (-124 / +123 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2009 IBM Corporation and others.	2	* Copyright (c) 2006, 2010 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
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.core.exports;	11	package org.eclipse.pde.internal.core.exports;
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.lang.reflect.InvocationTargetException;	15	import java.lang.reflect.InvocationTargetException;
16	import java.util.*;	16	import java.util.*;
17	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
18	import org.eclipse.osgi.service.resolver.BundleDescription;	18	import org.eclipse.osgi.service.resolver.BundleDescription;
19	import org.eclipse.pde.core.IModel;	19	import org.eclipse.pde.core.IModel;
20	import org.eclipse.pde.core.plugin.IPluginModelBase;	20	import org.eclipse.pde.core.plugin.IPluginModelBase;
21	import org.eclipse.pde.core.plugin.TargetPlatform;	21	import org.eclipse.pde.core.plugin.TargetPlatform;
22	import org.eclipse.pde.internal.core.PDECore;	22	import org.eclipse.pde.internal.core.*;
23	import org.eclipse.pde.internal.core.PDECoreMessages;	23	import org.eclipse.pde.internal.core.ifeature.IFeature;
24	import org.eclipse.pde.internal.core.ifeature.IFeature;	24	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
25	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	25
26		26	public abstract class FeatureBasedExportOperation extends FeatureExportOperation {
27	public abstract class FeatureBasedExportOperation extends FeatureExportOperation {	27
28		28	protected String fFeatureLocation;
29	protected String fFeatureLocation;	29
30		30	public FeatureBasedExportOperation(FeatureExportInfo info, String name) {
31	public FeatureBasedExportOperation(FeatureExportInfo info, String name) {	31	super(info, name);
32	super(info, name);	32	}
33	}	33
34		34	/* (non-Javadoc)
35	/* (non-Javadoc)	35	* @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#run(org.eclipse.core.runtime.IProgressMonitor)
36	* @see org.eclipse.pde.internal.core.exports.FeatureExportOperation#run(org.eclipse.core.runtime.IProgressMonitor)	36	*/
37	*/	37	protected IStatus run(IProgressMonitor monitor) {
38	protected IStatus run(IProgressMonitor monitor) {	38	try {
39	try {	39	createDestination();
40	createDestination();	40	monitor.beginTask("Exporting...", 33); //$NON-NLS-1$
41	monitor.beginTask("Exporting...", 33); //$NON-NLS-1$	41	// create a feature to contain all plug-ins
42	// create a feature to contain all plug-ins	42	String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
43	String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$	43	fFeatureLocation = fBuildTempLocation + File.separator + featureID;
44	fFeatureLocation = fBuildTempLocation + File.separator + featureID;	44	String[][] config = new String[][] {{TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL()}};
45	String[][] config = new String[][] {{TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL()}};	45	createFeature(featureID, fFeatureLocation, config, false);
46	createFeature(featureID, fFeatureLocation, config, false);	46	createBuildPropertiesFile(fFeatureLocation);
47	createBuildPropertiesFile(fFeatureLocation);	47	if (fInfo.useJarFormat)
48	if (fInfo.useJarFormat)	48	createPostProcessingFiles();
49	createPostProcessingFiles();	49	IStatus status = testBuildWorkspaceBeforeExport(new SubProgressMonitor(monitor, 10));
50	IStatus status = testBuildWorkspaceBeforeExport(new SubProgressMonitor(monitor, 10));	50	doExport(featureID, null, fFeatureLocation, config, new SubProgressMonitor(monitor, 20));
51	doExport(featureID, null, fFeatureLocation, config, new SubProgressMonitor(monitor, 20));	51	if (monitor.isCanceled()) {
52	if (monitor.isCanceled()) {	52	return Status.CANCEL_STATUS;
53	return Status.CANCEL_STATUS;	53	}
54	}	54	return status;
55	return status;	55	} catch (IOException e) {
56	} catch (IOException e) {	56	return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e);
57	return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e);	57	} catch (CoreException e) {
58	} catch (CoreException e) {	58	return e.getStatus();
59	return e.getStatus();	59	} catch (InvocationTargetException e) {
60	} catch (InvocationTargetException e) {	60	return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e.getTargetException());
61	return new Status(IStatus.ERROR, PDECore.PLUGIN_ID, PDECoreMessages.FeatureBasedExportOperation_ProblemDuringExport, e.getTargetException());	61	} finally {
62	} finally {	62	for (int i = 0; i < fInfo.items.length; i++) {
63	for (int i = 0; i < fInfo.items.length; i++) {	63	if (fInfo.items[i] instanceof IModel)
64	if (fInfo.items[i] instanceof IModel)	64	try {
65	try {	65	deleteBuildFiles(fInfo.items[i]);
66	deleteBuildFiles(fInfo.items[i]);	66	} catch (CoreException e) {
67	} catch (CoreException e) {	67	PDECore.log(e);
68	PDECore.log(e);	68	}
69	}	69	}
70	}	70	cleanup(null, new SubProgressMonitor(monitor, 3));
71	cleanup(null, new SubProgressMonitor(monitor, 3));	71	monitor.done();
72	monitor.done();	72	}
73	}	73	}
74	}	74
75		75	protected abstract void createPostProcessingFiles();
76	protected abstract void createPostProcessingFiles();	76
77		77	protected String[] getPaths() {
78	protected String[] getPaths() {	78	String[] paths = super.getPaths();
79	String[] paths = super.getPaths();	79	String[] all = new String[paths.length + 1];
80	String[] all = new String[paths.length + 1];	80	all[0] = fFeatureLocation + File.separator + ICoreConstants.FEATURE_FILENAME_DESCRIPTOR;
81	all[0] = fFeatureLocation + File.separator + "feature.xml"; //$NON-NLS-1$	81	System.arraycopy(paths, 0, all, 1, paths.length);
82	System.arraycopy(paths, 0, all, 1, paths.length);	82	return all;
83	return all;	83	}
84	}	84
85		85	private void createBuildPropertiesFile(String featureLocation) {
86	private void createBuildPropertiesFile(String featureLocation) {	86	File file = new File(featureLocation);
87	File file = new File(featureLocation);	87	if (!file.exists() \|\| !file.isDirectory())
88	if (!file.exists() \|\| !file.isDirectory())	88	file.mkdirs();
89	file.mkdirs();	89	Properties prop = new Properties();
90	Properties prop = new Properties();	90	prop.put("pde", "marker"); //$NON-NLS-1$ //$NON-NLS-2$
91	prop.put("pde", "marker"); //$NON-NLS-1$ //$NON-NLS-2$	91
92		92	if (fInfo.exportSource && fInfo.exportSourceBundle) {
93	if (fInfo.exportSource && fInfo.exportSourceBundle) {	93	prop.put("individualSourceBundles", "true"); //$NON-NLS-1$ //$NON-NLS-2$
94	prop.put("individualSourceBundles", "true"); //$NON-NLS-1$ //$NON-NLS-2$	94	Dictionary environment = new Hashtable(4);
95	Dictionary environment = new Hashtable(4);	95	environment.put("osgi.os", TargetPlatform.getOS()); //$NON-NLS-1$
96	environment.put("osgi.os", TargetPlatform.getOS()); //$NON-NLS-1$	96	environment.put("osgi.ws", TargetPlatform.getWS()); //$NON-NLS-1$
97	environment.put("osgi.ws", TargetPlatform.getWS()); //$NON-NLS-1$	97	environment.put("osgi.arch", TargetPlatform.getOSArch()); //$NON-NLS-1$
98	environment.put("osgi.arch", TargetPlatform.getOSArch()); //$NON-NLS-1$	98	environment.put("osgi.nl", TargetPlatform.getNL()); //$NON-NLS-1$
99	environment.put("osgi.nl", TargetPlatform.getNL()); //$NON-NLS-1$	99
100		100	for (int i = 0; i < fInfo.items.length; i++) {
101	for (int i = 0; i < fInfo.items.length; i++) {	101	if (fInfo.items[i] instanceof IFeatureModel) {
102	if (fInfo.items[i] instanceof IFeatureModel) {	102	IFeature feature = ((IFeatureModel) fInfo.items[i]).getFeature();
103	IFeature feature = ((IFeatureModel) fInfo.items[i]).getFeature();	103	prop.put("generate.feature@" + feature.getId() + ".source", feature.getId()); //$NON-NLS-1$ //$NON-NLS-2$
104	prop.put("generate.feature@" + feature.getId() + ".source", feature.getId()); //$NON-NLS-1$ //$NON-NLS-2$	104	} else {
105	} else {	105	BundleDescription bundle = null;
106	BundleDescription bundle = null;	106	if (fInfo.items[i] instanceof IPluginModelBase) {
107	if (fInfo.items[i] instanceof IPluginModelBase) {	107	bundle = ((IPluginModelBase) fInfo.items[i]).getBundleDescription();
108	bundle = ((IPluginModelBase) fInfo.items[i]).getBundleDescription();	108	}
109	}	109	if (bundle == null) {
110	if (bundle == null) {	110	if (fInfo.items[i] instanceof BundleDescription)
111	if (fInfo.items[i] instanceof BundleDescription)	111	bundle = (BundleDescription) fInfo.items[i];
112	bundle = (BundleDescription) fInfo.items[i];	112	}
113	}	113	if (bundle == null)
114	if (bundle == null)	114	continue;
115	continue;	115	if (shouldAddPlugin(bundle, environment)) {
116	if (shouldAddPlugin(bundle, environment)) {	116	prop.put("generate.plugin@" + bundle.getSymbolicName() + ".source", bundle.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
117	prop.put("generate.plugin@" + bundle.getSymbolicName() + ".source", bundle.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$	117	}
118	}	118	}
119	}	119	}
120	}	120	}
121	}	121	save(new File(file, ICoreConstants.BUILD_FILENAME_DESCRIPTOR), prop, "Marker File"); //$NON-NLS-1$
122	save(new File(file, "build.properties"), prop, "Marker File"); //$NON-NLS-1$ //$NON-NLS-2$	122	}
123	}	123	}
124	}

Lines 12-17 Link Here

(-)src/org/eclipse/pde/internal/core/project/BundleProjectDescription.java (-19 / +57 lines)
12		12
13	import java.net.URI;	13	import java.net.URI;
14	import java.util.*;	14	import java.util.*;
		15	import org.eclipse.core.resources.IContainer;
15	import org.eclipse.core.resources.IProject;	16	import org.eclipse.core.resources.IProject;
16	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
17	import org.eclipse.jdt.core.*;	18	import org.eclipse.jdt.core.*;
Lines 41-46 Link Here
41	public class BundleProjectDescription implements IBundleProjectDescription {	42	public class BundleProjectDescription implements IBundleProjectDescription {
42		43
43	private IProject fProject;	44	private IProject fProject;
		45	private IPath fRoot;
44	private String fSymbolicName;	46	private String fSymbolicName;
45	private String fBundleName;	47	private String fBundleName;
46	private String fBundleVendor;	48	private String fBundleVendor;
Lines 61-66 Link Here
61	private IPackageExportDescription[] fExports;	63	private IPackageExportDescription[] fExports;
62	private IPath[] fBinIncludes;	64	private IPath[] fBinIncludes;
63	private WorkspacePluginModelBase fModel;	65	private WorkspacePluginModelBase fModel;
		66	private IBundleProjectService fService;
64		67
65	private static final String[] EQUINOX_HEADERS = new String[] {ICoreConstants.ECLIPSE_AUTOSTART, Constants.BUNDLE_ACTIVATIONPOLICY, ICoreConstants.ECLIPSE_LAZYSTART};	68	private static final String[] EQUINOX_HEADERS = new String[] {ICoreConstants.ECLIPSE_AUTOSTART, Constants.BUNDLE_ACTIVATIONPOLICY, ICoreConstants.ECLIPSE_LAZYSTART};
66		69
Lines 78-89 Link Here
78	}	81	}
79		82
80	/**	83	/**
		84	* Returns the bundle project service.
		85	*
		86	* @return bundle project service
		87	*/
		88	IBundleProjectService getBundleProjectService() {
		89	if (fService == null) {
		90	fService = (IBundleProjectService) PDECore.getDefault().acquireService(IBundleProjectService.class.getName());
		91	}
		92	return fService;
		93	}
		94
		95	/**
81	* Initialize settings from the given project.	96	* Initialize settings from the given project.
82	*	97	*
83	* @param project project	98	* @param project project
84	* @exception CoreException if unable to initialize	99	* @exception CoreException if unable to initialize
85	*/	100	*/
86	private void initiaize(IProject project) throws CoreException {	101	private void initiaize(IProject project) throws CoreException {
		102	IContainer root = PDEProject.getBundleRoot(project);
		103	if (root != project) {
		104	setBundleRoot(root.getProjectRelativePath());
		105	}
87	IPluginModelBase model = PluginRegistry.findModel(project);	106	IPluginModelBase model = PluginRegistry.findModel(project);
88	if (model != null) {	107	if (model != null) {
89	IPluginBase base = model.getPluginBase();	108	IPluginBase base = model.getPluginBase();
Lines 115-123 Link Here
115	} catch (BundleException e) {	134	} catch (BundleException e) {
116	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, e.getMessage(), e));	135	throw new CoreException(new Status(IStatus.ERROR, PDECore.PLUGIN_ID, e.getMessage(), e));
117	}	136	}
118	setHost(Factory.newHost(frag.getPluginId(), getRange(elements[0].getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE))));	137	setHost(getBundleProjectService().newHost(frag.getPluginId(), getRange(elements[0].getAttribute(Constants.BUNDLE_VERSION_ATTRIBUTE))));
119	} else {	138	} else {
120	setHost(Factory.newHost(frag.getPluginId(), getRange(frag.getPluginVersion())));	139	setHost(getBundleProjectService().newHost(frag.getPluginId(), getRange(frag.getPluginVersion())));
121	}	140	}
122	}	141	}
123	if (base instanceof BundlePluginBase) {	142	if (base instanceof BundlePluginBase) {
Lines 147-154 Link Here
147	while (iterator.hasNext()) {	166	while (iterator.hasNext()) {
148	String libName = (String) iterator.next();	167	String libName = (String) iterator.next();
149	IBundleClasspathEntry[] entries = getClasspathEntries(project, build, libName);	168	IBundleClasspathEntry[] entries = getClasspathEntries(project, build, libName);
150	for (int i = 0; i < entries.length; i++) {	169	if (entries != null) {
151	collect.add(entries[i]);	170	for (int i = 0; i < entries.length; i++) {
		171	collect.add(entries[i]);
		172	}
152	}	173	}
153	}	174	}
154	classpath = (IBundleClasspathEntry[]) collect.toArray(new IBundleClasspathEntry[collect.size()]);	175	classpath = (IBundleClasspathEntry[]) collect.toArray(new IBundleClasspathEntry[collect.size()]);
Lines 175-181 Link Here
175	IPackageImportDescription[] imports = new IPackageImportDescription[packages.length];	196	IPackageImportDescription[] imports = new IPackageImportDescription[packages.length];
176	for (int i = 0; i < packages.length; i++) {	197	for (int i = 0; i < packages.length; i++) {
177	ImportPackageObject pkg = packages[i];	198	ImportPackageObject pkg = packages[i];
178	imports[i] = Factory.newPackageImport(pkg.getName(), getRange(pkg.getVersion()), pkg.isOptional());	199	imports[i] = getBundleProjectService().newPackageImport(pkg.getName(), getRange(pkg.getVersion()), pkg.isOptional());
179	}	200	}
180	setPackageImports(imports);	201	setPackageImports(imports);
181	}	202	}
Lines 195-201 Link Here
195	friends[j] = pfs[j].getName();	216	friends[j] = pfs[j].getName();
196	}	217	}
197	}	218	}
198	exports[i] = Factory.newPackageExport(exp.getName(), getVersion(exp.getVersion()), !exp.isInternal(), friends);	219	exports[i] = getBundleProjectService().newPackageExport(exp.getName(), getVersion(exp.getVersion()), !exp.isInternal(), friends);
199	}	220	}
200	setPackageExports(exports);	221	setPackageExports(exports);
201	}	222	}
Lines 207-213 Link Here
207	IRequiredBundleDescription[] req = new IRequiredBundleDescription[bundles.length];	228	IRequiredBundleDescription[] req = new IRequiredBundleDescription[bundles.length];
208	for (int i = 0; i < bundles.length; i++) {	229	for (int i = 0; i < bundles.length; i++) {
209	RequireBundleObject rb = bundles[i];	230	RequireBundleObject rb = bundles[i];
210	req[i] = Factory.newRequiredBundle(rb.getId(), getRange(rb.getVersion()), rb.isOptional(), rb.isReexported());	231	req[i] = getBundleProjectService().newRequiredBundle(rb.getId(), getRange(rb.getVersion()), rb.isOptional(), rb.isReexported());
211	}	232	}
212	setRequiredBundles(req);	233	setRequiredBundles(req);
213	}	234	}
Lines 268-274 Link Here
268	entry = build.getEntry(IBuildEntry.OUTPUT_PREFIX + libraryName);	289	entry = build.getEntry(IBuildEntry.OUTPUT_PREFIX + libraryName);
269	if (entry == null) {	290	if (entry == null) {
270	// no source or class file folder	291	// no source or class file folder
271	return new IBundleClasspathEntry[] {Factory.newBundleClasspathEntry(null, null, new Path(libraryName))};	292	return new IBundleClasspathEntry[] {getBundleProjectService().newBundleClasspathEntry(null, null, new Path(libraryName))};
272	}	293	}
273	// base the entries on class file folders	294	// base the entries on class file folders
274	return getClasspathEntries(project, entry, true);	295	return getClasspathEntries(project, entry, true);
Lines 303-326 Link Here
303	IPath path = new Path(tokens[i]);	324	IPath path = new Path(tokens[i]);
304	IBundleClasspathEntry spec = null;	325	IBundleClasspathEntry spec = null;
305	if (binary) {	326	if (binary) {
306	spec = Factory.newBundleClasspathEntry(null, path, lib);	327	spec = getBundleProjectService().newBundleClasspathEntry(null, path, lib);
307	} else {	328	} else {
308	IJavaProject jp = JavaCore.create(project);	329	IJavaProject jp = JavaCore.create(project);
309	IClasspathEntry[] rawClasspath = jp.getRawClasspath();
310	IPath output = null;	330	IPath output = null;
311	for (int j = 0; j < rawClasspath.length; j++) {	331	if (jp.exists()) {
312	IClasspathEntry cpe = rawClasspath[j];	332	IClasspathEntry[] rawClasspath = jp.getRawClasspath();
313	if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {	333	for (int j = 0; j < rawClasspath.length; j++) {
314	if (cpe.getPath().removeFirstSegments(1).equals(path)) {	334	IClasspathEntry cpe = rawClasspath[j];
315	output = cpe.getOutputLocation();	335	if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
316	if (output != null) {	336	if (cpe.getPath().removeFirstSegments(1).equals(path)) {
317	output = output.removeFirstSegments(1);	337	output = cpe.getOutputLocation();
		338	if (output != null) {
		339	output = output.removeFirstSegments(1);
		340	}
		341	break;
318	}	342	}
319	break;
320	}	343	}
321	}	344	}
322	}	345	}
323	spec = Factory.newBundleClasspathEntry(path, output, lib);	346	spec = getBundleProjectService().newBundleClasspathEntry(path, output, lib);
324	}	347	}
325	bces[i] = spec;	348	bces[i] = spec;
326	}	349	}
Lines 378-383 Link Here
378	ProjectModifyOperation operation = new ProjectModifyOperation();	401	ProjectModifyOperation operation = new ProjectModifyOperation();
379	operation.execute(monitor, this);	402	operation.execute(monitor, this);
380	fModel = operation.getModel();	403	fModel = operation.getModel();
		404	fService = null;
381	}	405	}
382		406
383	/**	407	/**
Lines 662-665 Link Here
662	return fBinIncludes;	686	return fBinIncludes;
663	}	687	}
664		688
		689	/* (non-Javadoc)
		690	* @see org.eclipse.pde.core.project.IBundleProjectDescription#setBundleRoot(org.eclipse.core.runtime.IPath)
		691	*/
		692	public void setBundleRoot(IPath path) {
		693	fRoot = path;
		694	}
		695
		696	/* (non-Javadoc)
		697	* @see org.eclipse.pde.core.project.IBundleProjectDescription#getBundleRoot()
		698	*/
		699	public IPath getBundleRoot() {
		700	return fRoot;
		701	}
		702
665	}	703	}

Lines 1-5 Link Here

(-)src_ant/org/eclipse/pde/internal/core/ant/ConvertSchemaToHTML.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 157-165 Link Here
157		157
158	ExternalPluginModelBase model = null;	158	ExternalPluginModelBase model = null;
159	try {	159	try {
160	if (file.getName().toLowerCase(Locale.ENGLISH).equals("fragment.xml")) //$NON-NLS-1$	160	if (file.getName().toLowerCase(Locale.ENGLISH).equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
161	model = new ExternalFragmentModel();	161	model = new ExternalFragmentModel();
162	else if (file.getName().toLowerCase(Locale.ENGLISH).equals("plugin.xml")) //$NON-NLS-1$	162	else if (file.getName().toLowerCase(Locale.ENGLISH).equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR))
163	model = new ExternalPluginModel();	163	model = new ExternalPluginModel();
164	else {	164	else {
165	System.out.println(NLS.bind(PDECoreMessages.Builders_Convert_illegalValue, "manifest")); //$NON-NLS-1$	165	System.out.println(NLS.bind(PDECoreMessages.Builders_Convert_illegalValue, "manifest")); //$NON-NLS-1$

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ds/ui/wizards/DSCreationOperation.java (-5 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 Code 9 Corporation and others.	2	* Copyright (c) 2008, 2010 Code 9 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 9-14 Link Here
9	* Code 9 Corporation - initial API and implementation	9	* Code 9 Corporation - initial API and implementation
10	* Chris Aniszczyk <caniszczyk@gmail.com>	10	* Chris Aniszczyk <caniszczyk@gmail.com>
11	* Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028	11	* Rafael Oliveira Nobrega <rafael.oliveira@gmail.com> - bug 242028
		12	* IBM - ongoing maintenance
12	*******************************************************************************/	13	*******************************************************************************/
13	package org.eclipse.pde.internal.ds.ui.wizards;	14	package org.eclipse.pde.internal.ds.ui.wizards;
14		15
Lines 28-38 Link Here
28	import org.eclipse.pde.core.build.IBuildEntry;	29	import org.eclipse.pde.core.build.IBuildEntry;
29	import org.eclipse.pde.core.build.IBuildModel;	30	import org.eclipse.pde.core.build.IBuildModel;
30	import org.eclipse.pde.core.build.IBuildModelFactory;	31	import org.eclipse.pde.core.build.IBuildModelFactory;
31	import org.eclipse.pde.internal.core.ICoreConstants;
32	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	32	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
33	import org.eclipse.pde.internal.core.ibundle.IBundleModel;	33	import org.eclipse.pde.internal.core.ibundle.IBundleModel;
34	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	34	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
35	import org.eclipse.pde.internal.core.natures.PDE;	35	import org.eclipse.pde.internal.core.natures.PDE;
		36	import org.eclipse.pde.internal.core.project.PDEProject;
36	import org.eclipse.pde.internal.core.util.CoreUtility;	37	import org.eclipse.pde.internal.core.util.CoreUtility;
37	import org.eclipse.pde.internal.ds.core.IDSComponent;	38	import org.eclipse.pde.internal.ds.core.IDSComponent;
38	import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;	39	import org.eclipse.pde.internal.ds.core.IDSDocumentFactory;
Lines 110-122 Link Here
110	private void writeBuildProperties(final IProject project,	111	private void writeBuildProperties(final IProject project,
111	SubProgressMonitor monitor) {	112	SubProgressMonitor monitor) {
112		113
113	PDEModelUtility.modifyModel(new ModelModification(project	114	PDEModelUtility.modifyModel(new ModelModification(PDEProject
114	.getFile(PDEModelUtility.F_BUILD)) {	115	.getBuildProperties(project)) {
115	protected void modifyModel(IBaseModel model,	116	protected void modifyModel(IBaseModel model,
116	IProgressMonitor monitor) throws CoreException {	117	IProgressMonitor monitor) throws CoreException {
117	if (!(model instanceof IBuildModel))	118	if (!(model instanceof IBuildModel))
118	return;	119	return;
119	IFile file = project.getFile(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);	120	IFile file = PDEProject.getBuildProperties(project);
120	if (file.exists()) {	121	if (file.exists()) {
121	WorkspaceBuildModel wbm = new WorkspaceBuildModel(file);	122	WorkspaceBuildModel wbm = new WorkspaceBuildModel(file);
122	wbm.load();	123	wbm.load();

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java (-3 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2009 IBM Corporation and others.	2	* Copyright (c) 2003, 2010 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 24-29 Link Here
24	import org.eclipse.pde.core.plugin.IPluginModelBase;	24	import org.eclipse.pde.core.plugin.IPluginModelBase;
25	import org.eclipse.pde.core.plugin.PluginRegistry;	25	import org.eclipse.pde.core.plugin.PluginRegistry;
26	import org.eclipse.pde.internal.core.*;	26	import org.eclipse.pde.internal.core.*;
		27	import org.eclipse.pde.internal.core.project.PDEProject;
27	import org.eclipse.pde.internal.core.util.CoreUtility;	28	import org.eclipse.pde.internal.core.util.CoreUtility;
28	import org.eclipse.pde.internal.launching.IPDEConstants;	29	import org.eclipse.pde.internal.launching.IPDEConstants;
29	import org.eclipse.pde.internal.launching.PDELaunchingPlugin;	30	import org.eclipse.pde.internal.launching.PDELaunchingPlugin;
Lines 198-206 Link Here
198	}	199	}
199	}	200	}
200	}	201	}
201	String[] otherFiles = {ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR, ICoreConstants.BUILD_FILENAME_DESCRIPTOR};	202	IFile[] otherFiles = new IFile[] {PDEProject.getManifest(project), PDEProject.getBuildProperties(project)};
202	for (int i = 0; i < otherFiles.length; i++) {	203	for (int i = 0; i < otherFiles.length; i++) {
203	IResource file = project.getFile(otherFiles[i]);	204	IFile file = otherFiles[i];
204	if (file != null) {	205	if (file != null) {
205	long fileTimeStamp = file.getRawLocation().toFile().lastModified();	206	long fileTimeStamp = file.getRawLocation().toFile().lastModified();
206	if (timeStamp < fileTimeStamp)	207	if (timeStamp < fileTimeStamp)

Lines 1-5 Link Here

(-)src/org/eclipse/pde/launching/AbstractPDELaunchConfiguration.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 21-26 Link Here
21	import org.eclipse.jdt.core.IJavaModelMarker;	21	import org.eclipse.jdt.core.IJavaModelMarker;
22	import org.eclipse.jdt.launching.*;	22	import org.eclipse.jdt.launching.*;
23	import org.eclipse.pde.core.plugin.TargetPlatform;	23	import org.eclipse.pde.core.plugin.TargetPlatform;
		24	import org.eclipse.pde.internal.core.ICoreConstants;
24	import org.eclipse.pde.internal.core.TargetPlatformHelper;	25	import org.eclipse.pde.internal.core.TargetPlatformHelper;
25	import org.eclipse.pde.internal.core.builders.PDEMarkerFactory;	26	import org.eclipse.pde.internal.core.builders.PDEMarkerFactory;
26	import org.eclipse.pde.internal.launching.*;	27	import org.eclipse.pde.internal.launching.*;
Lines 234-240 Link Here
234	// add tracing, if turned on	235	// add tracing, if turned on
235	if (configuration.getAttribute(IPDELauncherConstants.TRACING, false) && !IPDELauncherConstants.TRACING_NONE.equals(configuration.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null))) {	236	if (configuration.getAttribute(IPDELauncherConstants.TRACING, false) && !IPDELauncherConstants.TRACING_NONE.equals(configuration.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null))) {
236	programArgs.add("-debug"); //$NON-NLS-1$	237	programArgs.add("-debug"); //$NON-NLS-1$
237	programArgs.add(LaunchArgumentsHelper.getTracingFileArgument(configuration, getConfigDir(configuration).toString() + IPath.SEPARATOR + ".options")); //$NON-NLS-1$	238	programArgs.add(LaunchArgumentsHelper.getTracingFileArgument(configuration, getConfigDir(configuration).toString() + IPath.SEPARATOR + ICoreConstants.OPTIONS_FILENAME));
238	}	239	}
239		240
240	// add the program args specified by the user	241	// add the program args specified by the user

Lines 1-5 Link Here

(-)src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java (-3 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2009 IBM Corporation and others.	2	* Copyright (c) 2006, 2010 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-19 Link Here
13	*******************************************************************************/	13	*******************************************************************************/
14	package org.eclipse.pde.launching;	14	package org.eclipse.pde.launching;
15		15
16
17	import java.io.File;	16	import java.io.File;
18	import java.util.*;	17	import java.util.*;
19	import org.eclipse.core.resources.IProject;	18	import org.eclipse.core.resources.IProject;
Lines 149-155 Link Here
149	// Create the .options file if tracing is turned on	148	// Create the .options file if tracing is turned on
150	if (configuration.getAttribute(IPDELauncherConstants.TRACING, false) && !IPDELauncherConstants.TRACING_NONE.equals(configuration.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null))) {	149	if (configuration.getAttribute(IPDELauncherConstants.TRACING, false) && !IPDELauncherConstants.TRACING_NONE.equals(configuration.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null))) {
151	programArgs.add("-debug"); //$NON-NLS-1$	150	programArgs.add("-debug"); //$NON-NLS-1$
152	String path = getConfigurationDirectory(configuration).getPath() + IPath.SEPARATOR + ".options"; //$NON-NLS-1$	151	String path = getConfigurationDirectory(configuration).getPath() + IPath.SEPARATOR + ICoreConstants.OPTIONS_FILENAME;
153	programArgs.add(LaunchArgumentsHelper.getTracingFileArgument(configuration, path));	152	programArgs.add(LaunchArgumentsHelper.getTracingFileArgument(configuration, path));
154	}	153	}
155		154

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2009 IBM Corporation and others.	2	* Copyright (c) 2003, 2010 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 32-37 Link Here
32	import org.eclipse.jface.viewers.IStructuredSelection;	32	import org.eclipse.jface.viewers.IStructuredSelection;
33	import org.eclipse.pde.core.plugin.TargetPlatform;	33	import org.eclipse.pde.core.plugin.TargetPlatform;
34	import org.eclipse.pde.internal.build.IXMLConstants;	34	import org.eclipse.pde.internal.build.IXMLConstants;
		35	import org.eclipse.pde.internal.core.ICoreConstants;
35	import org.eclipse.pde.internal.core.PDEPreferencesManager;	36	import org.eclipse.pde.internal.core.PDEPreferencesManager;
36	import org.eclipse.pde.internal.core.exports.BuildUtilities;	37	import org.eclipse.pde.internal.core.exports.BuildUtilities;
37	import org.eclipse.pde.internal.core.natures.PDE;	38	import org.eclipse.pde.internal.core.natures.PDE;
Lines 114-120 Link Here
114	// Force the build if autobuild is off	115	// Force the build if autobuild is off
115	IProject project = file.getProject();	116	IProject project = file.getProject();
116	if (!project.getWorkspace().isAutoBuilding()) {	117	if (!project.getWorkspace().isAutoBuilding()) {
117	String builderID = "feature.xml".equals(file.getName()) ? PDE.FEATURE_BUILDER_ID : PDE.MANIFEST_BUILDER_ID; //$NON-NLS-1$	118	String builderID = ICoreConstants.FEATURE_FILENAME_DESCRIPTOR.equals(file.getName()) ? PDE.FEATURE_BUILDER_ID : PDE.MANIFEST_BUILDER_ID;
118	project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, builderID, null, monitor);	119	project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, builderID, null, monitor);
119	}	120	}
120		121

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/compare/PluginStructureCreator.java (-2 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 2010 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 17-22 Link Here
17	import org.eclipse.jface.resource.*;	17	import org.eclipse.jface.resource.*;
18	import org.eclipse.jface.text.IDocument;	18	import org.eclipse.jface.text.IDocument;
19	import org.eclipse.pde.core.plugin.*;	19	import org.eclipse.pde.core.plugin.*;
		20	import org.eclipse.pde.internal.core.ICoreConstants;
20	import org.eclipse.pde.internal.core.text.IDocumentElementNode;	21	import org.eclipse.pde.internal.core.text.IDocumentElementNode;
21	import org.eclipse.pde.internal.core.text.plugin.*;	22	import org.eclipse.pde.internal.core.text.plugin.*;
22	import org.eclipse.pde.internal.ui.*;	23	import org.eclipse.pde.internal.ui.*;
Lines 128-134 Link Here
128	}	129	}
129		130
130	private boolean isFragment(Object input) {	131	private boolean isFragment(Object input) {
131	if (input instanceof ITypedElement && ((ITypedElement) input).getName().equals("fragment.xml")) //$NON-NLS-1$	132	if (input instanceof ITypedElement && ((ITypedElement) input).getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR))
132	return true;	133	return true;
133	return false;	134	return false;
134	}	135	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/correction/ExternalizeResolution.java (-3 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 20-28 Link Here
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21	import org.eclipse.pde.core.IBaseModel;	21	import org.eclipse.pde.core.IBaseModel;
22	import org.eclipse.pde.core.plugin.IPluginModelBase;	22	import org.eclipse.pde.core.plugin.IPluginModelBase;
		23	import org.eclipse.pde.internal.core.ICoreConstants;
23	import org.eclipse.pde.internal.core.PDEManager;	24	import org.eclipse.pde.internal.core.PDEManager;
24	import org.eclipse.pde.internal.core.ibundle.IBundle;	25	import org.eclipse.pde.internal.core.ibundle.IBundle;
25	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	26	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
		27	import org.eclipse.pde.internal.core.project.PDEProject;
26	import org.eclipse.pde.internal.core.util.CoreUtility;	28	import org.eclipse.pde.internal.core.util.CoreUtility;
27	import org.eclipse.pde.internal.ui.PDEPlugin;	29	import org.eclipse.pde.internal.ui.PDEPlugin;
28	import org.eclipse.pde.internal.ui.PDEUIMessages;	30	import org.eclipse.pde.internal.ui.PDEUIMessages;
Lines 99-106 Link Here
99	IFile file = ((IFile) marker.getResource());	101	IFile file = ((IFile) marker.getResource());
100	ModelModification modification = null;	102	ModelModification modification = null;
101	// if file we are externalizing is not manifest, try to pass manifest in if it exists	103	// if file we are externalizing is not manifest, try to pass manifest in if it exists
102	if (!file.getName().equals(PDEModelUtility.F_MANIFEST)) {	104	if (!file.getName().equals(ICoreConstants.MANIFEST_FILENAME)) {
103	IFile manifest = file.getProject().getFile(PDEModelUtility.F_MANIFEST_FP);	105	IFile manifest = PDEProject.getManifest(file.getProject());
104	if (manifest.exists()) {	106	if (manifest.exists()) {
105	modification = new ModelModification(manifest, file) {	107	modification = new ModelModification(manifest, file) {
106	protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {	108	protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java (-6 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.	2	* Copyright (c) 2005, 2010 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 28-35 Link Here
28	import org.eclipse.pde.core.build.IBuildEntry;	28	import org.eclipse.pde.core.build.IBuildEntry;
29	import org.eclipse.pde.core.build.IBuildModel;	29	import org.eclipse.pde.core.build.IBuildModel;
30	import org.eclipse.pde.core.plugin.*;	30	import org.eclipse.pde.core.plugin.*;
		31	import org.eclipse.pde.internal.core.ICoreConstants;
31	import org.eclipse.pde.internal.core.ibundle.IBundle;	32	import org.eclipse.pde.internal.core.ibundle.IBundle;
32	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;	33	import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
		34	import org.eclipse.pde.internal.core.project.PDEProject;
33	import org.eclipse.pde.internal.ui.PDEUIMessages;	35	import org.eclipse.pde.internal.ui.PDEUIMessages;
34	import org.eclipse.pde.internal.ui.util.ModelModification;	36	import org.eclipse.pde.internal.ui.util.ModelModification;
35	import org.eclipse.pde.internal.ui.util.PDEModelUtility;	37	import org.eclipse.pde.internal.ui.util.PDEModelUtility;
Lines 69-75 Link Here
69	addBundleLocalization(change, monitor, pluginChange);	71	addBundleLocalization(change, monitor, pluginChange);
70		72
71	// Update build.properties file (if exists & not already done)	73	// Update build.properties file (if exists & not already done)
72	IFile buildProps = changeFile.getFile().getProject().getFile(PDEModelUtility.F_BUILD);	74	IFile buildProps = PDEProject.getBuildProperties(changeFile.getFile().getProject());
73	if (buildProps != null && buildProps.exists() && !fFileChanges.containsKey(buildProps)) {	75	if (buildProps != null && buildProps.exists() && !fFileChanges.containsKey(buildProps)) {
74	getChangeForBuild(buildProps, monitor, pluginChange, change.getBundleLocalization());	76	getChangeForBuild(buildProps, monitor, pluginChange, change.getBundleLocalization());
75	}	77	}
Lines 132-140 Link Here
132	change.setEdit(edit);	134	change.setEdit(edit);
133	// mark a plugin.xml or a fragment.xml as PLUGIN2 type so they will be compared	135	// mark a plugin.xml or a fragment.xml as PLUGIN2 type so they will be compared
134	// with the PluginContentMergeViewer	136	// with the PluginContentMergeViewer
135	String textType = file.getName().equals("plugin.xml") \|\| //$NON-NLS-1$	137	String textType = file.getName().equals(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR) \|\| file.getName().equals(ICoreConstants.FRAGMENT_FILENAME_DESCRIPTOR) ? "PLUGIN2" //$NON-NLS-1$
136	file.getName().equals("fragment.xml") ? //$NON-NLS-1$
137	"PLUGIN2" //$NON-NLS-1$
138	: file.getFileExtension();	138	: file.getFileExtension();
139	change.setTextType(textType);	139	change.setTextType(textType);
140	parentChange.add(change);	140	parentChange.add(change);
Lines 166-172 Link Here
166		166
167	private void addBundleLocalization(ModelChange change, IProgressMonitor mon, CompositeChange parent) {	167	private void addBundleLocalization(ModelChange change, IProgressMonitor mon, CompositeChange parent) {
168	IPluginModelBase base = change.getParentModel();	168	IPluginModelBase base = change.getParentModel();
169	IFile manifest = base.getUnderlyingResource().getProject().getFile(PDEModelUtility.F_MANIFEST_FP);	169	IFile manifest = PDEProject.getManifest(base.getUnderlyingResource().getProject());
170	// if the edit for this manifest file is in the HashMap, then we must have added	170	// if the edit for this manifest file is in the HashMap, then we must have added
171	// the localization already since it is checked first (this must be the second or subsequent	171	// the localization already since it is checked first (this must be the second or subsequent
172	// change to the manifest for this plug-in)	172	// change to the manifest for this plug-in)

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java (-6 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2008, 2009 IBM Corporation and others.	2	* Copyright (c) 2008, 2010 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	import org.eclipse.jface.wizard.IWizardContainer;	23	import org.eclipse.jface.wizard.IWizardContainer;
24	import org.eclipse.osgi.util.NLS;	24	import org.eclipse.osgi.util.NLS;
25	import org.eclipse.pde.core.plugin.IPluginModelBase;	25	import org.eclipse.pde.core.plugin.IPluginModelBase;
		26	import org.eclipse.pde.internal.core.ICoreConstants;
26	import org.eclipse.pde.internal.core.TargetPlatformHelper;	27	import org.eclipse.pde.internal.core.TargetPlatformHelper;
27	import org.eclipse.pde.internal.core.plugin.ExternalPluginModelBase;	28	import org.eclipse.pde.internal.core.plugin.ExternalPluginModelBase;
28	import org.eclipse.pde.internal.ui.PDEPlugin;	29	import org.eclipse.pde.internal.ui.PDEPlugin;
Lines 53-61 Link Here
53	private static final String PROPERTIES_EXTENSION = ".properties"; //$NON-NLS-1$	54	private static final String PROPERTIES_EXTENSION = ".properties"; //$NON-NLS-1$
54	private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$	55	private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
55		56
56	private static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
57	private static final String BUILD_PROPERTIES = "build.properties"; //$NON-NLS-1$
58
59	private static final String BIN = "/bin/"; //$NON-NLS-1$	57	private static final String BIN = "/bin/"; //$NON-NLS-1$
60	private static final String EMPTY_STRING = ""; //$NON-NLS-1$	58	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
61	private static final String BACKSLASH = "\\"; //$NON-NLS-1$	59	private static final String BACKSLASH = "\\"; //$NON-NLS-1$
Lines 92-98 Link Here
92	add(new AbstractFilter(false) {	90	add(new AbstractFilter(false) {
93	public boolean matches(Object object) {	91	public boolean matches(Object object) {
94	String path = object.toString();	92	String path = object.toString();
95	return path.indexOf(BIN) != -1 \|\| path.endsWith(SLASH) \|\| path.endsWith(PLUGIN_XML);	93	return path.indexOf(BIN) != -1 \|\| path.endsWith(SLASH) \|\| path.endsWith(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
96	}	94	}
97	});	95	});
98		96
Lines 110-116 Link Here
110	add(new AbstractFilter(false) {	108	add(new AbstractFilter(false) {
111	public boolean matches(Object object) {	109	public boolean matches(Object object) {
112	String path = object.toString();	110	String path = object.toString();
113	return path.indexOf(BIN) != -1 \|\| path.endsWith(BUILD_PROPERTIES);	111	return path.indexOf(BIN) != -1 \|\| path.endsWith(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
114	}	112	}
115	});	113	});
116		114

Lines 19-24 Link Here

(-)src/org/eclipse/pde/internal/ui/search/SearchResult.java (-1 / +2 lines)
19	import org.eclipse.jface.resource.ImageDescriptor;	19	import org.eclipse.jface.resource.ImageDescriptor;
20	import org.eclipse.jface.text.IDocument;	20	import org.eclipse.jface.text.IDocument;
21	import org.eclipse.pde.core.plugin.IPluginObject;	21	import org.eclipse.pde.core.plugin.IPluginObject;
		22	import org.eclipse.pde.internal.core.ICoreConstants;
22	import org.eclipse.pde.internal.ui.PDEPluginImages;	23	import org.eclipse.pde.internal.ui.PDEPluginImages;
23	import org.eclipse.pde.internal.ui.PDEUIMessages;	24	import org.eclipse.pde.internal.ui.PDEUIMessages;
24	import org.eclipse.search.ui.ISearchQuery;	25	import org.eclipse.search.ui.ISearchQuery;
Lines 119-125 Link Here
119	if (file != null) {	120	if (file != null) {
120	IPath path = new Path(object.getModel().getInstallLocation());	121	IPath path = new Path(object.getModel().getInstallLocation());
121	IPath filePath = null;	122	IPath filePath = null;
122	if ("MANIFEST.MF".equals(file.getName())) //$NON-NLS-1$	123	if (ICoreConstants.MANIFEST_FILENAME.equals(file.getName()))
123	filePath = new Path(file.getParentFile().getParent());	124	filePath = new Path(file.getParentFile().getParent());
124	else if (file.getName().endsWith("jar")) { //$NON-NLS-1$	125	else if (file.getName().endsWith("jar")) { //$NON-NLS-1$
125	filePath = new Path(file.getPath());	126	filePath = new Path(file.getPath());

Lines 31-36 Link Here

(-)src/org/eclipse/pde/internal/ui/search/dependencies/AddNewDependenciesOperation.java (-2 / +3 lines)
31	import org.eclipse.pde.internal.core.converter.PluginConverter;	31	import org.eclipse.pde.internal.core.converter.PluginConverter;
32	import org.eclipse.pde.internal.core.ibundle.*;	32	import org.eclipse.pde.internal.core.ibundle.*;
33	import org.eclipse.pde.internal.core.plugin.PluginImport;	33	import org.eclipse.pde.internal.core.plugin.PluginImport;
		34	import org.eclipse.pde.internal.core.project.PDEProject;
34	import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;	35	import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;
35	import org.eclipse.pde.internal.core.text.bundle.*;	36	import org.eclipse.pde.internal.core.text.bundle.*;
36	import org.eclipse.pde.internal.ui.PDEUIMessages;	37	import org.eclipse.pde.internal.ui.PDEUIMessages;
Lines 113-119 Link Here
113	}	114	}
114		115
115	protected final IBuild getBuild() {	116	protected final IBuild getBuild() {
116	IFile buildProps = fProject.getFile("build.properties"); //$NON-NLS-1$	117	IFile buildProps = PDEProject.getBuildProperties(fProject);
117	if (buildProps != null) {	118	if (buildProps != null) {
118	WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);	119	WorkspaceBuildModel model = new WorkspaceBuildModel(buildProps);
119	if (model != null)	120	if (model != null)
Lines 347-353 Link Here
347	} else	348	} else
348	addRequireBundles(plugins, pbase, build.getEntry(IBuildEntry.SECONDARY_DEPENDENCIES));	349	addRequireBundles(plugins, pbase, build.getEntry(IBuildEntry.SECONDARY_DEPENDENCIES));
349	try {	350	try {
350	build.write("", new PrintWriter(new FileOutputStream(fProject.getFile("build.properties").getFullPath().toFile()))); //$NON-NLS-1$ //$NON-NLS-2$	351	build.write("", new PrintWriter(new FileOutputStream(PDEProject.getBuildProperties(fProject).getFullPath().toFile()))); //$NON-NLS-1$ //$NON-NLS-2$
351	} catch (FileNotFoundException e) {	352	} catch (FileNotFoundException e) {
352	}	353	}
353	} else {	354	} else {

Lines 20-29 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/AbstractCreateFeatureOperation.java (-4 / +6 lines)
20	import org.eclipse.jface.viewers.StructuredSelection;	20	import org.eclipse.jface.viewers.StructuredSelection;
21	import org.eclipse.pde.core.build.IBuildEntry;	21	import org.eclipse.pde.core.build.IBuildEntry;
22	import org.eclipse.pde.internal.build.IBuildPropertiesConstants;	22	import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
		23	import org.eclipse.pde.internal.core.ICoreConstants;
23	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;	24	import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
24	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;	25	import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
25	import org.eclipse.pde.internal.core.ifeature.*;	26	import org.eclipse.pde.internal.core.ifeature.*;
26	import org.eclipse.pde.internal.core.natures.PDE;	27	import org.eclipse.pde.internal.core.natures.PDE;
		28	import org.eclipse.pde.internal.core.project.PDEProject;
27	import org.eclipse.pde.internal.core.util.CoreUtility;	29	import org.eclipse.pde.internal.core.util.CoreUtility;
28	import org.eclipse.pde.internal.ui.*;	30	import org.eclipse.pde.internal.ui.*;
29	import org.eclipse.swt.widgets.Shell;	31	import org.eclipse.swt.widgets.Shell;
Lines 73-79 Link Here
73	} else {	75	} else {
74	fProject.create(monitor);	76	fProject.create(monitor);
75	fProject.open(monitor);	77	fProject.open(monitor);
76	file = fProject.getFile("feature.xml"); //$NON-NLS-1$	78	file = PDEProject.getFeatureXml(fProject);
77	monitor.worked(3);	79	monitor.worked(3);
78	}	80	}
79	if (file.exists())	81	if (file.exists())
Lines 105-115 Link Here
105	}	107	}
106		108
107	protected void createBuildProperties() throws CoreException {	109	protected void createBuildProperties() throws CoreException {
108	IFile file = fProject.getFile("build.properties"); //$NON-NLS-1$	110	IFile file = PDEProject.getBuildProperties(fProject);
109	if (!file.exists()) {	111	if (!file.exists()) {
110	WorkspaceBuildModel model = new WorkspaceBuildModel(file);	112	WorkspaceBuildModel model = new WorkspaceBuildModel(file);
111	IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$	113	IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
112	ientry.addToken("feature.xml"); //$NON-NLS-1$	114	ientry.addToken(ICoreConstants.FEATURE_FILENAME_DESCRIPTOR);
113	String library = fFeatureData.library;	115	String library = fFeatureData.library;
114	if (library != null) {	116	if (library != null) {
115	String source = fFeatureData.getSourceFolderName();	117	String source = fFeatureData.getSourceFolderName();
Lines 138-144 Link Here
138	}	140	}
139		141
140	protected IFile createFeature() throws CoreException {	142	protected IFile createFeature() throws CoreException {
141	IFile file = fProject.getFile("feature.xml"); //$NON-NLS-1$	143	IFile file = PDEProject.getFeatureXml(fProject);
142	WorkspaceFeatureModel model = new WorkspaceFeatureModel();	144	WorkspaceFeatureModel model = new WorkspaceFeatureModel();
143	model.setFile(file);	145	model.setFile(file);
144	IFeature feature = model.getFeature();	146	IFeature feature = model.getFeature();

Lines 1-5 Link Here

(-)src/org/eclipse/pde/ui/tests/wizards/ConvertProjectToPluginTestCase.java (-11 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 2010 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 12-29 Link Here
12	package org.eclipse.pde.ui.tests.wizards;	12	package org.eclipse.pde.ui.tests.wizards;
13		13
14	import java.lang.reflect.InvocationTargetException;	14	import java.lang.reflect.InvocationTargetException;
15
16	import junit.framework.Test;	15	import junit.framework.Test;
17	import junit.framework.TestSuite;	16	import junit.framework.TestSuite;
18		17	import org.eclipse.core.resources.*;
19	import org.eclipse.core.resources.IProject;
20	import org.eclipse.core.resources.IWorkspaceRoot;
21	import org.eclipse.core.resources.ResourcesPlugin;
22	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;
23	import org.eclipse.core.runtime.NullProgressMonitor;	19	import org.eclipse.core.runtime.NullProgressMonitor;
24	import org.eclipse.jface.operation.IRunnableWithProgress;	20	import org.eclipse.jface.operation.IRunnableWithProgress;
25	import org.eclipse.pde.internal.core.ICoreConstants;
26	import org.eclipse.pde.internal.core.natures.PDE;	21	import org.eclipse.pde.internal.core.natures.PDE;
		22	import org.eclipse.pde.internal.core.project.PDEProject;
27	import org.eclipse.pde.internal.ui.wizards.tools.ConvertProjectToPluginOperation;	23	import org.eclipse.pde.internal.ui.wizards.tools.ConvertProjectToPluginOperation;
28	import org.eclipse.pde.ui.tests.PDETestCase;	24	import org.eclipse.pde.ui.tests.PDETestCase;
29	import org.eclipse.ui.PlatformUI;	25	import org.eclipse.ui.PlatformUI;
Lines 58-65 Link Here
58	convertProject(project);	54	convertProject(project);
59		55
60	assertTrue(project.hasNature(PDE.PLUGIN_NATURE));	56	assertTrue(project.hasNature(PDE.PLUGIN_NATURE));
61	assertTrue(project.getFile(ICoreConstants.MANIFEST_PATH).exists());	57	assertTrue(PDEProject.getManifest(project).exists());
62	assertTrue(project.getFile(ICoreConstants.BUILD_PROPERTIES_PATH).exists());	58	assertTrue(PDEProject.getBuildProperties(project).exists());
63	}	59	}
64		60
65	/**	61	/**
Lines 87-94 Link Here
87	for (int i = 0; i < projects.length; i++) {	83	for (int i = 0; i < projects.length; i++) {
88	IProject project = projects[i];	84	IProject project = projects[i];
89	assertTrue(project.hasNature(PDE.PLUGIN_NATURE));	85	assertTrue(project.hasNature(PDE.PLUGIN_NATURE));
90	assertTrue(project.getFile(ICoreConstants.MANIFEST_PATH).exists());	86	assertTrue(PDEProject.getManifest(project).exists());
91	assertTrue(project.getFile(ICoreConstants.BUILD_PROPERTIES_PATH).exists());	87	assertTrue(PDEProject.getBuildProperties(project).exists());
92	}	88	}
93	}	89	}
94		90