You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/06/24 16:00:24 UTC
svn commit: r1605087 - in /sling/trunk/tooling/ide: eclipse-m2e-ui/META-INF/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/
eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/
Author: rombert
Date: Tue Jun 24 14:00:23 2014
New Revision: 1605087
URL: http://svn.apache.org/r1605087
Log:
SLING-3693 - Repository import wizard blocks UI thread and is not
cancellable
Use ProgressUtils in the wizard classes.
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF?rev=1605087&r1=1605086&r2=1605087&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Tue Jun 24 14:00:23 2014
@@ -28,6 +28,7 @@ Import-Package: org.apache.commons.httpc
org.apache.sling.ide.artifacts,
org.apache.sling.ide.eclipse.core,
org.apache.sling.ide.eclipse.core.debug,
+ org.apache.sling.ide.eclipse.core.progress,
org.apache.sling.ide.eclipse.ui,
org.apache.sling.ide.eclipse.ui.wizards,
org.apache.sling.ide.osgi,
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java?rev=1605087&r1=1605086&r2=1605087&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java Tue Jun 24 14:00:23 2014
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.ui.wizards.np;
+import static org.apache.sling.ide.eclipse.core.progress.ProgressUtils.advance;
+
import java.util.List;
import java.util.Properties;
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java?rev=1605087&r1=1605086&r2=1605087&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java Tue Jun 24 14:00:23 2014
@@ -17,6 +17,8 @@
**************************************************************************/
package org.apache.sling.ide.eclipse.ui.wizards;
+import static org.apache.sling.ide.eclipse.core.progress.ProgressUtils.advance;
+
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -29,7 +31,6 @@ import org.eclipse.core.resources.IProje
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchManager;
@@ -221,14 +222,6 @@ public abstract class AbstractNewSlingAp
// nothing to be done
}
- protected void advance(IProgressMonitor monitor, int step) {
-
- monitor.worked(step);
- if (monitor.isCanceled()) {
- throw new OperationCanceledException();
- }
- }
-
protected void finishConfiguration(List<IProject> projects, IServer server, IProgressMonitor monitor)
throws CoreException {
// nothing to be done by default - hook for subclasses
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java?rev=1605087&r1=1605086&r2=1605087&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java Tue Jun 24 14:00:23 2014
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.ui.wizards;
+import static org.apache.sling.ide.eclipse.core.progress.ProgressUtils.advance;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;