393448 - convert our plugin.xml popupMenus and actionsSets to the

command extension point

5 files changed, 53 insertions, 122 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
index 83ccf890bb..7b079080aa 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/META-INF/MANIFEST.MF
@@ -35,9 +35,9 @@ Import-Package: com.ibm.icu.text;version="4.0.1"
 Export-Package: org.eclipse.jpt.jaxb.ui,
  org.eclipse.jpt.jaxb.ui.internal;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.actions;x-internal:=true,
- org.eclipse.jpt.jaxb.ui.internal.commands;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.filters;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.gen;x-internal:=true,
+ org.eclipse.jpt.jaxb.ui.internal.handlers;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.jaxb21;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.jaxb22;x-internal:=true,
  org.eclipse.jpt.jaxb.ui.internal.navigator;x-internal:=true,
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
index b12082d60b..f80c834eb6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
@@ -141,6 +141,8 @@
 	</extension>
 	
 	
+	<!-- ***** commands ***** -->
+	
 	<extension
 		point="org.eclipse.ui.commands">
 		
@@ -148,15 +150,22 @@
 			id="org.eclipse.jpt.jaxb.ui.command.createPackageInfo"
 			name="%createPackageInfoCommand"/>
 		
+		<command
+			id="org.eclipse.jpt.jaxb.ui.generateJaxbClasses"
+			name="%generateJaxbClasses" >
+		</command>
+		
 	</extension>		
-			
+
+
+	<!-- ***** handlers ***** -->
 	
 	<extension
 		point="org.eclipse.ui.handlers">
 		
 		<handler
 			commandId="org.eclipse.jpt.jaxb.ui.command.createPackageInfo"
-			class="org.eclipse.jpt.jaxb.ui.internal.commands.CreatePackageInfoCommandHandler">
+			class="org.eclipse.jpt.jaxb.ui.internal.handlers.CreatePackageInfoCommandHandler">
 			<enabledWhen>
 				<iterate ifEmpty="false">
 					<adapt type="org.eclipse.jpt.jaxb.core.context.JaxbPackage">
@@ -167,10 +176,36 @@
 				</iterate>
 			</enabledWhen>
 		</handler>
-		
+				
+		<handler
+			commandId="org.eclipse.jpt.jaxb.ui.generateJaxbClasses"
+			class="org.eclipse.jpt.jaxb.ui.internal.handlers.GenerateClassesHandler">
+			<activeWhen>
+				<with variable="selection">
+					<count value="1"/>
+					<iterate>
+						<and>
+							<adapt type="org.eclipse.core.resources.IFile">
+							<and>
+								<test
+									property="org.eclipse.core.resources.name"
+									value="*.xsd"/>
+								<test
+									property="org.eclipse.core.resources.projectNature"
+									value="org.eclipse.jdt.core.javanature"/>
+							</and>
+							</adapt>
+						</and>
+					</iterate>
+				</with>
+			</activeWhen>
+		</handler>
+
 	</extension>
-	
-	
+ 	
+ 	
+	<!-- ***** menus ***** -->
+
 	<extension
 		point="org.eclipse.ui.menus">
 		
@@ -225,9 +260,18 @@
 			</command>
 			
 		</menuContribution>
-		
+
+		<!-- contributions to the "Generate" submenu -->
+
+		<menuContribution 
+			locationURI="popup:generateMenuId?after=additions">
+				<command commandId="org.eclipse.jpt.jaxb.ui.generateJaxbClasses">
+					<visibleWhen checkEnabled="true"/>
+				</command>
+		</menuContribution>
+
 	</extension>
-	
+
 	
 	<extension
 		point="org.eclipse.ui.navigator.navigatorContent">
@@ -288,29 +332,6 @@
 	
 	
 	<extension
-		point="org.eclipse.ui.popupMenus">
-
-		<!-- contributions to the "Generate" submenu -->
-		<objectContribution
-			id="org.eclipse.jpt.jaxb.ui.xsdFileActions"
-			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.xsd">
-			<filter
-				name="projectNature"
-				value="org.eclipse.jdt.core.javanature">
-			</filter>
-			<action
-				id="org.eclipse.jpt.jaxb.ui.generateJaxbClasses" 
-				label="%generateJaxbClasses"
-				menubarPath="generateMenuId/GenerateXML"
-				class="org.eclipse.jpt.jaxb.ui.internal.actions.GenerateClassesAction"> 
-			</action> 
-		</objectContribution>
-		
-	</extension>
-	
-	
-	<extension
 		point="org.eclipse.ui.preferencePages">
 		
 		<!-- no actual preferences yet
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/GenerateClassesAction.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/GenerateClassesAction.java
deleted file mode 100644
index 526fd69580..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/GenerateClassesAction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010 Oracle. 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:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jaxb.ui.internal.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.jaxb.ui.internal.ClassesGeneratorUi;
-
-/**
- *  GenerateClassesAction
- */
-public class GenerateClassesAction extends ObjectAction
-{
-
-	@Override
-	protected void execute(IFile xsdFile) {
-
-		ClassesGeneratorUi.generate(xsdFile);
-	}
-
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/ObjectAction.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/ObjectAction.java
deleted file mode 100644
index 652d75ac58..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/actions/ObjectAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010 Oracle. 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:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jaxb.ui.internal.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- *  GenerateEntitiesAction
- */
-public abstract class ObjectAction extends ActionDelegate implements IObjectActionDelegate 
-{
-	private ISelection currentSelection;
-
-	public ObjectAction() {
-		super();
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// do nothing
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-        this.currentSelection = selection;
-	}
-
-	@Override
-	public void run(IAction action) {
-		if (this.currentSelection instanceof ITreeSelection) {
-			for (Iterator<?> stream = ((ITreeSelection) this.currentSelection).iterator(); stream.hasNext(); ) {
-				this.execute(stream.next());
-			}
-		}
-	}
-
-	protected void execute(Object selection) {
-		
-		if(selection instanceof IFile) {
-			this.execute((IFile)selection);
-		}
-	}
-
-	@SuppressWarnings("unused")
-	protected void execute(IFile file) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/handlers/CreatePackageInfoCommandHandler.java
index 42bb24c3ab..04cf56f0b7 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/commands/CreatePackageInfoCommandHandler.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/handlers/CreatePackageInfoCommandHandler.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.jaxb.ui.internal.commands;
+package org.eclipse.jpt.jaxb.ui.internal.handlers;
 
 import java.util.Iterator;
 import java.util.List;