[jbosstools-commits] JBoss Tools SVN: r42100 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-06-20 09:18:43 -0400 (Wed, 20 Jun 2012)
New Revision: 42100

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-12071 to trunk

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java	2012-06-19 22:44:00 UTC (rev 42099)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java	2012-06-20 13:18:43 UTC (rev 42100)
@@ -17,13 +17,18 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.wst.server.core.IModule;
 import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
 
 public class ExpressBehaviour extends DelegatingServerBehavior {
 	private IAdaptable publishAdaptableInfo;
 	public IStatus publish(int kind, IProgressMonitor monitor) {
-		if( publishAdaptableInfo != null && "user".equals(publishAdaptableInfo.getAdapter(String.class)))
+		boolean shouldPublish = false;
+		if( publishAdaptableInfo != null ) {
+			shouldPublish = "user".equals(publishAdaptableInfo.getAdapter(String.class)) || publishAdaptableInfo.getAdapter(Shell.class) != null;
+		}
+		if( shouldPublish )
 			return super.publish(kind, monitor);
 		return Status.OK_STATUS;
 	}

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2012-06-19 22:44:00 UTC (rev 42099)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2012-06-20 13:18:43 UTC (rev 42100)
@@ -99,15 +99,7 @@
 	public int publishModule(DeployableServerBehavior behaviour, int kind,
 			int deltaKind, IModule[] module, IProgressMonitor monitor)
 			throws CoreException {
-		
-		// If this action is not user-initiated, bail!
-		IAdaptable a = ((ExpressBehaviour)behaviour).getPublishAdaptableInfo();
-		if( a == null )
-			return -1;
-		String s = (String)a.getAdapter(String.class);
-		if( s == null || !s.equals("user"))
-			return -1;
-		
+				
 		if( module.length > 1 )
 			return IServer.PUBLISH_STATE_UNKNOWN;
 		
@@ -347,6 +339,12 @@
 		IDeployableServer s = ServerConverter.getDeployableServer(server);
 		return s.getDeployFolder();
 	}
+	
+	public String getPublishDefaultRootTempFolder(IServer server) {
+		IDeployableServer s = ServerConverter.getDeployableServer(server);
+		return s.getTempDeployFolder();
+	}
+	
 	protected void refreshProject(final IProject project,IProgressMonitor monitor) throws CoreException {
 		// Already inside a workspace scheduling rule
 		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);