Adapt to changes in Commons

[gpl/argeo-slc.git] / org.argeo.slc.client.ui.dist / src / org / argeo / slc / client / ui / dist / wizards / GenerateBinariesWizard.java

diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
index 3d7df051d28419464b671c92dea97abfaca2a72f..5df19d62835ec87c86d748cbfaa1e2a40fbe55eb 100644 (file)
--- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
+++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
@@ -25,18 +25,19 @@ import javax.jcr.Session;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
-import org.argeo.eclipse.ui.EclipseArgeoMonitor;
+import org.argeo.cms.ui.workbench.util.PrivilegedJob;
+import org.argeo.eclipse.ui.EclipseJcrMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.client.ui.dist.PrivilegedJob;
 import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
 import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoService;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.GenerateBinaries;
+import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -59,7 +60,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.aether.artifact.Artifact;
 
 /**
  * Define parameters to asynchronously generate binaries, sources and sdk pom
@@ -138,7 +138,7 @@ public class GenerateBinariesWizard extends Wizard {
        // ///////////////////////////////
        // ////// THE PAGES
        private class RecapPage extends WizardPage {
-
+               private static final long serialVersionUID = 904196417910874087L;
                private TableViewer recapViewer;
 
                public RecapPage() {
@@ -236,6 +236,8 @@ public class GenerateBinariesWizard extends Wizard {
                        TableViewerColumn column = ViewerUtils.createTableViewerColumn(
                                        recapViewer, "Name", SWT.NONE, 250);
                        column.setLabelProvider(new ColumnLabelProvider() {
+                               private static final long serialVersionUID = -9145709097621022043L;
+
                                @Override
                                public String getText(Object element) {
                                        return ((Artifact) element).getArtifactId();
@@ -245,6 +247,8 @@ public class GenerateBinariesWizard extends Wizard {
                        column = ViewerUtils.createTableViewerColumn(recapViewer,
                                        "Version", SWT.NONE, 250);
                        column.setLabelProvider(new ColumnLabelProvider() {
+                               private static final long serialVersionUID = 5524185741667651628L;
+
                                @Override
                                public String getText(Object element) {
                                        return ((Artifact) element).getBaseVersion();
@@ -252,6 +256,9 @@ public class GenerateBinariesWizard extends Wizard {
                        });
 
                        recapViewer.setContentProvider(new IStructuredContentProvider() {
+                               private static final long serialVersionUID = -4579434453554442858L;
+
+                               
                                List<Artifact> artifacts;
 
                                @SuppressWarnings("unchecked")
@@ -303,7 +310,7 @@ public class GenerateBinariesWizard extends Wizard {
                protected IStatus doRun(IProgressMonitor progressMonitor) {
                        Session session = null;
                        try {
-                               ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor);
+                               JcrMonitor monitor = new EclipseJcrMonitor(progressMonitor);
                                session = repoService.getRemoteSession(repoNodePath, null,
                                                wkspName);
                                Node groupBaseNode = session.getNode(groupNodePath);
@@ -312,7 +319,7 @@ public class GenerateBinariesWizard extends Wizard {
                        } catch (Exception e) {
                                if (log.isDebugEnabled())
                                        e.printStackTrace();
-                               return new Status(IStatus.ERROR, DistPlugin.ID,
+                               return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID,
                                                "Cannot normalize group", e);
                        } finally {
                                JcrUtils.logoutQuietly(session);