Author: rob.stryker(a)jboss.com Date: 2010-11-23 04:11:25 -0500 (Tue, 23 Nov 2010) New Revision: 26831 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/views/server/extensions/ModuleActionProvider.java Log: JBIDE-7613 - explore utils weren't using api's, were instead duplicating code and being inconsistant 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 2010-11-23 00:29:08 UTC (rev 26830) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2010-11-23 09:11:25 UTC (rev 26831) @@ -21,6 +21,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -85,15 +86,10 @@ public static String getDeployDirectory(IServer server) { IDeployableServer deployableServer = ServerConverter.getDeployableServer(server); - if (server.getRuntime() != null && deployableServer != null) { + if (server != null && deployableServer != null) { return deployableServer.getDeployFolder(); } - IServerWorkingCopy swc = server.createWorkingCopy(); - ServerAttributeHelper helper = new ServerAttributeHelper(swc - .getOriginal(), swc); - String deployDirectory = helper.getAttribute( - IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$ - return deployDirectory.trim(); + return server.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "").trim(); } public static boolean canExplore(IServer server) { @@ -106,6 +102,13 @@ } return true; } + 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; + } public static void explore(String name) { File file = new File(name); @@ -144,28 +147,11 @@ } public static IPath getDeployPath(IDeployableServer server,IModule[] moduleTree) { - IPath root = new Path( server.getDeployFolder() ); - String type, name; - for( int i = 0; i < moduleTree.length; i++ ) { - type = moduleTree[i].getModuleType().getId(); - name = moduleTree[i].getName(); - if( new Path(name).segmentCount() > 1 ) - // we strongly suspect this is a binary object and not a project - return root.append(new Path(name).lastSegment()); - if( "jst.ear".equals(type)) //$NON-NLS-1$ - root = root.append(name + ".ear"); //$NON-NLS-1$ - else if( "jst.web".equals(type)) //$NON-NLS-1$ - root = root.append(name + ".war"); //$NON-NLS-1$ - else if( "jst.utility".equals(type) && i >= 1 && "jst.web".equals(moduleTree[i-1].getModuleType().getId())) //$NON-NLS-1$ //$NON-NLS-2$ - root = root.append("WEB-INF").append("lib").append(name + ".jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - else if( "jst.connector".equals(type)) { //$NON-NLS-1$ - root = root.append(name + ".rar"); //$NON-NLS-1$ - } else if( "jst.jboss.esb".equals(type)){ //$NON-NLS-1$ - root = root.append(name + ".esb"); //$NON-NLS-1$ - }else - root = root.append(name + ".jar"); //$NON-NLS-1$ + IPath p = PublishUtil.getDeployRootFolder(moduleTree, server); + if( !PublishUtil.isBinaryObject(moduleTree)) { + return PublishUtil.getDeployPath(moduleTree, server); } - return root; + return p; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-11-23 00:29:08 UTC (rev 26830) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2010-11-23 09:11:25 UTC (rev 26831) @@ -7,7 +7,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IMenuManager; @@ -26,12 +25,8 @@ import org.eclipse.wst.server.core.internal.PublishServerJob; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer; -import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory.SingleDeployableModuleDelegate; -import org.jboss.ide.eclipse.as.core.publishers.JstPublisher; -import org.jboss.ide.eclipse.as.core.publishers.SingleFilePublisher; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; import org.jboss.ide.eclipse.as.core.util.ModuleUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; @@ -197,28 +192,8 @@ private IPath getDeployPath() { ModuleServer ms = selection[0]; IModule[] module = ms.module; - IJBossServerPublisher publisher = ExtensionManager.getDefault() - .getPublisher(ms.getServer(), module, "local"); - IPath path = null; - IDeployableServer deployableServer = ServerConverter - .getDeployableServer(ms.server); - if (deployableServer != null) { - if (publisher instanceof JstPublisher) { - path = ExploreUtils.getDeployPath(deployableServer, - module); - } else if (publisher instanceof SingleFilePublisher) { - SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module[0].loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor()); - if (delegate != null) { - IPath sourcePath = delegate.getGlobalSourcePath(); - IPath destFolder = new Path(deployableServer.getDeployFolder()); - path = destFolder.append(sourcePath.lastSegment()); - } else { - path = new Path(deployableServer.getDeployFolder()); - } - } else { - path = new Path(deployableServer.getDeployFolder()); - } - } + IDeployableServer deployableServer = ServerConverter.getDeployableServer(ms.server); + IPath path = ExploreUtils.getDeployPath(deployableServer, module); return path; } }