From 88e18bf166e46c0c411ade08ad9253faa5abe141 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 3 Nov 2012 20:38:19 +0000 Subject: [PATCH] Improve job progress bar git-svn-id: https://svn.argeo.org/slc/trunk@5692 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../ui/dist/commands/NormalizeDistribution.java | 13 ++++++++++++- .../client/ui/dist/views/DistributionsView.java | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java index a1809518f..0a16e4dc5 100644 --- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java +++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java @@ -21,6 +21,8 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import javax.jcr.query.Query; +import javax.jcr.query.QueryResult; import javax.jcr.util.TraversingItemVisitor; import org.apache.commons.logging.Log; @@ -96,8 +98,17 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames { // log.debug("Count: " + count); // long count = query.execute().getRows().nextRow() // .getValue("count").getLong(); + Query countQuery = session + .getWorkspace() + .getQueryManager() + .createQuery("select file from [nt:file] as file", + Query.JCR_SQL2); + QueryResult result = countQuery.execute(); + Long expectedCount = result.getNodes().getSize(); + monitor.beginTask("Normalize " - + session.getWorkspace().getName(), -1); + + session.getWorkspace().getName(), + expectedCount.intValue()); NormalizingTraverser tiv = new NormalizingTraverser(monitor); session.getNode(artifactBasePath).accept(tiv); } catch (Exception e) { 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 25e67382a..f4d2de99d 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 @@ -30,6 +30,8 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; +import javax.jcr.query.Query; +import javax.jcr.query.QueryResult; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -588,8 +590,19 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames // QueryResult result = countQuery.execute(); // Long expectedCount = result.getNodes().getSize(); - Long expectedCount = JcrUtils.countFiles(sourceSession - .getRootNode()); + Query countQuery = sourceSession + .getWorkspace() + .getQueryManager() + .createQuery("select file from [nt:file] as file", + Query.JCR_SQL2); + QueryResult result = countQuery.execute(); + Long expectedCount = result.getNodes().getSize(); + // Long expectedCount = + // result.getRows().nextRow().getValues()[0] + // .getLong(); + + // Long expectedCount = JcrUtils.countFiles(sourceSession + // .getRootNode()); if (log.isDebugEnabled()) log.debug("Will copy " + expectedCount + " files..."); -- 2.39.2