[jbosstools-commits] JBoss Tools SVN: r35888 - 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-21 03:25:09 -0400 (Fri, 21 Oct 2011)
New Revision: 35888

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-9953 - updating count and messages for commit and push openshift publish

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-21 07:21:28 UTC (rev 35887)
+++ 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-21 07:25:09 UTC (rev 35888)
@@ -45,31 +45,34 @@
 		IProject p = module[module.length-1].getProject();
 		int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
 		if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
-			if( changed != 0 && requestCommitAndPushApproval(module)) {
+			if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
 				monitor.beginTask("Publishing " + p.getName(), 200);
 				EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
 				EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
 				monitor.done();
+				return IServer.PUBLISH_STATE_NONE;
 			} else if( changed == 0 && requestPushApproval(module)) {
 				monitor.beginTask("Publishing " + p.getName(), 100);
 				EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
 				monitor.done();
+				return IServer.PUBLISH_STATE_NONE;
 			}
-			return IServer.PUBLISH_STATE_NONE;
 		}
 		return IServer.PUBLISH_STATE_INCREMENTAL;
 	}
 
-	private boolean requestCommitAndPushApproval(final IModule[] module) {
+	private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
 		String projName = module[module.length-1].getProject().getName();
-		String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by commiting and pushing its git repository?";
+		String msg = "There are " + changed + " local changes in \"" + projName + "\". " +
+				"Do you want to publish to OpenShift by commiting the changes and pushing its Git repository?";
 		String title = "Publish " + projName + "?";
 		return requestApproval(module, msg, title);
 	}
 
 	private boolean requestPushApproval(final IModule[] module) {
 		String projName = module[module.length-1].getProject().getName();
-		String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by pushing its git repository?";
+		String msg = "The are no local changes in \"" + projName + "\". " +
+				"Do you want to publish to OpenShift by pushing its Git repository?";
 		String title = "Publish " + projName + "?";
 		return requestApproval(module, msg, title);
 	}