[jbosstools-commits] JBoss Tools SVN: r18338 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: model/ui/action and 1 other directories.

Author: scabanovich Date: 2009-10-28 10:53:17 -0400 (Wed, 28 Oct 2009) New Revision: 18338 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ModelContributionManager.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/ModelNavigatorActionGroup.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorViewPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-5041 Menu on project node is fixed, it was incorrect after previous commits Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-28 09:37:30 UTC (rev 18337) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-28 14:53:17 UTC (rev 18338) @@ -113,7 +113,7 @@ } protected void initContextMenu() { - final ModelContributionManager menuMgr = new ModelContributionManager(null) { + final ModelContributionManager menuMgr = new ModelContributionManager(null, menu) { public XActionList getActionList(XModelObject o) { if(o.getFileType() != XModelObject.FILE) return super.getActionList(o); String ent = o.getModelEntity().getName() + "_EditorActionList"; //$NON-NLS-1$ Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ModelContributionManager.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ModelContributionManager.java 2009-10-28 09:37:30 UTC (rev 18337) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ModelContributionManager.java 2009-10-28 14:53:17 UTC (rev 18338) @@ -23,10 +23,13 @@ ActionContext context; ISelection selection; Shell shell; + + XMenuInvoker invoker; - public ModelContributionManager(Shell shell) { + public ModelContributionManager(Shell shell, XMenuInvoker invoker) { super("JBoss Tools"); this.shell = shell; + this.invoker = invoker; } public void setContext(ActionContext context) { @@ -56,6 +59,7 @@ } public XActionList getActionList(XModelObject o) { + if(invoker != null) return invoker.getActionList(o); return o.getModelEntity().getActionList(); } @@ -67,7 +71,7 @@ ArrayList<XModelObject> l = new ArrayList<XModelObject>(); while(it.hasNext()) { IAdaptable a = (IAdaptable)it.next(); - XModelObject o = (XModelObject)a.getAdapter(XModelObject.class); + XModelObject o = a instanceof XModelObject ? (XModelObject)a : (XModelObject)a.getAdapter(XModelObject.class); if(o != null) l.add(o); } return l.toArray(new XModelObject[0]); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/ModelNavigatorActionGroup.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/ModelNavigatorActionGroup.java 2009-10-28 09:37:30 UTC (rev 18337) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/ModelNavigatorActionGroup.java 2009-10-28 14:53:17 UTC (rev 18338) @@ -59,7 +59,7 @@ Shell shell = navigator.getSite().getShell(); if(activateModelContribution) { - mcm = new ModelContributionManager(shell); + mcm = new ModelContributionManager(shell, null); } addBookmarkAction = new AddBookmarkAction(shell); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorViewPart.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorViewPart.java 2009-10-28 09:37:30 UTC (rev 18337) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorViewPart.java 2009-10-28 14:53:17 UTC (rev 18338) @@ -479,7 +479,7 @@ TreeViewerMenuInvoker listener; protected void initContextMenu() { - menuMgr = new ModelContributionManager(getSite().getShell()); + menuMgr = new ModelContributionManager(getSite().getShell(), listener); menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) {