[jbosstools-commits] JBoss Tools SVN: r8154 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action.
Author: rob.stryker(a)jboss.com
Date: 2008-05-16 16:05:41 -0400 (Fri, 16 May 2008)
New Revision: 8154
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/DebugServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/RunServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/SelectServerActionDelegate.java
Log:
JBIDE-2224
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/DebugServerActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/DebugServerActionDelegate.java 2008-05-16
18:57:35 UTC (rev 8153)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/DebugServerActionDelegate.java 2008-05-16
20:05:41 UTC (rev 8154)
@@ -24,7 +24,7 @@
protected String computeToolTip() {
IServer selected = ServerManager.getInstance().getSelectedServer();
String name = selected == null ? "" : selected.getName(); //$NON-NLS-1$
- if( selected.getServerState() == IServer.STATE_STARTED)
+ if( selected != null && selected.getServerState() == IServer.STATE_STARTED)
return NLS.bind(ServerActionMessages.RESTART_IN_DEBUG_MODE, name);
return NLS.bind(ServerActionMessages.START_IN_DEBUG_MODE, name); //$NON-NLS-2$
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/RunServerActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/RunServerActionDelegate.java 2008-05-16
18:57:35 UTC (rev 8153)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/RunServerActionDelegate.java 2008-05-16
20:05:41 UTC (rev 8154)
@@ -47,7 +47,7 @@
protected String computeToolTip() {
IServer selected = ServerManager.getInstance().getSelectedServer();
String name = selected == null ? "" : selected.getName(); //$NON-NLS-1$
- if( selected.getServerState() == IServer.STATE_STARTED)
+ if( selected != null && selected.getServerState() == IServer.STATE_STARTED)
return NLS.bind(ServerActionMessages.RESTART_IN_RUN_MODE, name);
return NLS.bind(ServerActionMessages.START_IN_RUN_MODE, name);
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/SelectServerActionDelegate.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/SelectServerActionDelegate.java 2008-05-16
18:57:35 UTC (rev 8153)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/wst/server/ui/action/SelectServerActionDelegate.java 2008-05-16
20:05:41 UTC (rev 8154)
@@ -56,8 +56,10 @@
private void update0() {
if(action == null) return;
IServer server = ServerManager.getInstance().getSelectedServer();
- ImageDescriptor id = ImageResource.getImageDescriptor(server.getServerType().getId());
- action.setImageDescriptor(id);
+ if( server != null ) {
+ ImageDescriptor id =
ImageResource.getImageDescriptor(server.getServerType().getId());
+ action.setImageDescriptor(id);
+ }
action.setText(null);
action.setToolTipText(ServerActionMessages.SELECT_A_SERVER);
}