Attachment 258351 Details for Bug 482577 – Fix2

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

[patch] Fix2

manifest_option2.patch (text/plain), 3.58 KB, created by Vikas Chandra

on 2015-11-30 03:27:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2015-11-30 03:27:24 EST

Size: 3.58 KB

patch

obsolete

>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>index f354d3c..93be3cd 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>@@ -790,6 +790,8 @@
> 
> 	// Plug-in Manifest Editor ########################
> 
>+	public static String ManifestEditor_AddSourcePage;
>+
> 	public static String ManifestEditor_DetailExtensionPointSection_title;
> 	public static String ManifestEditor_DetailExtensionPointSection_new;
> 	public static String ManifestEditor_DetailExtensionPointSection_newExtensionPoint;
>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
>index aee4197..5c86290 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
>@@ -17,7 +17,7 @@
> import org.eclipse.core.filesystem.EFS;
> import org.eclipse.core.filesystem.IFileStore;
> import org.eclipse.core.resources.*;
>-import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.preferences.IEclipsePreferences;
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.preference.IPreferenceStore;
>@@ -42,6 +42,7 @@
> import org.eclipse.ui.*;
> import org.eclipse.ui.ide.FileStoreEditorInput;
> import org.eclipse.ui.part.FileEditorInput;
>+import org.eclipse.ui.progress.UIJob;
> import org.eclipse.ui.views.properties.IPropertySheetPage;
> import org.osgi.service.prefs.BackingStoreException;
> 
>@@ -452,9 +453,25 @@
> 		} catch (PartInitException e) {
> 			PDEPlugin.logException(e);
> 		}
>-		addSourcePage(BundleInputContext.CONTEXT_ID);
>-		addSourcePage(PluginInputContext.CONTEXT_ID);
>-		addSourcePage(BuildInputContext.CONTEXT_ID);
>+
>+		String pageToShow = computeInitialPageId();
>+		if (pageToShow.equals(BundleInputContext.CONTEXT_ID) || pageToShow.equals(BundleInputContext.CONTEXT_ID)
>+				|| pageToShow.equals(BuildInputContext.CONTEXT_ID)) {
>+			addSourcePage(BundleInputContext.CONTEXT_ID);
>+			addSourcePage(PluginInputContext.CONTEXT_ID);
>+			addSourcePage(BuildInputContext.CONTEXT_ID);
>+			return;
>+		}
>+		UIJob addSourcePageJob = new UIJob(PDEUIMessages.ManifestEditor_AddSourcePage) { // to extern
>+			@Override
>+			public IStatus runInUIThread(IProgressMonitor monitor) {
>+				addSourcePage(BundleInputContext.CONTEXT_ID);
>+				addSourcePage(PluginInputContext.CONTEXT_ID);
>+				addSourcePage(BuildInputContext.CONTEXT_ID);
>+				return Status.OK_STATUS;
>+			}
>+		};
>+		addSourcePageJob.schedule();
> 	}
> 
> 	private boolean isSourcePageID(String pageID) {
>diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>index d257e78..6cf88d0 100644
>--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
>@@ -275,6 +275,7 @@
> FeatureOutlinePage_discoverUrls = Sites to Visit
> 
> ###### Plug-in Manifest Editor ########################
>+ManifestEditor_AddSourcePage=Adding Source Pages
> ManifestEditor_DetailExtensionPointSection_title = All Extension Points
> ManifestEditor_DetailExtensionPointSection_new = Add...
> ManifestPackageRenameParticipant_packageRename=Rename packages referenced in plug-in manifest files

Actions: View | Diff

Attachments on bug 482577: 258350 | 258351