[jbosstools-commits] JBoss Tools SVN: r39405 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-09 06:47:10 -0500 (Fri, 09 Mar 2012)
New Revision: 39405

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
Log:
JBIDE-11175 - Additions for tomcat and others

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2012-03-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java	2012-03-09 11:47:10 UTC (rev 39405)
@@ -111,6 +111,11 @@
 					e.printStackTrace();
 				}
 			}
+
+			@Override
+			public boolean canExplore(IServer server, IModule[] module) {
+				return true;
+			}
 		});
 	}
 	

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java	2012-03-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java	2012-03-09 11:47:10 UTC (rev 39405)
@@ -19,6 +19,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.IServer;
 import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
 import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
@@ -102,7 +103,17 @@
 		if (server != null && deployableServer != null) {
 			return deployableServer.getDeployFolder();
 		}
-		return server.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "").trim(); //$NON-NLS-1$
+		String ret = server.getAttribute(IDeployableServer.DEPLOY_DIRECTORY,(String) null); //$NON-NLS-1$
+		if( ret != null )
+			return ret.trim();
+		
+		// Other runtimes like tomcat / default behavior (?)
+		IRuntime rt = server.getRuntime();
+		if( rt != null ) {
+			return rt.getLocation().toString();
+		}
+		
+		return null; // No idea
 	}
 	
 	public static boolean canExplore(IServer server) {
@@ -117,10 +128,13 @@
 	}
 	public static boolean canExplore(IServer server, IModule[] modules) {
 		IDeployableServer ds = ServerConverter.getDeployableServer(server);
-		IPath p = PublishUtil.getDeployRootFolder(modules, ds);
-		if (p == null || !p.toFile().exists() || ExploreUtils.getExploreCommand() == null)
-			return false;
-		return true;
+		if( ds != null ) {
+			IPath p = PublishUtil.getDeployRootFolder(modules, ds);
+			if (p == null || !p.toFile().exists() || ExploreUtils.getExploreCommand() == null)
+				return false;
+			return true;
+		}
+		return false;
 	}
 	
 	public static void explore(String name) {

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-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java	2012-03-09 11:47:10 UTC (rev 39405)
@@ -36,11 +36,18 @@
 import org.jboss.ide.eclipse.as.ui.actions.ExploreUtils;
 public class ExploreActionProvider extends CommonActionProvider {
 	public static interface IExploreBehavior {
+		public boolean canExplore(IServer server, IModule[] module);
 		public void openExplorer(IServer server, IModule[] module);
 	}
 	public static HashMap<String, IExploreBehavior> exploreBehaviorMap = new HashMap<String, IExploreBehavior>();
 	static {
 		exploreBehaviorMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new IExploreBehavior() {
+			@Override
+			public boolean canExplore(IServer server, IModule[] module) {
+				if( module != null )
+					return ExploreUtils.canExplore(server, module);
+				return ExploreUtils.canExplore(server);
+			}
 			public void openExplorer(IServer server, IModule[] module) {
 				if( module != null ) 
 					runExploreModuleServer(server, module);
@@ -119,13 +126,13 @@
 	public void fillContextMenu(IMenuManager menu) {
 		String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
 		IExploreBehavior beh = exploreBehaviorMap.get(mode);
-		if( beh != null ) {
-			if( getModuleServer() != null )
-				menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
-			else if( getServer() != null )
-				menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
-			exploreAction.setEnabled(true);
-		}
+		if( beh == null || !beh.canExplore(getServer(), getModuleServer() == null ? null : getModuleServer().module))
+			return;
+		if( getModuleServer() != null )
+			menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
+		else if( getServer() != null )
+			menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
+		exploreAction.setEnabled(true);
 	}
 	
 	public IServer getServer() {