Author: dgeraskov Date: 2007-12-11 04:11:52 -0500 (Tue, 11 Dec 2007) New Revision: 5238 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/plugin.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java Log: http://jira.jboss.com/jira/browse/JBIDE-1416 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/plugin.xml 2007-12-11 09:09:06 UTC (rev 5237) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/plugin.xml 2007-12-11 09:11:52 UTC (rev 5238) @@ -2,7 +2,7 @@ <plugin> <extension point="org.eclipse.ui.popupMenus"> - <objectContribution id="diagramEditorAction" objectClass="org.hibernate.mapping.RootClass"> + <objectContribution id="diagramEditorAction" objectClass="org.hibernate.mapping.PersistentClass"> <menu id="org.jboss.tools.hibernate.ui.view.openDiagram" label="Open Mapping Diagram" path="diagramEditorAction"/> <action id="org.jboss.tools.hibernate.ui.view.openDiagramAction" Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2007-12-11 09:09:06 UTC (rev 5237) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2007-12-11 09:11:52 UTC (rev 5238) @@ -20,6 +20,8 @@ import org.eclipse.ui.internal.ObjectPluginAction; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.utils.ProjectUtils; +import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.Subclass; import org.jboss.tools.hibernate.ui.view.ViewPlugin; public class OpenDiagramActionDelegate extends OpenActionDelegate { @@ -27,7 +29,13 @@ public void run(IAction action) { ObjectPluginAction objectPluginAction = (ObjectPluginAction)action; - Object rootClass = ((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); + Object persClass = ((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); + Object rootClass = null; + if (persClass instanceof RootClass) { + rootClass = (RootClass) persClass; + } else if (persClass instanceof Subclass) { + rootClass = ((Subclass) persClass).getRootClass(); + } ObjectEditorInput input = (ObjectEditorInput)hashMap.get(rootClass); ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(0);