[jbosstools-commits] JBoss Tools SVN: r36010 - branches/jbosstools-3.3.0.M4/as/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: 2011-10-26 09:13:31 -0400 (Wed, 26 Oct 2011)
New Revision: 36010

Modified:
   branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10045 - m4

Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2011-10-26 13:12:32 UTC (rev 36009)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java	2011-10-26 13:13:31 UTC (rev 36010)
@@ -51,8 +51,8 @@
 			return IServer.PUBLISH_STATE_UNKNOWN;
 		}
 		
-		int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
-		if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
+		if( kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL) {
+	                int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
 			if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
 				monitor.beginTask("Publishing " + p.getName(), 200);
 				EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
@@ -66,7 +66,7 @@
 				return IServer.PUBLISH_STATE_NONE;
 			}
 		}
-		return IServer.PUBLISH_STATE_INCREMENTAL;
+		return state;
 	}
 
 	private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {