[jbosstools-commits] JBoss Tools SVN: r24505 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/reporting and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2010-08-27 10:39:51 -0400 (Fri, 27 Aug 2010)
New Revision: 24505

Modified:
   trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
   trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
Log:
[JBIDE-6880] ability to cancel added

Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch	2010-08-27 14:37:02 UTC (rev 24504)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch	2010-08-27 14:39:51 UTC (rev 24505)
@@ -6,7 +6,7 @@
 <booleanAttribute key="automaticValidate" value="false"/>
 <stringAttribute key="bootstrap" value=""/>
 <stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="clearws" value="false"/>
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>

Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java	2010-08-27 14:37:02 UTC (rev 24504)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java	2010-08-27 14:39:51 UTC (rev 24505)
@@ -105,12 +105,23 @@
 
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
+			if (monitor.isCanceled()) {
+				return Status.CANCEL_STATUS;
+			}
 			if (globalSettings.isEnabled()) {
+				monitor.beginTask("querying whether reporting is globally enabled", 2);
+				if (monitor.isCanceled()) {
+					return Status.CANCEL_STATUS;
+				}
 				if (UsageReportPreferences.isAskUser()) {
 					askUserAndReport();
+					if (monitor.isCanceled()) {
+						return Status.CANCEL_STATUS;
+					}
 				} else {
 					doReport();
 				}
+				monitor.done();
 			}
 			return Status.OK_STATUS;
 		}