Bug 579425 - Inconsistency in opening of spies via Menu/View workflow

Change-Id: I1dbfe6937c70e4fe555641a78bbc9a781ad73ed8
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/192409
diff --git a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java
index 5449e95..1db68cd 100644
--- a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java
+++ b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/SpyProcessor.java
@@ -235,7 +235,6 @@
 		for (MPartDescriptor mp : application.getDescriptors()) {
 			if (partId.equals(mp.getElementId())) {
 				// Already added, update category, description, label, ContributionURI, and IconURI
-				mp.setCategory(Messages.SpyProcessor_category);
 				mp.setDescription(desc);
 				mp.setLabel(partLabel);
 				mp.getPersistedState().remove(IWorkbench.PERSIST_STATE); // see Bug 577275
@@ -250,12 +249,9 @@
 
 		// If descriptor not yet in descriptor list, add it now
 		MPartDescriptor descriptor = modelService.createModelElement(MPartDescriptor.class);
-		descriptor.setCategory(Messages.SpyProcessor_category);
 		descriptor.setElementId(partId);
 		descriptor.setDescription(desc);
-		descriptor.getTags().add("View");
 		descriptor.getTags().add(SPY_TAG);
-		descriptor.getTags().add("categoryTag:Eclipse Runtime Spies");
 		descriptor.setLabel(partLabel);
 		descriptor.setCloseable(true);
 		String bundleId = FrameworkUtil.getBundle(spyPartClass).getSymbolicName();
diff --git a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/messages.properties b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/messages.properties
index 1d8f645..6c34486 100644
--- a/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/messages.properties
+++ b/ui/org.eclipse.pde.spy.core/src/org/eclipse/pde/spy/core/messages.properties
@@ -1,2 +1 @@
-SpyHandler_Open=Open {0}
-SpyProcessor_category=Eclipse Runtime Spies
+SpyHandler_Open=Open {0}
\ No newline at end of file
diff --git a/ui/org.eclipse.pde.spy.preferences/fragment.e4xmi b/ui/org.eclipse.pde.spy.preferences/fragment.e4xmi
index 404a1ef..766ff6e 100644
--- a/ui/org.eclipse.pde.spy.preferences/fragment.e4xmi
+++ b/ui/org.eclipse.pde.spy.preferences/fragment.e4xmi
@@ -8,9 +8,7 @@
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_P3fYQGxbEeSQ7v0akw7aRA" featurename="descriptors" parentElementId="xpath:/">
     <elements xsi:type="basic:PartDescriptor" xmi:id="_T4iy4GxbEeSQ7v0akw7aRA" elementId="org.eclipse.pde.spy.preferences.parts.PreferenceSpyPart" closeable="true">
       <persistedState key="perstistState" value="false"/>
-      <tags>View</tags>
       <tags>Spy</tags>
-      <tags>categoryTag:Eclipse Runtime Spies</tags>
       <handlers xmi:id="_lADpICKSEey779Ohesl6_A" elementId="org.eclipse.pde.spy.preferences.handler.removeall" contributionURI="bundleclass://org.eclipse.pde.spy.preferences/org.eclipse.pde.spy.preferences.handler.RemoveAllHandler" command="_eBGTEGxiEeSQ7v0akw7aRA">
         <persistedState key="persistState" value="false"/>
       </handlers>