Author: adietish
Date: 2011-11-30 05:11:11 -0500 (Wed, 30 Nov 2011)
New Revision: 36769
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
[JBIDE-6828] added "Welcome (Root) Page" action.
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-11-30
09:28:11 UTC (rev 36768)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-11-30
10:11:11 UTC (rev 36769)
@@ -124,6 +124,10 @@
public static void log(String message, Exception e) {
IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, message, e);
+ log(status);
+ }
+
+ public static void log(IStatus status) {
JBossServerUIPlugin.getDefault().getLog().log(status);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30
09:28:11 UTC (rev 36768)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30
10:11:11 UTC (rev 36769)
@@ -219,12 +219,14 @@
public static String EditorLocalDeployment;
public static String EditorRefreshViewer;
-
public static String ExploreUtils_Action_Text;
public static String ExploreUtils_Description;
- public static String OpenWebManagementConsole_Action_Text;
-
+ public static String ShowInWebManagementConsole_Action_Text;
+ public static String ShowInWelcomePage_Action_Text;
+ public static String ShowInAction_Error;
+ public static String ShowInAction_Error_Title;
+
public static String Configure;
public static String ConfigureRuntimeMarkerResolution_Description;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30
09:28:11 UTC (rev 36768)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30
10:11:11 UTC (rev 36769)
@@ -196,7 +196,12 @@
ExploreUtils_Action_Text=Explore
ExploreUtils_Description=Explore deploy directory
-OpenWebManagementConsole_Action_Text=Web Management Console
+
+ShowInWebManagementConsole_Action_Text=Web Management Console
+ShowInWelcomePage_Action_Text=Welcome (Root) Page
+ShowInAction_Error="Could not show \"{0}\""
+ShowInAction_Error_Title="Error"
+
Configure=Configure...
ConfigureRuntimeMarkerResolution_Description=Configure Targeted Runtimes
ConvertNodeToXPathDialog_DisplayString=Add to XPaths
Deleted:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30
09:28:11 UTC (rev 36768)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30
10:11:11 UTC (rev 36769)
@@ -1,76 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.views.server.extensions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
-import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.tools.common.ui.BrowserUtil;
-
-import com.ibm.icu.text.MessageFormat;
-
-public class OpenManagementConsoleActionProvider extends CommonActionProvider {
-
- private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console";
-
- private ICommonActionExtensionSite actionSite;
- private OpenWebManagementConsoleAction openWebManagementConsoleAction;
-
- public void init(ICommonActionExtensionSite site) {
- super.init(site);
- this.actionSite = site;
- createActions(site);
- }
-
- protected void createActions(ICommonActionExtensionSite site) {
- ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
- CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
- if (commonViewerWorkbenchSite != null) {
- openWebManagementConsoleAction =
- new
OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider());
- }
- }
-
- public void fillContextMenu(IMenuManager menu) {
- CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu,
actionSite);
- }
-
- private static class OpenWebManagementConsoleAction extends AbstractServerAction {
- public OpenWebManagementConsoleAction(ISelectionProvider sp) {
- super(sp, Messages.OpenWebManagementConsole_Action_Text);
- setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE));
- }
-
- public boolean accept(IServer server) {
- return (ServerUtil.isJBoss7(server)
- && server.getServerState() == IServer.STATE_STARTED);
- }
-
- public void perform(IServer server) {
- JBossServer jbossServer;
- try {
- jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
- String host = jbossServer.getHost();
- int webPort = jbossServer.getJBossWebPort();
- String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host,
String.valueOf(webPort));
- BrowserUtil.checkedCreateInternalBrowser(
- consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
JBossServerUIPlugin.getDefault()
- .getLog());
- } catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-}
Copied:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
(from rev 36768,
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java)
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-11-30
10:11:11 UTC (rev 36769)
@@ -0,0 +1,82 @@
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.common.ui.BrowserUtil;
+
+import com.ibm.icu.text.MessageFormat;
+
+public class ShowInWebManagementActionProvider extends CommonActionProvider {
+
+ private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console";
+
+ private ICommonActionExtensionSite actionSite;
+ private OpenWebManagementConsoleAction openWebManagementConsoleAction;
+
+ public void init(ICommonActionExtensionSite site) {
+ super.init(site);
+ this.actionSite = site;
+ createActions(site);
+ }
+
+ protected void createActions(ICommonActionExtensionSite site) {
+ ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
+ CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
+ if (commonViewerWorkbenchSite != null) {
+ openWebManagementConsoleAction =
+ new
OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider());
+ }
+ }
+
+ public void fillContextMenu(IMenuManager menu) {
+ CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu,
actionSite);
+ }
+
+ private static class OpenWebManagementConsoleAction extends AbstractServerAction {
+ public OpenWebManagementConsoleAction(ISelectionProvider sp) {
+ super(sp, Messages.ShowInWebManagementConsole_Action_Text);
+ setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE));
+ }
+
+ public boolean accept(IServer server) {
+ return (ServerUtil.isJBoss7(server)
+ && server.getServerState() == IServer.STATE_STARTED);
+ }
+
+ public void perform(IServer server) {
+ JBossServer jbossServer;
+ try {
+ jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host,
String.valueOf(webPort));
+ BrowserUtil.checkedCreateInternalBrowser(
+ consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
JBossServerUIPlugin.getDefault()
+ .getLog());
+ } catch (CoreException e) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
e.getMessage(), e);
+ JBossServerUIPlugin.log(status);
+ ErrorDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
+ , Messages.ShowInAction_Error_Title
+ , NLS.bind(Messages.ShowInAction_Error,
Messages.ShowInWebManagementConsole_Action_Text), status);
+ }
+ }
+ }
+}
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-11-30
10:11:11 UTC (rev 36769)
@@ -0,0 +1,79 @@
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonActionProvider;
+import org.eclipse.ui.navigator.ICommonActionExtensionSite;
+import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.common.ui.BrowserUtil;
+
+import com.ibm.icu.text.MessageFormat;
+
+public class ShowInWelcomePageActionProvider extends CommonActionProvider {
+
+ private static final String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/";
//$NON-NLS-1$
+
+ private ICommonActionExtensionSite actionSite;
+ private OpenWelcomePageAction openWelcomePageAction;
+
+ public void init(ICommonActionExtensionSite site) {
+ super.init(site);
+ this.actionSite = site;
+ createActions(site);
+ }
+
+ protected void createActions(ICommonActionExtensionSite site) {
+ ICommonViewerWorkbenchSite commonViewerWorkbenchSite =
+ CommonActionProviderUtils.getCommonViewerWorkbenchSite(site);
+ if (commonViewerWorkbenchSite != null) {
+ openWelcomePageAction =
+ new OpenWelcomePageAction(commonViewerWorkbenchSite.getSelectionProvider());
+ }
+ }
+
+ public void fillContextMenu(IMenuManager menu) {
+ CommonActionProviderUtils.addToShowInQuickSubMenu(openWelcomePageAction, menu,
actionSite);
+ }
+
+ private static class OpenWelcomePageAction extends AbstractServerAction {
+ public OpenWelcomePageAction(ISelectionProvider sp) {
+ super(sp, Messages.ShowInWelcomePage_Action_Text);
+ }
+
+ public boolean accept(IServer server) {
+ return (ServerUtil.isJBoss7(server)
+ && server.getServerState() == IServer.STATE_STARTED);
+ }
+
+ public void perform(IServer server) {
+ try {
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server,
JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host,
String.valueOf(webPort));
+ BrowserUtil.checkedCreateInternalBrowser(
+ consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID,
JBossServerUIPlugin.getDefault()
+ .getLog());
+ } catch (CoreException e) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
e.getMessage(), e);
+ JBossServerUIPlugin.log(status);
+ ErrorDialog.openError(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
+ , Messages.ShowInAction_Error_Title
+ , NLS.bind(Messages.ShowInAction_Error, Messages.ShowInWelcomePage_Action_Text),
status);
+ }
+ }
+ }
+}
Property changes on:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-11-30 09:28:11 UTC (rev
36768)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-11-30 10:11:11 UTC (rev
36769)
@@ -375,17 +375,23 @@
</enablement>
</actionProvider>
<actionProvider
-
class="org.jboss.ide.eclipse.as.ui.views.server.extensions.OpenManagementConsoleActionProvider"
+
class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInWebManagementActionProvider"
id="org.jboss.ide.eclipse.as.ui.extensions.managementConsole">
<enablement>
-<!-- <instanceof
-
value="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server">
- </instanceof> -->
<instanceof
value="org.eclipse.wst.server.core.IServer">
</instanceof>
</enablement>
</actionProvider>
+ <actionProvider
+
class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInWelcomePageActionProvider"
+ id="org.jboss.ide.eclipse.as.ui.extensions.welcomePage">
+ <enablement>
+ <instanceof
+ value="org.eclipse.wst.server.core.IServer">
+ </instanceof>
+ </enablement>
+ </actionProvider>
</extension>
@@ -408,9 +414,11 @@
<actionExtension
pattern="org.jboss.ide.eclipse.as.ui.extensions.serverLog"/>
<actionExtension
+
pattern="org.jboss.tools.as.wst.server.ui.ServersView.ExploreActionProvider"/>
+ <actionExtension
pattern="org.jboss.ide.eclipse.as.ui.extensions.managementConsole"/>
<actionExtension
-
pattern="org.jboss.tools.as.wst.server.ui.ServersView.ExploreActionProvider"/>
+
pattern="org.jboss.ide.eclipse.as.ui.extensions.welcomePage"/>
</includes>
</viewerActionBinding>
</extension>