From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 25 Oct 2012 10:03:50 +0000 (+0000)
Subject: Add progress view
X-Git-Tag: argeo-slc-2.1.7~589
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5a4fe81c7ba0b26751ed6b69cc5a503638c9bcbc;p=gpl%2Fargeo-slc.git

Add progress view

git-svn-id: https://svn.argeo.org/slc/trunk@5645 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/plugins/org.argeo.slc.client.ui.dist/icons/pview.gif b/plugins/org.argeo.slc.client.ui.dist/icons/pview.gif
new file mode 100644
index 000000000..4aa54a69d
Binary files /dev/null and b/plugins/org.argeo.slc.client.ui.dist/icons/pview.gif differ
diff --git a/plugins/org.argeo.slc.client.ui.dist/plugin.xml b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
index cc4b39c23..3d8bc0e02 100644
--- a/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -44,6 +44,13 @@
             icon="icons/search.gif"
             name="Distributions">
       </view>
+	   <view
+	         name="Progress View"
+	         icon="icons/pview.gif"
+	         category="org.eclipse.ui"
+	         class="org.eclipse.ui.ExtensionFactory:progressView"
+	         id="org.eclipse.ui.views.ProgressView">
+	   </view>
    </extension>
    <!-- Editors -->
    <extension
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
index 65021dc78..5b185a89a 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
@@ -40,5 +40,6 @@ public class DistributionPerspective implements IPerspectiveFactory {
 		main.addView(QueryArtifactsForm.ID);
 		main.addView(QueryBundlesForm.ID);
 		main.addView(QueryArtifactsText.ID);
+		main.addView("org.eclipse.ui.views.ProgressView");
 	}
 }
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
index e5eea06fe..7338afda0 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
@@ -550,7 +550,10 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 							targetWorkspace);
 				}
 
-				new WorkspaceMergeJob(sourceSession, targetSession).schedule();
+				Job workspaceMergeJob = new WorkspaceMergeJob(sourceSession,
+						targetSession);
+				workspaceMergeJob.setUser(true);
+				workspaceMergeJob.schedule();
 				return true;
 			} catch (RepositoryException e) {
 				throw new SlcException("Cannot process drop from " + sourceDist
@@ -585,7 +588,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 		}
 
 		@Override
-		protected IStatus run(IProgressMonitor monitor) {
+		protected IStatus run(IProgressMonitor eclipseMonitor) {
 			long begin = System.currentTimeMillis();
 			try {
 				// Not implemented in Davex Jackrabbit v2.2
@@ -596,12 +599,13 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 				// Query.JCR_SQL2).execute().getRows().nextRow()
 				// .getValues()[0].getLong();
 
-				ArgeoMonitor argeoMonitor = new EclipseArgeoMonitor(monitor);
-				monitor.beginTask("Copy files", ArgeoMonitor.UNKNOWN);
+				ArgeoMonitor monitor = new EclipseArgeoMonitor(eclipseMonitor);
+				eclipseMonitor.beginTask("Copy files", ArgeoMonitor.UNKNOWN);
 
 				Long count = JcrUtils.copyFiles(sourceSession.getRootNode(),
-						targetSession.getRootNode(), true, argeoMonitor);
+						targetSession.getRootNode(), true, monitor);
 
+				monitor.done();
 				long duration = (System.currentTimeMillis() - begin) / 1000;// in
 																			// s
 				if (log.isDebugEnabled())