Author: max.andersen(a)jboss.com Date: 2007-10-18 06:38:32 -0400 (Thu, 18 Oct 2007) New Revision: 4321 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta Log: JBIDE-645 and JBIDE-647 ...aligned preferences/view/wizards (used JBoss Tools Web category since merging where not possible at the moment) Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321) @@ -217,10 +217,11 @@ </actionSet> </extension> <extension point="org.eclipse.ui.preferencePages"> - <page - class="org.jboss.tools.common.model.ui.preferences.CompanyPreferencesPage" - id="org.jboss.tools.common.model.ui" - name="JBoss Tools"> + <page + category="org.jboss.ide.eclipse.ui.MainPreferencePage" + class="org.jboss.tools.common.model.ui.preferences.CompanyPreferencesPage" + id="org.jboss.tools.common.model.ui" + name="Web"> </page> </extension> <extension point="org.eclipse.ui.preferencePages"> Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/preferences.properties 2007-10-18 10:38:32 UTC (rev 4321) @@ -3,4 +3,4 @@ AUTOMATION_PD=Here you can modify default text for the Tiles Struts plug-in element, the Validator Struts plug-in element, and error message resource files. LIBRARY_SETS_PD=Here you can modify what libraries get included in the project file systems for new Struts projects. You can modify this specifically for different versions of the Servlet and Struts technologies that might be used with a project. EDITORS_PD=Here you can control the behavior of the JBoss Tools JSP, XML, and Web Flow Configuration editors. -REDHAT=Preferences for installed JBoss Tools. \ No newline at end of file +REDHAT=JBoss Tools Web preferences. \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321) @@ -60,7 +60,11 @@ </attributeEditor> </extension> - <extension point="org.eclipse.ui.newWizards"> + <extension point="org.eclipse.ui.newWizards"> + <category + name="JBoss Tools" + id="org.jboss.ide.eclipse.ui.wizards"> + </category> <category id="org.jboss.tools.jsf" name="JSF" parentCategory="org.jboss.tools.jst.web"> </category> <wizard category="org.jboss.tools.jst.web/org.jboss.tools.jsf" class="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" icon="images/xstudio/wizards/jsf-config.gif" id="org.jboss.tools.jsf.ui.wizard.newfile.NewFacesConfigFileWizard" name="Faces Config" project="false"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-10-18 10:38:32 UTC (rev 4321) @@ -38,3 +38,5 @@ popupMenus.action.registerInServerXml=Register Web Context in server.xml popupMenus.action.unregisterFromServerXml=Unregister Web Context from server.xml popupMenus.action.saveAsTemplate=Save As Template... + +web.category_ui_=Web \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-10-18 10:38:32 UTC (rev 4321) @@ -124,8 +124,10 @@ </editorType> </extension> - <extension point="org.eclipse.ui.newWizards"> - <category id="org.jboss.tools.jst.web" name="JBoss Tools"> + <extension point="org.eclipse.ui.newWizards"> + <category name="JBoss Tools Web" + parentCategory="org.eclipse.wst.web.ui" + id="org.jboss.tools.jst.web"> </category> <wizard category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" icon="images/xstudio/wizards/new_css_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" name="CSS File" project="false"> <selection class="org.eclipse.core.resources.IResource"> @@ -167,7 +169,7 @@ </extension> <extension id="org.jboss.tools.jst.web.ui.views" name="JBoss Tools" point="org.eclipse.ui.views"> - <category id="web.views.category.id" name="JBoss Tools"> + <category id="web.views.category.id" name="JBoss Tools Web"> </category> <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name"> </view> Modified: trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2007-10-18 10:28:51 UTC (rev 4320) +++ trunk/struts/plugins/org.jboss.tools.struts/resources/meta/strutsprojects.meta 2007-10-18 10:38:32 UTC (rev 4321) @@ -43,7 +43,7 @@ </XModelAttribute> </XModelAttributes> <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="Red Hat Developer Studio Struts" + <XActionItem ICON="action.empty" displayName="JBoss Tools Struts" kind="list" name="StrutsStudio"> <XActionItem HandlerClassName="org.jboss.tools.struts.model.pv.handler.StrutsProjectsRootRedirectHandler"