Author: scabanovich Date: 2008-11-01 09:41:15 -0400 (Sat, 01 Nov 2008) New Revision: 11466 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectActionList.java Log: JBIDE-2969 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java 2008-11-01 13:40:10 UTC (rev 11465) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/ActionX.java 2008-11-01 13:41:15 UTC (rev 11466) @@ -17,6 +17,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.meta.key.WizardKeys; /** * Converts action description of XModel into Eclipse action. @@ -30,7 +31,7 @@ wrapper = a; this.action = a.action; boolean enabled = (wrapper.targets == null) ? action.isEnabled(wrapper.object) : action.isEnabled(wrapper.object, wrapper.targets); - String displayName = action.getDisplayName(); + String displayName = WizardKeys.getMenuItemDisplayName(action, wrapper.object == null ? null : wrapper.object.getModelEntity()); String baseName = action.getBaseActionName(); if("Copy".equals(baseName)) { Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectActionList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectActionList.java 2008-11-01 13:40:10 UTC (rev 11465) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectActionList.java 2008-11-01 13:41:15 UTC (rev 11466) @@ -16,6 +16,7 @@ import org.eclipse.ui.actions.OpenWithMenu; import org.jboss.tools.common.meta.action.*; +import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.filesystems.XFileObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -38,7 +39,8 @@ fillMenu(parent); } else { MenuItem item = new MenuItem(parent, SWT.CASCADE); - item.setText(list.getDisplayName()); + String displayName = WizardKeys.getMenuItemDisplayName(list, object == null ? null : object.getModelEntity()); + item.setText(displayName); Menu menu = new Menu(item); item.setMenu(menu); fillMenu(menu); @@ -79,8 +81,9 @@ if (object.getFileType() == XFileObject.FILE && (targets == null || targets.length < 2)) { IResource resource = EclipseResourceUtil.getResource(object); if (resource != null && resource.getType() == IResource.FILE) { + String displayName = WizardKeys.getMenuItemDisplayName(l, object == null ? null : object.getModelEntity()); MenuItem item = new MenuItem(menu, SWT.CASCADE); - item.setText(l.getDisplayName()); + item.setText(displayName); Menu subMenu = new Menu(item); OpenWithMenu openMenu = new OpenWithMenu( ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(),