Attachment #255050 for bug #470111

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

Lines 1-5 Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java (-2 / +25 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2013 IBM Corporation and others.	2	* Copyright (c) 2000, 2015 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-20 Link Here
12		12
13	import java.util.*;	13	import java.util.*;
14	import org.eclipse.core.resources.IProject;	14	import org.eclipse.core.resources.IProject;
		15	import org.eclipse.core.resources.WorkspaceJob;
		16	import org.eclipse.core.runtime.*;
15	import org.eclipse.pde.core.*;	17	import org.eclipse.pde.core.*;
		18	import org.eclipse.pde.core.target.ITargetDefinition;
16	import org.eclipse.pde.internal.core.FeatureTable.Idver;	19	import org.eclipse.pde.internal.core.FeatureTable.Idver;
17	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	20	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
		21	import org.eclipse.pde.internal.core.target.P2TargetUtils;
18	import org.eclipse.pde.internal.core.util.VersionUtil;	22	import org.eclipse.pde.internal.core.util.VersionUtil;
19	import org.osgi.framework.Version;	23	import org.osgi.framework.Version;
20		24
Lines 93-99 Link Here
93	fExternalManager = new ExternalFeatureModelManager();	97	fExternalManager = new ExternalFeatureModelManager();
94	fExternalManager.addModelProviderListener(fProviderListener);	98	fExternalManager.addModelProviderListener(fProviderListener);
95	fReloadExternalNeeded = false;	99	fReloadExternalNeeded = false;
96	fExternalManager.initialize();	100
		101	ITargetDefinition unresolvedRepoBasedtarget = null;
		102	try {
		103	unresolvedRepoBasedtarget = TargetPlatformHelper.getUnresolvedRepositoryBasedWorkspaceTarget();
		104	} catch (CoreException e) {
		105	PDECore.log(e);
		106	}
		107	if (unresolvedRepoBasedtarget != null && !P2TargetUtils.isProfileValid(unresolvedRepoBasedtarget)) {
		108
		109	WorkspaceJob initializeExternalManager = new WorkspaceJob(FeatureModelManager_initializingFeatureTargetPlatform) {
		110	@Override
		111	public IStatus runInWorkspace(IProgressMonitor monitor) {
		112	fExternalManager.initialize();
		113	return Status.OK_STATUS;
		114	}
		115	};
		116	initializeExternalManager.schedule();
		117	} else
		118	fExternalManager.initialize();
		119
97	}	120	}
98		121
99	/*	122	/*

Lines 1-5 Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java (-1 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2013 IBM Corporation and others.	2	* Copyright (c) 2005, 2015 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 300-305 Link Here
300		300
301	public static String FeatureExportOperation_workspaceBuildErrorsFoundDuringExport;	301	public static String FeatureExportOperation_workspaceBuildErrorsFoundDuringExport;
302		302
		303	public static String FeatureModelManager_initializingFeatureTargetPlatform;
		304
303	public static String XMLErrorReporter_ExternalEntityResolution;	305	public static String XMLErrorReporter_ExternalEntityResolution;
304		306
305	public static String ExtensionsErrorReporter_InvalidSchema;	307	public static String ExtensionsErrorReporter_InvalidSchema;

Lines 1-5 Link Here

(-)a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties (-1 / +2 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2013 IBM Corporation and others.	2	# Copyright (c) 2000, 2015 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 214-219 Link Here
214	FeatureExportOperation_runningBuildScript=Running build script	214	FeatureExportOperation_runningBuildScript=Running build script
215	FeatureExportOperation_runningPackagerScript=Running packager script	215	FeatureExportOperation_runningPackagerScript=Running packager script
216	FeatureExportOperation_workspaceBuildErrorsFoundDuringExport=Export completed successfully, but build problems were detected in the following required projects: {0}	216	FeatureExportOperation_workspaceBuildErrorsFoundDuringExport=Export completed successfully, but build problems were detected in the following required projects: {0}
		217	FeatureModelManager_initializingFeatureTargetPlatform=Initializing feature from target platform
217	BaseExportTask_pdeExport=PDE Export	218	BaseExportTask_pdeExport=PDE Export
218	ClasspathHelper_BadFileLocation=Could not determine absolute location of file: {0}	219	ClasspathHelper_BadFileLocation=Could not determine absolute location of file: {0}
219	ConvertSchemaToHTML_CannotFindIncludedSchema=Cannot find included schema ''{0}'' required by parent schema ''{1}''	220	ConvertSchemaToHTML_CannotFindIncludedSchema=Cannot find included schema ''{0}'' required by parent schema ''{1}''

Return to bug 470111