Attachment 255202 Details for Bug 470111 – Updated patch

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

[patch] Updated patch

470111_updated.patch (text/plain), 4.72 KB, created by Vikas Chandra

on 2015-07-15 05:09:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2015-07-15 05:09:16 EDT

Size: 4.72 KB

patch

obsolete

>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
>index 2323d83..0a45645 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/FeatureModelManager.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- *  Copyright (c) 2000, 2013 IBM Corporation and others.
>+ *  Copyright (c) 2000, 2015 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
>@@ -12,9 +12,13 @@
> 
> import java.util.*;
> import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.WorkspaceJob;
>+import org.eclipse.core.runtime.*;
> import org.eclipse.pde.core.*;
>+import org.eclipse.pde.core.target.ITargetDefinition;
> import org.eclipse.pde.internal.core.FeatureTable.Idver;
> import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
>+import org.eclipse.pde.internal.core.target.P2TargetUtils;
> import org.eclipse.pde.internal.core.util.VersionUtil;
> import org.osgi.framework.Version;
> 
>@@ -93,7 +97,26 @@
> 		fExternalManager = new ExternalFeatureModelManager();
> 		fExternalManager.addModelProviderListener(fProviderListener);
> 		fReloadExternalNeeded = false;
>-		fExternalManager.initialize();
>+
>+		ITargetDefinition unresolvedRepoBasedtarget = null;
>+		try {
>+			unresolvedRepoBasedtarget = TargetPlatformHelper.getUnresolvedRepositoryBasedWorkspaceTarget();
>+		} catch (CoreException e) {
>+			PDECore.log(e);
>+		}
>+		if (unresolvedRepoBasedtarget != null && !P2TargetUtils.isProfileValid(unresolvedRepoBasedtarget)) {
>+
>+			WorkspaceJob initializeExternalManager = new WorkspaceJob(PDECoreMessages.FeatureModelManager_initializingFeatureTargetPlatform) {
>+				@Override
>+				public IStatus runInWorkspace(IProgressMonitor monitor) {
>+					fExternalManager.initialize();
>+					return Status.OK_STATUS;
>+				}
>+			};
>+			initializeExternalManager.schedule();
>+		} else
>+			fExternalManager.initialize();
>+
> 	}
> 
> 	/*
>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java
>index b17577d..4416983 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECoreMessages.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2013 IBM Corporation and others.
>+ * Copyright (c) 2005, 2015 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
>@@ -300,6 +300,8 @@
> 
> 	public static String FeatureExportOperation_workspaceBuildErrorsFoundDuringExport;
> 
>+	public static String FeatureModelManager_initializingFeatureTargetPlatform;
>+
> 	public static String XMLErrorReporter_ExternalEntityResolution;
> 
> 	public static String ExtensionsErrorReporter_InvalidSchema;
>diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
>index 6882542..f3b181a 100644
>--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
>+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/pderesources.properties
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2000, 2013 IBM Corporation and others.
>+# Copyright (c) 2000, 2015 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
>@@ -214,6 +214,7 @@
> FeatureExportOperation_runningBuildScript=Running build script
> FeatureExportOperation_runningPackagerScript=Running packager script
> FeatureExportOperation_workspaceBuildErrorsFoundDuringExport=Export completed successfully, but build problems were detected in the following required projects: {0}
>+FeatureModelManager_initializingFeatureTargetPlatform=Initializing feature from target platform
> BaseExportTask_pdeExport=PDE Export
> ClasspathHelper_BadFileLocation=Could not determine absolute location of file: {0}
> ConvertSchemaToHTML_CannotFindIncludedSchema=Cannot find included schema ''{0}'' required by parent schema ''{1}''

Actions: View | Diff

Attachments on bug 470111: 254398 | 254874 | 255050 | 255202