[jbosstools-commits] JBoss Tools SVN: r39216 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui/xpl and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-01 01:53:35 -0500 (Thu, 01 Mar 2012)
New Revision: 39216

Modified:
   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/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
Log:
JBIDE-11080 - fix exceptions on some UI actions

Modified: 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/ShowInWebManagementActionProvider.java	2012-03-01 06:42:36 UTC (rev 39215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java	2012-03-01 06:53:35 UTC (rev 39216)
@@ -28,7 +28,7 @@
 	
 	protected boolean shouldAddForSelection(IStructuredSelection sel) {
 		IServer server = getSingleServer(sel);
-		return accepts(server);
+		return server != null && accepts(server);
 	}
 
 	protected boolean accepts(IServer server) {

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java	2012-03-01 06:42:36 UTC (rev 39215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java	2012-03-01 06:53:35 UTC (rev 39216)
@@ -119,7 +119,7 @@
 	public void fillContextMenu(IMenuManager menu) {
 		if( getModuleServer() != null )
 			menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
-		else
+		else if( getServer() != null )
 			menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
 		exploreAction.setEnabled(true);
 	}
@@ -147,8 +147,8 @@
 			ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site;
 			selection = (IStructuredSelection) wsSite.getSelectionProvider()
 					.getSelection();
-			Object first = selection.getFirstElement();
-			return first;
+			if( selection.size() == 1 )
+				return selection.getFirstElement();
 		}
 		return null;
 	}