Author: scabanovich Date: 2008-11-01 09:44:33 -0400 (Sat, 01 Nov 2008) New Revision: 11467 Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web-menu.properties Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java Log: JBIDE-2969 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2008-11-01 13:41:15 UTC (rev 11466) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2008-11-01 13:44:33 UTC (rev 11467) @@ -21,6 +21,7 @@ <extension point="org.jboss.tools.common.model.keys"> <keys path="help/keys-web.properties"/> <keys path="help/keys-web-attrs.properties"/> + <keys path="help/keys-web-menu.properties"/> </extension> <extension point="org.jboss.tools.common.model.specialwizard"> <specialwizard class="org.jboss.tools.jst.web.project.AddServletSupportWizard" id="org.jboss.tools.jst.web.project.AddServletSupportWizard"> Added: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web-menu.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web-menu.properties (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web-menu.properties 2008-11-01 13:44:33 UTC (rev 11467) @@ -0,0 +1,66 @@ +Web.Validate.menu=Report Problem +Web.CreateTag.menu=Add Tag... +Web.SetExpanded.menu=Set Expanded +Web.CreateAttribute.menu=Add Attribute... +Web.CreateValidator.menu=Validator... +Web.CreateListener.menu=Listener... +Web.ImportTLD.menu=Import Tags from TLD File +Web.CreateVariable.menu=Add Variable... +Web.CreateInitParam.menu=Add Init Param... +Web.CreateContextParam.menu=Context Param... +Web.CreateFilter.menu=Filter... +Web.CreateFilterMapping.menu=Filter Mapping... +Web.CreateServlet.menu=Servlet... +Web.CreateServletMapping.menu=Servlet Mapping... +Web.CreateMimeMapping.menu=Mime Mapping... +Web.CreateErrorPage.menu=Error Page... +Web.CreateTaglib.menu=Taglib... +Web.CreateResourceEnvRef.menu=Resource Env Ref... +Web.CreateResourceRef.menu=Resource Ref... +Web.CreateSecurityConstraint.menu=Security Constraint... +Web.CreateLoginConfig.menu=Login Config... +Web.CreateSecurityRole.menu=Security Role... +Web.CreateEnvEntry.menu=Env Entry... +Web.CreateEjbRef.menu=Ejb Ref... +Web.CreateEjbLocalRef.menu=Ejb Local Ref... +Web.ChangeTimeStamp.menu=Change Timestamp +Web.CreateRole.menu=Add Role Name... +Web.CreateServiceMessageDestinationRef.menu=Message Destination Ref... +Web.CreateServiceMessageDestination.menu=Message Destination... +Web.CreateServiceRef.menu=Service Ref... +Web.CreateResourceCollection.menu=Add Web Resource Collection... +Web.CreateAuthConstraint.menu=Add Auth Constraint... +Web.CreateUserConstraint.menu=Add User Data Constraint... +Web.CreateRunAs.menu=Run As... +Web.CreateSecurityRoleRef.menu=Add Security Role Ref... +Web.CreateWelcomFile.menu=Add Welcome File... +Web.CreateTagFile.menu=Tag File... +Web.CreateFunction.menu=Function... +Web.CreateAttributeFragment.menu=Add Attribute As Fragment... +Web.CreateLibrarySet.menu=Add Library Set +Web.AddJar.menu=Add Jar +Web.CreateLibraryReference.menu=Add Library Reference +Web.CreatePageTemplate.menu=Add Page Template +Web.CreateProjectTemplate.menu=Add JSF Project Template +Web.CreateProjectTemplate2.menu=Add JSF Project Template +Web.EditProjectTemplate.menu=Edit JSF Project Template +Web.CreateProjectVersion.menu=Add JSF Project Version +Web.Add.menu=Add Module +Web.CreateNewJSFProject.menu=Create New JSF Project... +Web.ImportExistingJSFProject.menu=Import Existing JSF Project... +Web.CreateNewStrutsProject.menu=Create New Struts Project... +Web.ImportExistingStrutsProject.menu=Import Existing Struts Project... +Web.CreatePropertyGroup.menu=Add JSP Property Group... +Web.CreateLocaleEncodingMapping.menu=Add Locale Encoding Mapping... +Web.CreateFileTLDV.menu=Tag Library... +Web.CreateWebAppV.menu=Web Descriptor... +Web.CreateFileJSPV.menu=JSP... +Web.CreateFileHTMLV.menu=HTML... +Web.CreateFileCSSV.menu=CSS... +Web.CreateFileJSV.menu=JS... +Web.CreateFileXHTMLV.menu=XHTML... +Web.CreateTemplate.menu=Save as Template... +Web.SynchronizeModules.menu=Modules Configuration +Web.UnregisterInServerXML.menu=Unregister Web Context from server.xml +Web.RegisterInServerXML.menu=Register Web Context in server.xml +Web.RunPageOnServer.menu=Run On Server Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-11-01 13:41:15 UTC (rev 11466) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/AutolayoutWebProcessHandler.java 2008-11-01 13:44:33 UTC (rev 11467) @@ -15,6 +15,7 @@ import org.jboss.tools.common.model.impl.XModelImpl; import org.jboss.tools.common.model.util.ModelFeatureFactory; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper; import org.jboss.tools.jst.web.model.helpers.autolayout.AutoLayout; @@ -32,7 +33,8 @@ if(!isEnabled(object)) return; ServiceDialog d = object.getModel().getService(); String mes = WebUIMessages.YOU_WANT_TO_REARRANGE_THE_DIAGRAM_ELEMENTS; - int i = d.showDialog(action.getDisplayName(), mes, new String[]{WebUIMessages.OK, WebUIMessages.CANCEL}, null, ServiceDialog.QUESTION); + String displayName = WizardKeys.getMenuItemDisplayName(action, object == null ? null : object.getModelEntity()); + int i = d.showDialog(displayName, mes, new String[]{WebUIMessages.OK, WebUIMessages.CANCEL}, null, ServiceDialog.QUESTION); if(i != 0) return; AutoLayout a = new AutoLayout(); a.setItems(getItemsInstance()); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-11-01 13:41:15 UTC (rev 11466) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/model/handlers/RegisterInServerXmlHandler.java 2008-11-01 13:44:33 UTC (rev 11467) @@ -13,6 +13,7 @@ import java.util.*; import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.meta.key.WizardKeys; import org.jboss.tools.common.model.*; public class RegisterInServerXmlHandler extends AbstractHandler { @@ -41,7 +42,8 @@ public void executeHandler(XModelObject object, Properties p) throws XModelException { SpecialWizard wizard = SpecialWizardFactory.createSpecialWizard("org.jboss.tools.jst.web.ui.wizards.appregister.AppRegisterWizard"); if(p == null) p = new Properties(); - p.setProperty("title", action.getDisplayName()); + String displayName = WizardKeys.getMenuItemDisplayName(action, object == null ? null : object.getModelEntity()); + p.setProperty("title", displayName); p.setProperty("wtp", "true"); p.put("object", object); String nature = object.getModel().getProperties().getProperty("nature");