Added progress monitor support to parsers

1 files changed, 15 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
index c9db01f2a..a2a810aae 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
@@ -14,7 +14,8 @@ import java.util.List;
 import java.util.StringTokenizer;
 import javax.xml.parsers.*;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.p2.core.*;
+import org.eclipse.equinox.internal.p2.core.Activator;
+import org.eclipse.equinox.internal.p2.core.StringPool;
 import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
 import org.eclipse.equinox.internal.p2.core.helpers.Tracing;
 import org.eclipse.osgi.service.resolver.VersionRange;
@@ -42,6 +43,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
 	protected Locator locator = null; // document locator, if supported by the parser
 
 	protected StringPool stringPool = new StringPool();//used to eliminate string duplication
+	private IProgressMonitor monitor;
 
 	private static ServiceTracker xmlTracker = null;
 
@@ -122,6 +124,13 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
 	}
 
 	/**
+	 * Sets the progress monitor for the parser
+	 */
+	protected void setProgressMonitor(IProgressMonitor monitor) {
+		this.monitor = monitor;
+	}
+
+	/**
 	 * Abstract base class for content handlers
 	 */
 	protected abstract class AbstractHandler extends DefaultHandler {
@@ -618,6 +627,11 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
 		return result;
 	}
 
+	public void checkCancel() {
+		if (monitor != null && monitor.isCanceled())
+			throw new OperationCanceledException();
+	}
+
 	/**
 	 * Converts a version string to a Version object. Returns the version object,
 	 * or {@link Version#emptyVersion} if the value was not a valid version.