[jbosstools-commits] JBoss Tools SVN: r3357 - in trunk: jst/plugins/org.jboss.tools.jst.web.ui and 2 other directories.

Author: max.andersen(a)jboss.com Date: 2007-08-27 09:08:47 -0400 (Mon, 27 Aug 2007) New Revision: 3357 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java Log: JBIDE-645 removing redhat from palette + make seam perspective include project explorer and servers view. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2007-08-27 13:07:28 UTC (rev 3356) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteViewPart.java 2007-08-27 13:08:47 UTC (rev 3357) @@ -37,7 +37,7 @@ import org.jboss.tools.jst.web.tld.URIConstants; public class PaletteViewPart extends ViewPart implements IPartListener { - public static final String VIEW_ID = "com.redhat.palette.swt"; + public static final String VIEW_ID = "org.jboss.tools.common.model.ui.views.palette.PaletteView"; public static final String PALETTE_GEF_ID = "org.jboss.tools.vpe.ui.palette"; private IPaletteAdapter paletteAdapter = null; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-08-27 13:07:28 UTC (rev 3356) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2007-08-27 13:08:47 UTC (rev 3357) @@ -1,12 +1,12 @@ providerName=Red Hat, Inc. -actionSets.modelActions.label=Red Hat Developer Studio Run Actions -actionSets.modelActions.description=Description For Red Hat Developer Studio Model Actions +actionSets.modelActions.label=JBoss Tools Run Actions +actionSets.modelActions.description=Description For JBoss Tools Model Actions actionSets.projectActions.saveModel.label=Save Model -actionSets.tomcatActions.selectServer.label=Red Hat Server Actions -actionSets.tomcatActions.label=Red Hat Tomcat Actions -actionSets.tomcatActions.description=Description for Red Hat Tomcat Actions +actionSets.tomcatActions.selectServer.label=JBoss Tools Server Actions +actionSets.tomcatActions.label=JBoss Tools Tomcat Actions +actionSets.tomcatActions.description=Description for JBoss Tools Tomcat Actions actionSets.tomcatActions.changeWebXmlTimeStamp.label=Change web.xml Time Stamp actionSets.tomcatActions.restartTomcatServer.label=Restart Tomcat Server actionSets.tomcatActions.stopTomcatServer.label=Stop Tomcat Server @@ -24,11 +24,11 @@ actionSets.serverActions.startServer.label=Start Server actionSets.serverActions.runApplicationFromSelectedElement.label=Run Application from Selected Element -editors.tld12.name=Red Hat TLD Editor -editors.web.name=Red Hat Web Descriptor Editor +editors.tld12.name=JBoss Tools TLD Editor +editors.web.name=JBoss Tools Web Descriptor Editor textProblemName=XML Problem -strutsProblemName=Verifification Problem +strutsProblemName=Verification Problem constraintProblemName=Constraint Problem actionSets.redhatMenu.label=Red Hat @@ -41,7 +41,7 @@ actionSets.license.label=&Red Hat Developer Studio License perspective.name=Red Hat Developer Studio -paletteViewPart.name=Red Hat Palette +paletteViewPart.name=JBoss Tools Palette actionSets_online_help.label=Red Hat Developer Studio Help actionSets_online_help.description= Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-08-27 13:07:28 UTC (rev 3356) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2007-08-27 13:08:47 UTC (rev 3357) @@ -169,7 +169,7 @@ <extension id="org.jboss.tools.jst.web.ui.views" name="Red Hat Developer Studio" point="org.eclipse.ui.views"> <category id="web.views.category.id" name="Red Hat Developer Studio"> </category> - <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="images/xstudio/views/palette.gif" id="com.redhat.palette.swt" name="%paletteViewPart.name"> + <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> <view category="web.views.category.id" class="org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator" icon="images/xstudio/views/web_project.gif" id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView" name="Web Projects"> </view> @@ -310,7 +310,7 @@ </viewShortcut--> <newWizardShortcut id="org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard"> </newWizardShortcut> - <viewShortcut id="com.redhat.palette.swt"> + <viewShortcut id="org.jboss.tools.common.model.ui.views.palette.PaletteView"> </viewShortcut> <viewShortcut id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView"> </viewShortcut> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java 2007-08-27 13:07:28 UTC (rev 3356) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/RedHat4WebPerspectiveFactory.java 2007-08-27 13:08:47 UTC (rev 3357) @@ -47,7 +47,7 @@ IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ - rightTop.addView("com.redhat.palette.swt"); + rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ rightBottom.addView(IPageLayout.ID_OUTLINE); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java 2007-08-27 13:07:28 UTC (rev 3356) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamPerspectiveFactory.java 2007-08-27 13:08:47 UTC (rev 3357) @@ -4,17 +4,22 @@ import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; +import org.eclipse.ui.navigator.resources.ProjectExplorer; public class SeamPerspectiveFactory implements IPerspectiveFactory { + private static final String SEAM_COMPONENTS_NAVIGATOR = "org.jboss.tools.seam.ui.views.SeamComponentsNavigator"; + private static String JBOSS_SERVERS_VIEW = "org.jboss.ide.eclipse.as.ui.views.JBossServerView"; + private static String WTP_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; + public static final String PERSPECTIVE_ID = "org.jboss.tools.seam.ui.SeamPerspective"; - + public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); IFolderLayout leftTop = layout.createFolder("leftTop", IPageLayout.LEFT, (float)0.2, editorArea); //$NON-NLS-1$ leftTop.addView(JavaUI.ID_PACKAGES); - leftTop.addView("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); + leftTop.addView(ProjectExplorer.VIEW_ID); leftTop.addPlaceholder(IPageLayout.ID_RES_NAV); @@ -26,10 +31,12 @@ IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.78, editorArea); //$NON-NLS-1$ bottom.addView(IPageLayout.ID_PROBLEM_VIEW); bottom.addView(IPageLayout.ID_TASK_LIST); - - + bottom.addView(SEAM_COMPONENTS_NAVIGATOR); + bottom.addView(JBOSS_SERVERS_VIEW); + bottom.addView(WTP_SERVERS_VIEW); + IFolderLayout rightTop = layout.createFolder("right", IPageLayout.RIGHT, (float)0.8, editorArea); //$NON-NLS-1$ - rightTop.addView("com.redhat.palette.swt"); + rightTop.addView("org.jboss.tools.common.model.ui.views.palette.PaletteView"); IFolderLayout rightBottom = layout.createFolder("rightBottom", IPageLayout.BOTTOM, (float)0.64, "right"); //$NON-NLS-1$ rightBottom.addView(IPageLayout.ID_OUTLINE); @@ -38,7 +45,7 @@ layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); // views - seam - layout.addShowViewShortcut("org.jboss.tools.seam.ui.views.SeamComponentsNavigator"); + layout.addShowViewShortcut(SEAM_COMPONENTS_NAVIGATOR); // views - java layout.addShowViewShortcut(JavaUI.ID_PACKAGES);