Author: rob.stryker(a)jboss.com
Date: 2012-03-08 05:12:24 -0500 (Thu, 08 Mar 2012)
New Revision: 39367
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
Log:
JBIDE-11210 to trunk (small UI freeze)
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08
08:39:41 UTC (rev 39366)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08
10:12:24 UTC (rev 39367)
@@ -13,6 +13,7 @@
import java.net.URL;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -55,7 +56,8 @@
@Override
public URL getModuleRootURL(IModule module) {
- IProject appProj = ExpressServerUtils.findProjectForServersApplication(getServer());
+ String appProjString = ExpressServerUtils.getExpressDeployProject(getServer());
+ IProject appProj = appProjString == null ? null :
ResourcesPlugin.getWorkspace().getRoot().getProject(appProjString);
IProject p =module.getProject();
boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer()) &&
p.equals(appProj);
return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
Show replies by date