Author: vyemialyanchyk Date: 2009-01-15 14:50:10 -0500 (Thu, 15 Jan 2009) New Revision: 13073 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java Log: JBIDE-3034 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml 2009-01-15 19:14:47 UTC (rev 13072) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/plugin.xml 2009-01-15 19:50:10 UTC (rev 13073) @@ -38,27 +38,49 @@ <super type="org.eclipse.core.resources.textmarker"/> <persistent value="true"/> </extension> - <!--extension point="org.eclipse.ui.actionSets"> - <actionSet label="Java Coding" description="Action set containing coding related Java actions" - visible="true" id="org.eclipse.jdt.ui.CodingActionSet3"> - <menu label="&amp;Source" path="edit" id="org.eclipse.jdt.ui.source.menu"> - <separator name="commentGroup"/> - <separator name="editGroup"/> - <separator name="importGroup"/> - <separator name="generateGroup"/> - <separator name="codeGroup"/> - <separator name="externalizeGroup"/> - <separator name="convertGroup"/> - </menu> - <action - class="org.hibernate.eclipse.jdt.ui.internal.jpa.actions.JPAMapToolActionPulldownDelegate" - id="org.hibernate.eclipse.jdt.ui.run_jpaaction" - label="Generate &amp;Hibernate/JPA annotations..." - menubarPath="org.eclipse.jdt.ui.source.menu/generateGroup" - style="push"> - </action> - </actionSet> - </extension--> + <extension point="org.eclipse.ui.commands"> + <category id="org.hibernate.eclipse.jdt.ui.run_jpaaction.category1" + name="Generate Hibernate/JPA annotations"> + </category> + <command categoryId="org.hibernate.eclipse.jdt.ui.run_jpaaction.category1" + defaultHandler="org.hibernate.eclipse.jdt.ui.internal.jpa.actions.JPAMapToolActionDelegate" + id="org.hibernate.eclipse.jdt.ui.run_jpaaction" + name="Generate &amp;Hibernate/JPA annotations..."> + </command> + </extension> + <extension point="org.eclipse.ui.menus"> + <menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=edit"> + <menu id="org.eclipse.jdt.ui.source.menu" label="&amp;Source"> + </menu> + </menuContribution> + <menuContribution locationURI="menu:org.eclipse.jdt.ui.source.menu"> + <separator name="commentGroup" visible="true"/> + <separator name="editGroup" visible="true"/> + <separator name="importGroup" visible="true"/> + <separator name="generateGroup" visible="true"/> + <separator name="codeGroup" visible="true"/> + <separator name="externalizeGroup" visible="true"/> + <separator name="convertGroup" visible="true"/> + </menuContribution> + <menuContribution locationURI="menu:org.eclipse.jdt.ui.source.menu?after=generateGroup"> + <command commandId="org.hibernate.eclipse.jdt.ui.run_jpaaction" + id="org.hibernate.eclipse.jdt.ui.run_jpaaction" style="push"> + <visibleWhen checkEnabled="false"> + <not> + <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"></reference> + </not> + </visibleWhen> + </command> + </menuContribution> + <menuContribution locationURI="menu:sourceMenuId?after=additions"> + <command commandId="org.hibernate.eclipse.jdt.ui.run_jpaaction" + id="org.hibernate.eclipse.jdt.ui.run_jpaaction1" style="push"> + <visibleWhen checkEnabled="false"> + <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"></reference> + </visibleWhen> + </command> + </menuContribution> + </extension> <extension point="org.eclipse.ui.popupMenus"> <!-- java editor context menu --> <viewerContribution Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2009-01-15 19:14:47 UTC (rev 13072) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActionDelegate.java 2009-01-15 19:50:10 UTC (rev 13073) @@ -10,10 +10,10 @@ ******************************************************************************/ package org.hibernate.eclipse.jdt.ui.internal.jpa.actions; +import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.core.commands.IHandlerListener; +import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.ui.IEditorActionDelegate; @@ -21,15 +21,18 @@ import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; +import org.hibernate.eclipse.jdt.ui.Activator; /** * Main menu action delegate for "Generate Hibernate/JPA annotations..." * * @author Vitali */ -public class JPAMapToolActionDelegate implements IObjectActionDelegate, - IEditorActionDelegate, IViewActionDelegate, IHandler { +public class JPAMapToolActionDelegate extends AbstractHandler implements IObjectActionDelegate, + IEditorActionDelegate, IViewActionDelegate { public JPAMapToolActor actor = JPAMapToolActor.getInstance(); @@ -54,30 +57,29 @@ } } - public void addHandlerListener(IHandlerListener handlerListener) { - } - - public void dispose() { - } - public Object execute(ExecutionEvent event) throws ExecutionException { actor.updateSelected(); //actor.updateOpen(); return null; } - public boolean isEnabled() { - return (actor.getSelectedSourceSize() > 0); + public void init(IViewPart view) { + view = null; } - - public boolean isHandled() { - return true; + public boolean isCUSelected() { + IWorkbench workbench = Activator.getDefault().getWorkbench(); + IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage(); + IEditorPart editor = page.getActiveEditor(); + if (editor instanceof CompilationUnitEditor) { + return true; + } + return false; } - public void removeHandlerListener(IHandlerListener handlerListener) { + public void setEnabled(Object evaluationContext) { + boolean enable = isCUSelected(); + actor.setSelection(null); + actor.clearSelectionCU(); + setBaseEnabled(enable); } - - public void init(IViewPart view) { - view = null; - } }