From 9cdf3ff23b7416beca4ec27fba01888c7c37d298 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 17 Feb 2015 16:41:56 +0000 Subject: [PATCH] Adapt after ui.dist after Argeo Commons upgrade. Build but do not start correctly. git-svn-id: https://svn.argeo.org/slc/trunk@7916 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/spring/commands.xml | 10 +-- .../META-INF/spring/editors.xml | 9 ++- org.argeo.slc.client.ui.dist/bnd.bnd | 2 +- org.argeo.slc.client.ui.dist/build.properties | 4 +- org.argeo.slc.client.ui.dist/plugin.xml | 4 +- org.argeo.slc.client.ui.dist/pom.xml | 6 ++ .../AnonymousDistributionPerspective.java | 2 +- .../argeo/slc/client/ui/dist/DistLabels.java | 26 ------- .../argeo/slc/client/ui/dist/DistPlugin.java | 5 +- .../ui/dist/DistributionPerspective.java | 7 +- .../slc/client/ui/dist/PrivilegedJob.java | 43 ------------ .../dist/commands/CopyLocalJavaWorkspace.java | 4 +- .../ui/dist/commands/CopyWorkspace.java | 15 ++-- .../commands/CreateLocalJavaWorkspace.java | 7 +- .../ui/dist/commands/CreateWorkspace.java | 6 +- .../ui/dist/commands/DeleteArtifacts.java | 9 ++- .../ui/dist/commands/DeleteWorkspace.java | 2 +- .../dist/commands/DisplayRepoInformation.java | 2 +- .../client/ui/dist/commands/DoNothing.java | 6 +- .../slc/client/ui/dist/commands/Fetch.java | 5 +- .../ui/dist/commands/ManageWorkspaceAuth.java | 9 ++- .../ui/dist/commands/MergeWorkspaces.java | 10 ++- .../dist/commands/NormalizeDistribution.java | 11 +-- .../ui/dist/commands/NormalizeWorkspace.java | 4 +- .../commands/OpenGenerateBinariesWizard.java | 8 +-- .../ui/dist/commands/OpenModuleEditor.java | 2 +- .../ui/dist/commands/OpenWorkspaceEditor.java | 14 ++-- .../ui/dist/commands/PublishWorkspace.java | 8 +-- .../dist/commands/RefreshArtifactBrowser.java | 4 +- .../commands/RefreshDistributionsView.java | 7 +- .../ui/dist/commands/RegisterRepository.java | 9 ++- .../client/ui/dist/commands/RunInOsgi.java | 2 +- .../ui/dist/commands/ShowSizeColumn.java | 10 ++- .../dist/commands/UnregisterRemoteRepo.java | 6 +- .../AnonymousDistTreeContentProvider.java | 4 +- .../controllers/ArtifactLabelProvider.java | 2 + .../ArtifactsTreeContentProvider.java | 2 + .../dist/controllers/DistTreeComparator.java | 1 + .../controllers/DistTreeContentProvider.java | 7 +- .../controllers/DistTreeLabelProvider.java | 8 +-- .../dist/editors/ArtifactVersionEditor.java | 10 ++- .../ui/dist/editors/BundleDependencyPage.java | 17 ++++- .../ui/dist/editors/BundleDetailPage.java | 58 ++++++++-------- .../client/ui/dist/editors/BundleRawPage.java | 8 +-- .../ui/dist/editors/DistWkspBrowserPage.java | 3 + .../ui/dist/editors/DistWkspEditorInput.java | 4 +- .../ui/dist/editors/DistWkspSearchPage.java | 18 ++++- .../ui/dist/editors/DistWorkspaceEditor.java | 8 +-- .../editors/ModularDistVersionDetailPage.java | 4 +- .../editors/ModularDistVersionEditor.java | 4 +- .../ModularDistVersionOverviewPage.java | 68 +++++++++++++------ .../ui/dist/editors/ModuleEditorInput.java | 4 +- .../client/ui/dist/editors/RunInOsgiPage.java | 2 + .../editors/WkspCategoryBaseListPage.java | 16 ++++- .../dist/utils/ArtifactsTableConfigurer.java | 7 ++ .../dist/utils/DistNodeViewerComparator.java | 2 + ...inkListener.java => HyperlinkAdapter.java} | 3 +- .../ui/dist/utils/NameVersionComparator.java | 3 +- .../ui/dist/utils/VersionComparator.java | 1 + .../slc/client/ui/dist/utils/ViewerUtils.java | 4 +- .../views/AbstractQueryArtifactsView.java | 3 + .../views/AnonymousDistributionsView.java | 2 +- .../ui/dist/views/ArtifactsBrowser.java | 3 +- .../ui/dist/views/DistributionsView.java | 40 +++++------ .../slc/client/ui/dist/views/HelpView.java | 12 +--- .../ui/dist/views/QueryArtifactsForm.java | 8 +-- .../ui/dist/views/QueryArtifactsText.java | 9 +-- .../ui/dist/views/QueryBundlesForm.java | 8 +-- .../ui/dist/wizards/ChooseRightsPage.java | 1 + .../client/ui/dist/wizards/FetchWizard.java | 30 +++++--- .../dist/wizards/GenerateBinariesWizard.java | 13 +++- .../ui/dist/wizards/RegisterRepoWizard.java | 5 ++ 72 files changed, 352 insertions(+), 328 deletions(-) delete mode 100644 org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java delete mode 100644 org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java rename org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/{AbstractHyperlinkListener.java => HyperlinkAdapter.java} (91%) diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml index e2cd17458..df2e07a1e 100644 --- a/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml +++ b/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml @@ -125,13 +125,9 @@ - - - - + diff --git a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml index e36f591cb..fce4930c8 100644 --- a/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml +++ b/org.argeo.slc.client.ui.dist/META-INF/spring/editors.xml @@ -5,11 +5,10 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"> - - - - + + + diff --git a/org.argeo.slc.client.ui.dist/bnd.bnd b/org.argeo.slc.client.ui.dist/bnd.bnd index 600659884..3b5709a4d 100644 --- a/org.argeo.slc.client.ui.dist/bnd.bnd +++ b/org.argeo.slc.client.ui.dist/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.argeo.slc.client.ui.distp;singleton=true +Bundle-SymbolicName: org.argeo.slc.client.ui.dist;singleton=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.ui;resolution:=optional,\ org.eclipse.core.runtime,\ diff --git a/org.argeo.slc.client.ui.dist/build.properties b/org.argeo.slc.client.ui.dist/build.properties index 5fc538bc8..34d2e4d2d 100644 --- a/org.argeo.slc.client.ui.dist/build.properties +++ b/org.argeo.slc.client.ui.dist/build.properties @@ -1,4 +1,4 @@ -source.. = src/main/java/ -output.. = target/classes/ +source.. = src/ +output.. = bin/ bin.includes = META-INF/,\ . diff --git a/org.argeo.slc.client.ui.dist/plugin.xml b/org.argeo.slc.client.ui.dist/plugin.xml index 6e3f6d531..e7640c7c6 100644 --- a/org.argeo.slc.client.ui.dist/plugin.xml +++ b/org.argeo.slc.client.ui.dist/plugin.xml @@ -73,13 +73,13 @@ - - + --> org.argeo.eclipse.ui.workbench ${version.argeo-commons} + + org.argeo.commons + org.argeo.security.ui + ${version.argeo-commons} + + diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java index 8d5a1513d..b12a55120 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/AnonymousDistributionPerspective.java @@ -24,7 +24,7 @@ import org.eclipse.ui.IPerspectiveFactory; /** Simple default perspective that presents public repositories */ public class AnonymousDistributionPerspective implements IPerspectiveFactory { - public final static String ID = DistPlugin.ID + public final static String ID = DistPlugin.PLUGIN_ID + ".anonymousDistributionPerspective"; public void createInitialLayout(IPageLayout layout) { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java deleted file mode 100644 index 3a94f661b..000000000 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistLabels.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.client.ui.dist; - -public class DistLabels { - - public static String getLabel(String jcrName){ - String label = null; - - - return label; - } -} diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java index 15e203297..b1e5b3b6c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistPlugin.java @@ -19,8 +19,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +/** Default activator for the distribution bundle */ public class DistPlugin extends AbstractUIPlugin { - public final static String ID = "org.argeo.slc.client.ui.dist"; + public final static String PLUGIN_ID = "org.argeo.slc.client.ui.dist"; private static DistPlugin plugin; @@ -34,7 +35,7 @@ public class DistPlugin extends AbstractUIPlugin { } public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(ID, path); + return imageDescriptorFromPlugin(PLUGIN_ID, path); } } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java index 918b4b44c..78e0a8e72 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistributionPerspective.java @@ -20,12 +20,11 @@ import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; -/** - * Manage a set of software repositories - */ +/** Manage a set of software repositories */ public class DistributionPerspective implements IPerspectiveFactory { - public final static String ID = DistPlugin.ID + ".distributionPerspective"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".distributionPerspective"; public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java deleted file mode 100644 index 001dd8df5..000000000 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/PrivilegedJob.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.argeo.slc.client.ui.dist; - -import java.security.AccessController; -import java.security.PrivilegedAction; - -import javax.security.auth.Subject; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.jobs.Job; -import org.springframework.security.authentication.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; - -/** - * Propagate authentication to an eclipse job. Typically to execute a privileged - * action outside the UI thread - */ -public abstract class PrivilegedJob extends Job { - - private final Authentication authentication; - private Subject subject; - - public PrivilegedJob(String jobName) { - super(jobName); - authentication = SecurityContextHolder.getContext().getAuthentication(); - subject = Subject.getSubject(AccessController.getContext()); - } - - @Override - protected IStatus run(final IProgressMonitor progressMonitor) { - PrivilegedAction privilegedAction = new PrivilegedAction() { - public IStatus run() { - SecurityContextHolder.getContext().setAuthentication( - authentication); - return doRun(progressMonitor); - } - }; - return Subject.doAs(subject, privilegedAction); - } - - /** Implement here what should be executed with default context authentication*/ - protected abstract IStatus doRun(IProgressMonitor progressMonitor); -} \ No newline at end of file diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java index 441afb74d..7ad91f3ed 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java @@ -29,7 +29,7 @@ import org.argeo.eclipse.ui.EclipseArgeoMonitor; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; import org.argeo.slc.client.ui.dist.DistPlugin; -import org.argeo.slc.client.ui.dist.PrivilegedJob; +import org.argeo.security.ui.PrivilegedJob; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; import org.argeo.slc.repo.JavaRepoManager; import org.argeo.slc.repo.RepoUtils; @@ -55,7 +55,7 @@ public class CopyLocalJavaWorkspace extends AbstractHandler { private static final Log log = LogFactory .getLog(CopyLocalJavaWorkspace.class); - public final static String ID = DistPlugin.ID + ".copyLocalJavaWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + ".copyLocalJavaWorkspace"; public final static String DEFAULT_LABEL = "Copy Java Workspace..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/addItem.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java index 7e4175a8d..3805e0daa 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java @@ -29,9 +29,9 @@ import org.argeo.ArgeoException; import org.argeo.ArgeoMonitor; import org.argeo.eclipse.ui.EclipseArgeoMonitor; import org.argeo.jcr.JcrUtils; +import org.argeo.security.ui.PrivilegedJob; import org.argeo.slc.SlcConstants; import org.argeo.slc.client.ui.dist.DistPlugin; -import org.argeo.slc.client.ui.dist.PrivilegedJob; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; import org.argeo.slc.repo.RepoUtils; import org.argeo.util.security.Keyring; @@ -49,20 +49,18 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Create a copy of the chosen workspace in a remote repository. - */ +/** Create a copy of the chosen workspace in a remote repository */ public class CopyWorkspace extends AbstractHandler { private static final Log log = LogFactory.getLog(CopyWorkspace.class); - public final static String ID = DistPlugin.ID + ".copyWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + ".copyWorkspace"; public final static String DEFAULT_LABEL = "Duplicate..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/addItem.gif"); public final static String PARAM_SOURCE_WORKSPACE_NAME = "srcWkspName"; public final static String PARAM_TARGET_REPO_PATH = "targetRepoPath"; - + // DEPENDENCY INJECTION private RepositoryFactory repositoryFactory; private Keyring keyring; @@ -124,7 +122,7 @@ public class CopyWorkspace extends AbstractHandler { this.targetWkspName = targetWkspName; this.display = display; } - + @Override protected IStatus doRun(IProgressMonitor progressMonitor) { long begin = System.currentTimeMillis(); @@ -132,7 +130,7 @@ public class CopyWorkspace extends AbstractHandler { ArgeoMonitor monitor = new EclipseArgeoMonitor(progressMonitor); monitor.beginTask("Copy workspace", -1); monitor.subTask("Copying nodes"); - + Session nodeSession = null; Session srcSession = null; Session newSession = null; @@ -183,7 +181,6 @@ public class CopyWorkspace extends AbstractHandler { return Status.OK_STATUS; } - } /* DEPENDENCY INJECTION */ diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java index d3af9b0ae..955691f8d 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java @@ -29,15 +29,14 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Create a new empty workspace in the default local java repository. - */ +/** Create a new empty workspace in the default local java repository */ public class CreateLocalJavaWorkspace extends AbstractHandler { private static final Log log = LogFactory .getLog(CreateLocalJavaWorkspace.class); // Exposes commands meta-info - public final static String ID = DistPlugin.ID + ".createLocalJavaWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".createLocalJavaWorkspace"; public final static String DEFAULT_LABEL = "Create local Java workspace..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/addItem.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java index 09df5a691..b4a8d98b5 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java @@ -40,14 +40,12 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Create a new empty workspace in a remote repository. - */ +/** Create a new empty workspace in a remote repository */ public class CreateWorkspace extends AbstractHandler { private static final Log log = LogFactory.getLog(CreateWorkspace.class); // Exposes commands meta-info - public final static String ID = DistPlugin.ID + ".createWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + ".createWorkspace"; public final static String DEFAULT_LABEL = "Create workspace..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/addItem.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java index b942ead9b..58d11b5d5 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java @@ -34,13 +34,11 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Delete chosen artifacts from the current workspace. - */ +/** Delete chosen artifacts from the current workspace */ public class DeleteArtifacts extends AbstractHandler { // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); - public final static String ID = DistPlugin.ID + ".deleteArtifacts"; + public final static String ID = DistPlugin.PLUGIN_ID + ".deleteArtifacts"; public final static String DEFAULT_LABEL = "Delete selected items"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/removeItem.gif"); @@ -70,7 +68,8 @@ public class DeleteArtifacts extends AbstractHandler { while (it.hasNext()) { Node node = (Node) it.next(); if (node.isNodeType(SlcTypes.SLC_ARTIFACT)) { - // we remove the artifactVersion, that is the parent + // we remove the artifactVersion, that is the + // parent node.getParent().remove(); node.getSession().save(); } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java index d4a7783a4..cffa453cd 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java @@ -46,7 +46,7 @@ import org.eclipse.jface.resource.ImageDescriptor; public class DeleteWorkspace extends AbstractHandler { // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); - public final static String ID = DistPlugin.ID + ".deleteWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + ".deleteWorkspace"; public final static String DEFAULT_LABEL = "Clear"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/removeItem.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java index 7cf3d1a1a..aa496c81f 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DisplayRepoInformation.java @@ -45,7 +45,7 @@ import org.eclipse.ui.handlers.HandlerUtil; * Open a dialog that displays various information on the current repository. */ public class DisplayRepoInformation extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".displayRepoInformation"; + public final static String ID = DistPlugin.PLUGIN_ID + ".displayRepoInformation"; public final static String DEFAULT_LABEL = "Information"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/help.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java index 5519359ad..2a9307a18 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DoNothing.java @@ -5,11 +5,9 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -/** - * Utilitary command used to enable sub menus in various toolbars. Does nothing - */ +/** Util command used to enable sub menus in various toolbars. Does nothing */ public class DoNothing extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".doNothing"; + public final static String ID = DistPlugin.PLUGIN_ID + ".doNothing"; public Object execute(ExecutionEvent event) throws ExecutionException { return null; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java index b6537d832..c42fa7a29 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java @@ -11,7 +11,6 @@ import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; import org.argeo.slc.client.ui.dist.wizards.FetchWizard; -import org.argeo.slc.repo.RepoSync; import org.argeo.util.security.Keyring; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -22,13 +21,13 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; /** - * Wrap a {@link RepoSync} as an Eclipse command. Open a wizard that enable + * Wrap a {@code RepoSync} as an Eclipse command. Open a wizard that enable * definition of the fetch process parameters */ public class Fetch extends AbstractHandler { // private final static Log log = LogFactory.getLog(Fetch.class); - public final static String ID = DistPlugin.ID + ".fetch"; + public final static String ID = DistPlugin.PLUGIN_ID + ".fetch"; public final static String DEFAULT_LABEL = "Fetch..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/fetchRepo.png"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java index bd64aeb3a..b7910ca88 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ManageWorkspaceAuth.java @@ -30,18 +30,17 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Open a dialog to manage rights on the current workspace's root node. - */ +/** Open a dialog to manage rights on the current workspace's root node */ public class ManageWorkspaceAuth extends AbstractHandler { // private static final Log log = // LogFactory.getLog(ManageWorkspaceAuth.class); - public final static String ID = DistPlugin.ID + ".manageWorkspaceAuth"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".manageWorkspaceAuth"; public final static String DEFAULT_LABEL = "Manage Rights"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/changeRights.gif"); - public final static String PARAM_WORKSPACE_NAME = DistPlugin.ID + public final static String PARAM_WORKSPACE_NAME = DistPlugin.PLUGIN_ID + ".workspaceName"; /* DEPENDENCY INJECTION */ diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java index 5fd8fcaf1..e31900726 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java @@ -42,13 +42,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -/** - * Merge two workspaces - */ +/** Merge two workspaces */ public class MergeWorkspaces extends AbstractHandler { private final static Log log = LogFactory.getLog(MergeWorkspaces.class); - public final static String ID = DistPlugin.ID + ".mergeWorkspaces"; + public final static String ID = DistPlugin.PLUGIN_ID + ".mergeWorkspaces"; public final static String DEFAULT_LABEL = "Merge"; public final static String PARAM_SOURCE_WORKSPACE_NAME = "srcWkspName"; @@ -168,8 +166,8 @@ public class MergeWorkspaces extends AbstractHandler { return Status.OK_STATUS; } catch (RepositoryException e) { - return new Status(IStatus.ERROR, DistPlugin.ID, "Cannot merge", - e); + return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID, + "Cannot merge", e); } finally { JcrUtils.logoutQuietly(sourceSession); JcrUtils.logoutQuietly(targetSession); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java index 6b849f9ee..d42fd7adc 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java @@ -47,6 +47,8 @@ import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; import org.argeo.slc.repo.osgi.NormalizeGroup; import org.argeo.util.security.Keyring; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -69,15 +71,14 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; /** Legacy - Make sure than Maven and OSGi metadata are consistent */ public class NormalizeDistribution extends AbstractHandler implements SlcNames { private final static Log log = LogFactory .getLog(NormalizeDistribution.class); - public final static String ID = DistPlugin.ID + ".normalizeDistribution"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".normalizeDistribution"; public final static String DEFAULT_LABEL = "Legacy Normalization..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/normalize.gif"); @@ -237,7 +238,7 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames { overridePoms, monitor); } } catch (Exception e) { - return new Status(IStatus.ERROR, DistPlugin.ID, + return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID, "Cannot normalize distribution " + session.getWorkspace().getName(), e); } finally { @@ -302,6 +303,8 @@ public class NormalizeDistribution extends AbstractHandler implements SlcNames { } public class NormalizationDialog extends TitleAreaDialog { + private static final long serialVersionUID = -3103886455862638580L; + private Text versionT; private String version; private Button overridePomsC; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java index 6591a56a7..d2628f7fe 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java @@ -60,7 +60,7 @@ import org.eclipse.jface.resource.ImageDescriptor; public class NormalizeWorkspace extends AbstractHandler implements SlcNames { private final static Log log = LogFactory.getLog(NormalizeWorkspace.class); - public final static String ID = DistPlugin.ID + ".normalizeWorkspace"; + public final static String ID = DistPlugin.PLUGIN_ID + ".normalizeWorkspace"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/normalize.gif"); @@ -151,7 +151,7 @@ public class NormalizeWorkspace extends AbstractHandler implements SlcNames { + e.getMessage()); if (log.isErrorEnabled()) e.printStackTrace(); - return new Status(IStatus.ERROR, DistPlugin.ID, + return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID, "Cannot normalize distribution " + session.getWorkspace().getName(), e); } finally { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java index 3acbc77d9..00ed51ff0 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java @@ -28,13 +28,11 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Open a {@code GenerateBinariesWizard} wizard for the selected node - */ +/** Open a {@code GenerateBinariesWizard} wizard for the selected node */ public class OpenGenerateBinariesWizard extends AbstractHandler { // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); - public final static String ID = DistPlugin.ID + public final static String ID = DistPlugin.PLUGIN_ID + ".openGenerateBinariesWizard"; public final static String DEFAULT_LABEL = "Generate Aether Index"; public final static ImageDescriptor DEFAULT_ICON = null; @@ -68,7 +66,7 @@ public class OpenGenerateBinariesWizard extends AbstractHandler { return null; } - + /* DEPENDENCY INJECTION */ public void setRepoService(RepoService repoService) { this.repoService = repoService; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java index 95a9aa4b7..918778249 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java @@ -39,7 +39,7 @@ import org.eclipse.ui.handlers.HandlerUtil; * modularDistributions */ public class OpenModuleEditor extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".openModuleEditor"; + public final static String ID = DistPlugin.PLUGIN_ID + ".openModuleEditor"; public final static String DEFAULT_LABEL = "Open relevant editor"; // use local node repo and repository factory to retrieve and log to diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java index 1a93fb0bb..2221f215b 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenWorkspaceEditor.java @@ -24,8 +24,8 @@ import org.argeo.jcr.ArgeoNames; 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.editors.DistWorkspaceEditor; import org.argeo.slc.client.ui.dist.editors.DistWkspEditorInput; +import org.argeo.slc.client.ui.dist.editors.DistWorkspaceEditor; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -37,22 +37,23 @@ import org.eclipse.ui.handlers.HandlerUtil; * Open a distribution workspace editor for a given workspace in a repository */ public class OpenWorkspaceEditor extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".openWorkspaceEditor"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".openWorkspaceEditor"; public final static String DEFAULT_LABEL = "Open editor"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/distribution_perspective.gif"); - // use local node repo and repository factory to retrieve and log to + // Use local node repo and repository factory to retrieve and log to // relevant repository public final static String PARAM_REPO_NODE_PATH = "param.repoNodePath"; - // use URI and repository factory to retrieve and ANONYMOUSLY log in + // Use URI and repository factory to retrieve and ANONYMOUSLY log in // relevant repository public final static String PARAM_REPO_URI = "param.repoUri"; public final static String PARAM_WORKSPACE_NAME = "param.workspaceName"; /* DEPENDENCY INJECTION */ private Repository localRepository; - + public Object execute(ExecutionEvent event) throws ExecutionException { String repoNodePath = event.getParameter(PARAM_REPO_NODE_PATH); String repoUri = event.getParameter(PARAM_REPO_URI); @@ -69,8 +70,7 @@ public class OpenWorkspaceEditor extends AbstractHandler { } } catch (RepositoryException e) { throw new SlcException("Unexpected error while " - + "getting repoNode at path " - + repoNodePath, e); + + "getting repoNode at path " + repoNodePath, e); } finally { JcrUtils.logoutQuietly(defaultSession); } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java index 76b0586e9..8eb371c34 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java @@ -35,13 +35,11 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; -/** - * Publish the current workspace by giving READ_ONLY rights to anonymous. - */ +/** Publish the current workspace by giving READ_ONLY rights to anonymous */ public class PublishWorkspace extends AbstractHandler { // private static final Log log = LogFactory.getLog(PublishWorkspace.class); - - public final static String ID = DistPlugin.ID + ".publishWorkspace"; + + public final static String ID = DistPlugin.PLUGIN_ID + ".publishWorkspace"; public final static String DEFAULT_LABEL = "Make Public"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/publish.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java index b63481c9d..0b4c06226 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshArtifactBrowser.java @@ -21,9 +21,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Force the refresh of the artifact browser view - */ +/** Force the refresh of the artifact browser view */ public class RefreshArtifactBrowser extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java index b7d3ed680..82028992b 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java @@ -24,11 +24,10 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; -/** - * Force refresh of the Distributions View - */ +/** Force refresh of the Distributions View */ public class RefreshDistributionsView extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".refreshDistributionsView"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".refreshDistributionsView"; public final static String DEFAULT_LABEL = "Refresh the distribution view"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/refresh.png"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java index c044c59d8..4203b94c7 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java @@ -32,13 +32,12 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Register a remote repository by creating a node in the current - */ +/** Register a remote repository by creating a node in the current local node. */ public class RegisterRepository extends AbstractHandler implements ArgeoNames, SlcNames { - public final static String ID = DistPlugin.ID + ".registerRepository"; + public final static String ID = DistPlugin.PLUGIN_ID + + ".registerRepository"; public final static String DEFAULT_LABEL = "Register a repository..."; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/addRepo.gif"); @@ -70,4 +69,4 @@ public class RegisterRepository extends AbstractHandler implements ArgeoNames, public void setNodeRepository(Repository nodeRepository) { this.nodeRepository = nodeRepository; } -} +} \ No newline at end of file diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java index 8e0cc6396..66e4414d4 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java @@ -53,7 +53,7 @@ import org.eclipse.aether.artifact.Artifact; public class RunInOsgi extends AbstractHandler implements SlcNames { private final static Log log = LogFactory.getLog(RunInOsgi.class); - public final static String ID = DistPlugin.ID + ".runInOsgi"; + public final static String ID = DistPlugin.PLUGIN_ID + ".runInOsgi"; public final static String DEFAULT_LABEL = "Run in OSGi"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/runInOsgi.gif"); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java index cfdfc5fd1..61504de8f 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/ShowSizeColumn.java @@ -26,11 +26,9 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.handlers.HandlerUtil; -/** - * Change visible state of the ArtifactBrower size column - */ +/** Change visible state of the ArtifactBrower size column */ public class ShowSizeColumn extends AbstractHandler { - public final static String ID = DistPlugin.ID + ".showSizeColumn"; + public final static String ID = DistPlugin.PLUGIN_ID + ".showSizeColumn"; public Object execute(ExecutionEvent event) throws ExecutionException { ArtifactsBrowser view = (ArtifactsBrowser) HandlerUtil @@ -41,10 +39,10 @@ public class ShowSizeColumn extends AbstractHandler { .getService(ICommandService.class); Command command = service.getCommand(ID); State state = command.getState(ID + ".toggleState"); - + boolean wasVisible = (Boolean) state.getValue(); view.setSizeVisible(!wasVisible); state.setValue(!wasVisible); return null; } -} +} \ No newline at end of file diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java index 90d7ca7e4..4f386b263 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java @@ -33,19 +33,19 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; /** - * Unregisters a remote repository by deleting the corresponding RepoNode from + * Un-register a remote repository by deleting the corresponding RepoNode from * the node Repository. It does not affect the repository instance */ public class UnregisterRemoteRepo extends AbstractHandler { // private static final Log log = LogFactory // .getLog(UnregisterRemoteRepo.class); - public final static String ID = DistPlugin.ID + ".unregisterRemoteRepo"; + public final static String ID = DistPlugin.PLUGIN_ID + ".unregisterRemoteRepo"; public final static String DEFAULT_LABEL = "Unregister"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin .getImageDescriptor("icons/removeItem.gif"); - public final static String PARAM_REPO_PATH = DistPlugin.ID + public final static String PARAM_REPO_PATH = DistPlugin.PLUGIN_ID + ".repoNodePath"; // DEPENCY INJECTION diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java index 74bd34d85..465faf4bc 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/AnonymousDistTreeContentProvider.java @@ -8,12 +8,12 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; /** - * Enables browsing in local public slc distribution repositories. For the time + * Enable browsing in local public slc distribution repositories. For the time * being, it supports only one repository at a time. Repository factory must be * injected */ - public class AnonymousDistTreeContentProvider implements ITreeContentProvider { + private static final long serialVersionUID = -4149180221319229128L; // List repositories = new ArrayList(); private RepoElem publicRepo; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java index c689df8c9..7e3a1db1c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java @@ -31,8 +31,10 @@ import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.graphics.Image; +/** Retrieve artifact information to be displayed in an artifact tree or table */ public class ArtifactLabelProvider extends ColumnLabelProvider implements DistConstants, SlcTypes { + private static final long serialVersionUID = 8672622174076959016L; // To be able to change column order easily public static final int COLUMN_TREE = 0; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java index ef3fef21f..9591ac0c2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java @@ -29,8 +29,10 @@ import org.argeo.slc.jcr.SlcTypes; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +/** Enable specific browsing of an artifact tree */ public class ArtifactsTreeContentProvider implements ITreeContentProvider, SlcTypes { + private static final long serialVersionUID = -8097817288192073987L; // Utils private boolean sortChildren = true; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java index 96a088125..c788ebc7b 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeComparator.java @@ -12,6 +12,7 @@ import org.eclipse.jface.viewers.ViewerComparator; /** Specific comparator to enhance Distribution tree browsers */ public class DistTreeComparator extends ViewerComparator { + private static final long serialVersionUID = -7386716562202568704L; private VersionComparator vc = new VersionComparator(); private NameVersionComparator nvc = new NameVersionComparator(); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java index b2c816be1..aab7f06f1 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java @@ -30,13 +30,16 @@ import org.eclipse.jface.viewers.Viewer; * repository factory must be injected */ public class DistTreeContentProvider implements ITreeContentProvider { - private Session nodeSession; - List repositories = new ArrayList(); + private static final long serialVersionUID = -7640840211717811421L; /* DEPENDENCY INJECTION */ private RepositoryFactory repositoryFactory; private Keyring keyring; + // Context + private Session nodeSession; + List repositories = new ArrayList(); + public Object[] getElements(Object input) { Repository nodeRepository = (Repository) input; try { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java index 4ce4b77a9..c58625ad5 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java @@ -1,6 +1,6 @@ package org.argeo.slc.client.ui.dist.controllers; -import org.argeo.eclipse.ui.jcr.JcrImages; +import org.argeo.eclipse.ui.workbench.jcr.JcrImages; import org.argeo.slc.client.ui.dist.DistImages; import org.argeo.slc.client.ui.dist.model.DistParentElem; import org.argeo.slc.client.ui.dist.model.ModularDistVersionBaseElem; @@ -11,10 +11,10 @@ import org.argeo.slc.client.ui.dist.model.WorkspaceElem; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.swt.graphics.Image; -/** - * Manages icons and labels for the Distributions tree browser - */ +/** Manage icons and labels for the Distributions tree browser */ public class DistTreeLabelProvider extends ColumnLabelProvider { + private static final long serialVersionUID = -7889294105284404373L; + @Override public String getText(Object element) { if (element instanceof DistParentElem) diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java index fc2509270..5612fa97f 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java @@ -31,13 +31,11 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; -/** - * Base editor to manage an artifact in a multiple repository environment - */ +/** Artifact editor in a multiple repository environment */ public class ArtifactVersionEditor extends FormEditor implements SlcNames { - // private final static Log log = - // LogFactory.getLog(ArtifactEditor.class); - public final static String ID = DistPlugin.ID + ".artifactVersionEditor"; + private static final long serialVersionUID = 1109872666962757000L; + + public final static String ID = DistPlugin.PLUGIN_ID + ".artifactVersionEditor"; /* DEPENDENCY INJECTION */ private RepoService repoService; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java index 4752cc9a2..60d17c5a8 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java @@ -97,7 +97,6 @@ public class BundleDependencyPage extends FormPage implements SlcNames { part = toolkit.createComposite(body); createReqBundleSection(part); gd = new GridData(SWT.FILL, SWT.FILL, true, true); - // /gd.heightHint = 200; part.setLayoutData(gd); managedForm.reflow(true); @@ -148,6 +147,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(400); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 1376400790495130862L; + @Override public String getText(Object element) { if (element instanceof Node) @@ -173,6 +174,7 @@ public class BundleDependencyPage extends FormPage implements SlcNames { }); viewer.setContentProvider(new ITreeContentProvider() { + private static final long serialVersionUID = 1898086304761992568L; public void dispose() { } @@ -273,6 +275,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(350); col.getColumn().setText("Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -7836022945221936898L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_NAME); @@ -289,6 +293,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(100); col.getColumn().setText("Version"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -8277731617775091641L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_VERSION); @@ -300,6 +306,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(100); col.getColumn().setText("Optional"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -2388533169594840688L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_OPTIONAL); @@ -336,6 +344,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(300); col.getColumn().setText("Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 4423640365819800247L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_SYMBOLIC_NAME); @@ -352,6 +362,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(140); col.getColumn().setText("Version"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 1898477425996646270L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_BUNDLE_VERSION); @@ -363,6 +375,8 @@ public class BundleDependencyPage extends FormPage implements SlcNames { col.getColumn().setWidth(100); col.getColumn().setText("Optional"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -7029999152302445581L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_OPTIONAL); @@ -421,6 +435,7 @@ public class BundleDependencyPage extends FormPage implements SlcNames { } private class TableContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = 4133284637336320455L; private String nodeType; private String orderBy; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java index e43668aef..512e67e55 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java @@ -16,8 +16,6 @@ package org.argeo.slc.client.ui.dist.editors; import java.net.URL; -import java.util.HashMap; -import java.util.Map; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -25,13 +23,12 @@ import javax.jcr.RepositoryException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.slc.SlcException; import org.argeo.slc.build.License; import org.argeo.slc.client.ui.dist.DistConstants; -import org.argeo.slc.client.ui.dist.utils.AbstractHyperlinkListener; -import org.argeo.slc.client.ui.specific.OpenJcrFile; -import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId; +import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter; +//import org.argeo.slc.client.ui.specific.OpenJcrFile; +//import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; @@ -55,9 +52,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; -/** - * Show the details for a given bundle. - */ +/** Show details for a given bundle. */ public class BundleDetailPage extends FormPage implements SlcNames { private final static Log log = LogFactory.getLog(BundleDetailPage.class); @@ -192,7 +187,8 @@ public class BundleDetailPage extends FormPage implements SlcNames { String licenceLinkVal = bundle.getProperty(jcrPropName).getString(); // FIXME Hack until license generation is done cleanly - // Problem is with description that contains a "," like "Apache License, Version 2" + // Problem is with description that contains a "," like + // "Apache License, Version 2" String[] licenceVals; if (licenceLinkVal.contains("description=")) licenceVals = new String[] { licenceLinkVal }; @@ -208,7 +204,7 @@ public class BundleDetailPage extends FormPage implements SlcNames { Hyperlink link = tk.createHyperlink(body, currLicense.getName(), SWT.NONE); - link.addHyperlinkListener(new AbstractHyperlinkListener() { + link.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { try { @@ -458,7 +454,7 @@ public class BundleDetailPage extends FormPage implements SlcNames { } } - private class OpenFileLinkListener extends AbstractHyperlinkListener { + private class OpenFileLinkListener extends HyperlinkAdapter { final private String path; public OpenFileLinkListener(String path) { @@ -467,23 +463,27 @@ public class BundleDetailPage extends FormPage implements SlcNames { @Override public void linkActivated(HyperlinkEvent e) { - try { - ModuleEditorInput editorInput = (ModuleEditorInput) getEditorInput(); - Map params = new HashMap(); - params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, - editorInput.getRepoNodePath()); - params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); - params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, - editorInput.getWorkspaceName()); - params.put(OpenJcrFile.PARAM_FILE_PATH, path); - - String cmdId = (new OpenJcrFileCmdId()).getCmdId(); - if (log.isTraceEnabled()) - log.debug("Retrieved openFile Cmd ID: " + cmdId); - CommandUtils.callCommand(cmdId, params); - } catch (Exception ex) { - throw new SlcException("error opening browser", ex); //$NON-NLS-1$ - } + log.warn("File download must be implemented. Cannot provide access to " + + path); + + // try { + // ModuleEditorInput editorInput = (ModuleEditorInput) + // getEditorInput(); + // Map params = new HashMap(); + // params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, + // editorInput.getRepoNodePath()); + // params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); + // params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, + // editorInput.getWorkspaceName()); + // params.put(OpenJcrFile.PARAM_FILE_PATH, path); + // + // String cmdId = (new OpenJcrFileCmdId()).getCmdId(); + // if (log.isTraceEnabled()) + // log.debug("Retrieved openFile Cmd ID: " + cmdId); + // CommandUtils.callCommand(cmdId, params); + // } catch (Exception ex) { + // throw new SlcException("error opening browser", ex); //$NON-NLS-1$ + // } } } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java index 7ddd0acf2..2853912db 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java @@ -47,10 +47,7 @@ import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.widgets.ScrolledForm; -/** - * Lists all properties of current bundle as a tree - */ - +/** List all properties of current bundle as a tree */ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes { // private final static Log log = // LogFactory.getLog(ArtifactDetailsPage.class); @@ -147,6 +144,7 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes { // providers private class TreeLabelProvider extends ColumnLabelProvider implements SlcTypes, SlcNames { + private static final long serialVersionUID = -6385445983392621937L; public void update(ViewerCell cell) { try { @@ -207,6 +205,8 @@ public class BundleRawPage extends FormPage implements SlcNames, SlcTypes { } private class TreeContentProvider implements ITreeContentProvider { + private static final long serialVersionUID = -4315686158836938052L; + public Object[] getElements(Object parent) { List elements = new ArrayList(); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java index 157403875..e933a8f4a 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java @@ -108,6 +108,8 @@ public class DistWkspBrowserPage extends FormPage implements DistConstants, artifactTreeViewer = new TreeViewer(tree); artifactTreeViewer.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 2648269889876058461L; + @Override public String getText(Object element) { Node node = (Node) element; @@ -146,6 +148,7 @@ public class DistWkspBrowserPage extends FormPage implements DistConstants, }); artifactTreeViewer.setContentProvider(new ITreeContentProvider() { + private static final long serialVersionUID = -2381555428857519326L; public void dispose() { } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java index 3abd6ccac..f23181367 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java @@ -21,9 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; -/** - * An editor input pointing to a distribution workspace - */ +/** An editor input pointing to a distribution workspace */ public class DistWkspEditorInput implements IEditorInput, SlcNames { // Injected diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java index 150de53c5..4270e93f0 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java @@ -44,7 +44,7 @@ import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistConstants; import org.argeo.slc.client.ui.dist.DistPlugin; -import org.argeo.slc.client.ui.dist.PrivilegedJob; +import org.argeo.security.ui.PrivilegedJob; import org.argeo.slc.client.ui.dist.commands.DeleteArtifacts; import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor; import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator; @@ -146,7 +146,7 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { } }); } catch (Exception e) { - return new Status(IStatus.ERROR, DistPlugin.ID, + return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID, "Cannot get bundle list", e); } return Status.OK_STATUS; @@ -320,6 +320,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { gd.grabExcessHorizontalSpace = true; artifactTxt.setLayoutData(gd); artifactTxt.addModifyListener(new ModifyListener() { + private static final long serialVersionUID = -2422321852703208573L; + public void modifyText(ModifyEvent event) { if ("".equals(artifactTxt.getText().trim())) asynchronousRefresh(); @@ -355,6 +357,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { col.getColumn().setWidth(300); col.getColumn().setText("Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -760226161605987538L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, @@ -370,6 +374,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { col.getColumn().setWidth(300); col.getColumn().setText("Symbolic Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 4431447542158431355L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_SYMBOLIC_NAME); @@ -384,6 +390,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { col.getColumn().setWidth(130); col.getColumn().setText("Version"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -5616215547236158504L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_BUNDLE_VERSION); @@ -409,6 +417,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { MenuManager menuManager = new MenuManager(); Menu menu = menuManager.createContextMenu(viewer.getTable()); menuManager.addMenuListener(new IMenuListener() { + private static final long serialVersionUID = -3886983092940055195L; + public void menuAboutToShow(IMenuManager manager) { contextMenuAboutToShow(manager); } @@ -443,6 +453,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { private SelectionAdapter getSelectionAdapter(final int index) { SelectionAdapter selectionAdapter = new SelectionAdapter() { + private static final long serialVersionUID = 5515884441510882460L; + @Override public void widgetSelected(SelectionEvent e) { Table table = viewer.getTable(); @@ -464,6 +476,8 @@ public class DistWkspSearchPage extends FormPage implements SlcNames { /* LOCAL CLASSES */ private class DistributionsContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = -635451814876234147L; + // we keep a cache of the Nodes in the content provider to be able to // manage long request private List nodes; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java index 0a34a62da..de233bcf0 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java @@ -33,13 +33,13 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; -/** - * Browse, analyse and modify a workspace containing software distributions - */ +/** Browse, analyse and modify a workspace containing software distributions */ public class DistWorkspaceEditor extends FormEditor implements SlcNames { + private static final long serialVersionUID = 5373719580281643675L; + // private final static Log log = // LogFactory.getLog(DistributionEditor.class); - public final static String ID = DistPlugin.ID + ".distWorkspaceEditor"; + public final static String ID = DistPlugin.PLUGIN_ID + ".distWorkspaceEditor"; /* DEPENDENCY INJECTION */ private RepositoryFactory repositoryFactory; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java index 4326da479..1c29abc4a 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java @@ -33,9 +33,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.Section; -/** - * Show the details for a given bundle. - */ +/** Show the details for a given bundle. */ public class ModularDistVersionDetailPage extends FormPage implements SlcNames { final static String PAGE_ID = "ModularDistVersionDetailPage"; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java index 6f25f2a84..5a298622c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionEditor.java @@ -28,9 +28,11 @@ import org.eclipse.ui.PartInitException; * repository */ public class ModularDistVersionEditor extends ArtifactVersionEditor { + private static final long serialVersionUID = -2223542780164288554L; + // private final static Log log = // LogFactory.getLog(ModularDistVersionEditor.class); - public final static String ID = DistPlugin.ID + ".modularDistVersionEditor"; + public final static String ID = DistPlugin.PLUGIN_ID + ".modularDistVersionEditor"; @Override public void init(IEditorSite site, IEditorInput input) diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java index 00a585252..2329bd49e 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java @@ -35,6 +35,8 @@ import javax.jcr.query.qom.QueryObjectModelFactory; import javax.jcr.query.qom.Selector; import javax.jcr.query.qom.StaticOperand; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.workbench.CommandUtils; import org.argeo.jcr.JcrUtils; @@ -42,15 +44,17 @@ import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistConstants; import org.argeo.slc.client.ui.dist.DistImages; import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor; -import org.argeo.slc.client.ui.dist.utils.AbstractHyperlinkListener; +import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter; import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator; -import org.argeo.slc.client.ui.specific.OpenJcrFile; -import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId; +//import org.argeo.slc.client.ui.specific.OpenJcrFile; +//import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.RepoConstants; import org.argeo.slc.repo.RepoUtils; import org.argeo.slc.repo.maven.MavenConventionsUtils; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -83,8 +87,6 @@ import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; /** * Show all modules contained in a given modular distribution as filter-able @@ -93,6 +95,9 @@ import org.eclipse.aether.artifact.DefaultArtifact; public class ModularDistVersionOverviewPage extends FormPage implements SlcNames { + private final static Log log = LogFactory + .getLog(ModularDistVersionOverviewPage.class); + final static String PAGE_ID = "ModularDistVersionOverviewPage"; // Business Objects @@ -209,7 +214,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements final Hyperlink link = tk.createHyperlink(parent, modularDistribution.getProperty(jcrPropName).getString(), SWT.NONE); - link.addHyperlinkListener(new AbstractHyperlinkListener() { + link.addHyperlinkListener(new HyperlinkAdapter() { @Override public void linkActivated(HyperlinkEvent e) { try { @@ -263,7 +268,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements } } - private class OpenFileLinkListener extends AbstractHyperlinkListener { + private class OpenFileLinkListener extends HyperlinkAdapter { final private String path; public OpenFileLinkListener(String path) { @@ -272,21 +277,25 @@ public class ModularDistVersionOverviewPage extends FormPage implements @Override public void linkActivated(HyperlinkEvent e) { - try { - ModuleEditorInput editorInput = (ModuleEditorInput) getEditorInput(); - Map params = new HashMap(); - params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, - editorInput.getRepoNodePath()); - params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); - params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, - editorInput.getWorkspaceName()); - params.put(OpenJcrFile.PARAM_FILE_PATH, path); - - String cmdId = (new OpenJcrFileCmdId()).getCmdId(); - CommandUtils.callCommand(cmdId, params); - } catch (Exception ex) { - throw new SlcException("error opening browser", ex); //$NON-NLS-1$ - } + log.warn("File download must be implemented. Cannot provide access to " + + path); + + // try { + // ModuleEditorInput editorInput = (ModuleEditorInput) + // getEditorInput(); + // Map params = new HashMap(); + // params.put(OpenJcrFile.PARAM_REPO_NODE_PATH, + // editorInput.getRepoNodePath()); + // params.put(OpenJcrFile.PARAM_REPO_URI, editorInput.getUri()); + // params.put(OpenJcrFile.PARAM_WORKSPACE_NAME, + // editorInput.getWorkspaceName()); + // params.put(OpenJcrFile.PARAM_FILE_PATH, path); + // + // String cmdId = (new OpenJcrFileCmdId()).getCmdId(); + // CommandUtils.callCommand(cmdId, params); + // } catch (Exception ex) { + // throw new SlcException("error opening browser", ex); //$NON-NLS-1$ + // } } } @@ -326,6 +335,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements filterTxt.setMessage(FILTER_HELP_MSG); filterTxt.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); filterTxt.addModifyListener(new ModifyListener() { + private static final long serialVersionUID = -276152321986407726L; + public void modifyText(ModifyEvent event) { refresh(); } @@ -334,6 +345,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements Button resetBtn = tk.createButton(parent, null, SWT.PUSH); resetBtn.setImage(DistImages.IMG_CLEAR); resetBtn.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -3549303742841670919L; + public void widgetSelected(SelectionEvent e) { filterTxt.setText(""); filterTxt.setMessage(FILTER_HELP_MSG); @@ -356,6 +369,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(220); col.getColumn().setText("Category"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 5875398301711336875L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SlcNames.SLC_CATEGORY); @@ -370,6 +385,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(220); col.getColumn().setText("Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 3880240676256465072L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_NAME); @@ -384,6 +401,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(160); col.getColumn().setText("Version"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -4706438113850571784L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_VERSION); @@ -398,6 +417,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements col.getColumn().setWidth(160); col.getColumn().setText("Exists in workspace"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 8190063212920414300L; + @Override public String getText(Object element) { return getRealizedModule((Node) element) != null ? "Yes" : "No"; @@ -546,6 +567,8 @@ public class ModularDistVersionOverviewPage extends FormPage implements private SelectionAdapter getSelectionAdapter(final int index) { SelectionAdapter selectionAdapter = new SelectionAdapter() { + private static final long serialVersionUID = 1260801795934660840L; + @Override public void widgetSelected(SelectionEvent e) { Table table = viewer.getTable(); @@ -567,6 +590,7 @@ public class ModularDistVersionOverviewPage extends FormPage implements /* LOCAL CLASSES */ private class DistributionsContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = 8385338190908823791L; // we keep a cache of the Nodes in the content provider to be able to // manage long request private List nodes; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java index 8c297259e..bcb0b2a22 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java @@ -22,9 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; -/** - * An editor input for a JCR node object in a multi-repository environment. - */ +/** Editor input for a JCR node object in a multi-repository environment */ public class ModuleEditorInput implements IEditorInput, SlcNames { // Define relevant workspace on a given repository diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java index 37241b72a..9259971de 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java @@ -87,6 +87,8 @@ public class RunInOsgiPage extends FormPage implements SlcNames { launchBtn.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, true, false)); launchBtn.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -1633658484882130602L; + @Override public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java index ce46e5ebd..d7268bf1d 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java @@ -222,6 +222,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { filterTxt.setMessage(FILTER_HELP_MSG); filterTxt.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); filterTxt.addModifyListener(new ModifyListener() { + private static final long serialVersionUID = 8727389523069041623L; + public void modifyText(ModifyEvent event) { refresh(); } @@ -230,6 +232,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { Button resetBtn = tk.createButton(parent, null, SWT.PUSH); resetBtn.setImage(DistImages.IMG_REPO_READONLY); resetBtn.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -6523538838444581321L; + public void widgetSelected(SelectionEvent e) { resetFilter(); } @@ -271,6 +275,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { col.getColumn().setWidth(220); col.getColumn().setText("Group Name"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 6186787928630825293L; + @Override public String getText(Object element) { return JcrUtils.get((Node) element, SLC_GROUP_BASE_ID); @@ -285,6 +291,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { col.getColumn().setWidth(80); col.getColumn().setText("Has binaries"); col.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -2017377132642062464L; + @Override public String getText(Object element) { try { @@ -318,6 +326,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { MenuManager menuManager = new MenuManager(); Menu menu = menuManager.createContextMenu(viewer.getTable()); menuManager.addMenuListener(new IMenuListener() { + private static final long serialVersionUID = 739004528695501335L; + public void menuAboutToShow(IMenuManager manager) { contextMenuAboutToShow(manager); } @@ -358,7 +368,7 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { params.put(OpenGenerateBinariesWizard.PARAM_WORKSPACE_NAME, input.getWorkspaceName()); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, OpenGenerateBinariesWizard.ID, OpenGenerateBinariesWizard.DEFAULT_LABEL, OpenGenerateBinariesWizard.DEFAULT_ICON, true, params); @@ -388,6 +398,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { private SelectionAdapter getSelectionAdapter(final int index) { SelectionAdapter selectionAdapter = new SelectionAdapter() { + private static final long serialVersionUID = -1723894288128081757L; + @Override public void widgetSelected(SelectionEvent e) { Table table = viewer.getTable(); @@ -409,6 +421,8 @@ public class WkspCategoryBaseListPage extends FormPage implements SlcNames { /* LOCAL CLASSES */ private class DistributionsContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = -5939763615620837492L; + // we keep a cache of the Nodes in the content provider to be able to // manage long request private List nodes; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java index 6505ddee0..d6f60c640 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java @@ -110,6 +110,8 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes, return null; SelectionAdapter selectionAdapter = new SelectionAdapter() { + private static final long serialVersionUID = 5239138629878556374L; + @Override public void widgetSelected(SelectionEvent e) { @@ -144,6 +146,8 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes, if (test) { return new ColumnLabelProvider() { + private static final long serialVersionUID = 7996387354459551737L; + public String getText(Object element) { return null; } @@ -154,6 +158,8 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes, }; } else return new ColumnLabelProvider() { + private static final long serialVersionUID = 6746632988975282759L; + public String getText(Object element) { Row row = (Row) element; try { @@ -171,6 +177,7 @@ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes, /** Implements comparator for various types of Artifact Table row */ private class CurrentTableComparator extends GenericTableComparator { + private static final long serialVersionUID = -4737460932326339442L; public CurrentTableComparator(int colIndex, int direction) { super(colIndex, direction); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java index 001f577db..de22ac302 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java @@ -33,6 +33,8 @@ import org.eclipse.jface.viewers.Viewer; /** Add ability to order by name version and version */ public class DistNodeViewerComparator extends GenericTableComparator { + private static final long serialVersionUID = -5966120108210992211L; + private final static Log log = LogFactory .getLog(DistNodeViewerComparator.class); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/HyperlinkAdapter.java similarity index 91% rename from org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java rename to org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/HyperlinkAdapter.java index 3c95ac491..1dd2be19a 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/AbstractHyperlinkListener.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/HyperlinkAdapter.java @@ -29,7 +29,8 @@ package org.argeo.slc.client.ui.dist.utils; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.events.IHyperlinkListener; -public abstract class AbstractHyperlinkListener implements IHyperlinkListener { +/** Convenience class to reduce the number of methods to implement */ +public abstract class HyperlinkAdapter implements IHyperlinkListener { public void linkEntered(HyperlinkEvent e) { } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java index 5cf57a40d..0c4903f9c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/NameVersionComparator.java @@ -20,7 +20,8 @@ import org.eclipse.jface.viewers.ViewerComparator; */ public class NameVersionComparator extends ViewerComparator { - + private static final long serialVersionUID = 8290130681918221197L; + private VersionComparator vc = new VersionComparator(); @Override diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java index 4492b0669..34aff22b9 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/VersionComparator.java @@ -17,6 +17,7 @@ import org.eclipse.jface.viewers.ViewerComparator; */ public class VersionComparator extends ViewerComparator { + private static final long serialVersionUID = 3760077835650538982L; @Override public int compare(Viewer viewer, Object e1, Object e2) { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java index 18f77f382..8faa891c0 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ViewerUtils.java @@ -8,9 +8,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TreeColumn; -/** - * Centralizes useful methods to manage table to display nodes list. - */ +/** Useful methods to manage table to display nodes list. */ public class ViewerUtils { /** diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java index 45c0d0f2e..65879a672 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java @@ -190,6 +190,7 @@ public abstract class AbstractQueryArtifactsView extends ViewPart implements // Providers protected class ViewContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = 5286293288979552056L; public void inputChanged(Viewer arg0, Object arg1, Object arg2) { } @@ -205,6 +206,8 @@ public abstract class AbstractQueryArtifactsView extends ViewPart implements protected class ViewLabelProvider extends LabelProvider implements ITableLabelProvider { + private static final long serialVersionUID = -2407263563879116348L; + public String getColumnText(Object obj, int index) { if (!(obj instanceof String[])) return "Object is not properly formatted "; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java index 21e8f37b0..03cf395ca 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java @@ -38,7 +38,7 @@ public class AnonymousDistributionsView extends ViewPart implements SlcNames, ArgeoNames { // private final static Log log = LogFactory // .getLog(AnonymousDistributionsView.class); - public final static String ID = DistPlugin.ID + public final static String ID = DistPlugin.PLUGIN_ID + ".anonymousDistributionsView"; /* DEPENDENCY INJECTION */ diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java index 1f1104bb9..9ae713e85 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java @@ -56,7 +56,7 @@ import org.eclipse.ui.part.ViewPart; public class ArtifactsBrowser extends ViewPart implements DistConstants, RepoConstants { // private final static Log log = LogFactory.getLog(ArtifactsBrowser.class); - public final static String ID = DistPlugin.ID + ".artifactsBrowser"; + public final static String ID = DistPlugin.PLUGIN_ID + ".artifactsBrowser"; /* DEPENDENCY INJECTION */ private Session jcrSession; @@ -177,6 +177,7 @@ public class ArtifactsBrowser extends ViewPart implements DistConstants, private class ArtifactLabelProvider extends ColumnLabelProvider implements DistConstants, SlcTypes { + private static final long serialVersionUID = 7516705499556141806L; // Utils protected DateFormat timeFormatter = new SimpleDateFormat( diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java index ee249b207..908ce05ad 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java @@ -75,7 +75,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames // private final static Log log = // LogFactory.getLog(DistributionsView.class); - public final static String ID = DistPlugin.ID + ".distributionsView"; + public final static String ID = DistPlugin.PLUGIN_ID + ".distributionsView"; /* DEPENDENCY INJECTION */ private Repository nodeRepository; @@ -113,6 +113,8 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames MenuManager menuManager = new MenuManager(); Menu menu = menuManager.createContextMenu(viewer.getTree()); menuManager.addMenuListener(new IMenuListener() { + private static final long serialVersionUID = -1454108001335038652L; + public void menuAboutToShow(IMenuManager manager) { contextMenuAboutToShow(manager); } @@ -205,7 +207,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames targetRepoPath); params.put(CreateWorkspace.PARAM_WORKSPACE_PREFIX, workspacePrefix); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, CreateWorkspace.ID, CreateWorkspace.DEFAULT_LABEL, CreateWorkspace.DEFAULT_ICON, (isRepoElem || isDistribGroupElem) && singleElement @@ -215,7 +217,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params = new HashMap(); params.put(CreateLocalJavaWorkspace.PARAM_WORKSPACE_PREFIX, workspacePrefix); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, CreateLocalJavaWorkspace.ID, CreateLocalJavaWorkspace.DEFAULT_LABEL, CreateLocalJavaWorkspace.DEFAULT_ICON, @@ -232,7 +234,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames // Unregister a remote repository params = new HashMap(); params.put(UnregisterRemoteRepo.PARAM_REPO_PATH, targetRepoPath); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, UnregisterRemoteRepo.ID, UnregisterRemoteRepo.DEFAULT_LABEL, UnregisterRemoteRepo.DEFAULT_ICON, isRepoElem @@ -241,7 +243,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames // Fetch repository params = new HashMap(); params.put(Fetch.PARAM_TARGET_REPO_PATH, targetRepoPath); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, Fetch.ID, Fetch.DEFAULT_LABEL, Fetch.DEFAULT_ICON, isRepoElem && isLocal && singleElement && !isReadOnly, params); @@ -253,7 +255,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(NormalizeWorkspace.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, NormalizeWorkspace.ID, "Normalize...", NormalizeWorkspace.DEFAULT_ICON, isDistribElem && singleElement && !isReadOnly, params); @@ -263,7 +265,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(CopyWorkspace.PARAM_TARGET_REPO_PATH, targetRepoPath); params.put(CopyWorkspace.PARAM_SOURCE_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, CopyWorkspace.ID, CopyWorkspace.DEFAULT_LABEL, CopyWorkspace.DEFAULT_ICON, isDistribElem && singleElement && !isLocal, params); @@ -271,7 +273,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params = new HashMap(); params.put(CopyLocalJavaWorkspace.PARAM_SOURCE_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, CopyLocalJavaWorkspace.ID, CopyLocalJavaWorkspace.DEFAULT_LABEL, CopyLocalJavaWorkspace.DEFAULT_ICON, isDistribElem @@ -282,15 +284,15 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(DeleteWorkspace.PARAM_TARGET_REPO_PATH, targetRepoPath); params.put(DeleteWorkspace.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(menuManager, window, + CommandUtils.refreshParameterizedCommand(menuManager, window, DeleteWorkspace.ID, DeleteWorkspace.DEFAULT_LABEL, DeleteWorkspace.DEFAULT_ICON, isDistribElem && singleElement && !isReadOnly, params); // Advanced submenu - MenuManager submenu = new MenuManager("Advanced", DistPlugin.ID - + ".advancedSubmenu"); - IContributionItem ici = menuManager.find(DistPlugin.ID + MenuManager submenu = new MenuManager("Advanced", + DistPlugin.PLUGIN_ID + ".advancedSubmenu"); + IContributionItem ici = menuManager.find(DistPlugin.PLUGIN_ID + ".advancedSubmenu"); if (ici != null) menuManager.remove(ici); @@ -300,7 +302,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(PublishWorkspace.PARAM_TARGET_REPO_PATH, targetRepoPath); params.put(PublishWorkspace.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(submenu, window, + CommandUtils.refreshParameterizedCommand(submenu, window, PublishWorkspace.ID, PublishWorkspace.DEFAULT_LABEL, PublishWorkspace.DEFAULT_ICON, isDistribElem && singleElement && !isReadOnly, params); @@ -311,7 +313,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames targetRepoPath); params.put(NormalizeDistribution.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(submenu, window, + CommandUtils.refreshParameterizedCommand(submenu, window, NormalizeDistribution.ID, NormalizeDistribution.DEFAULT_LABEL, NormalizeDistribution.DEFAULT_ICON, isDistribElem @@ -321,9 +323,9 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params = new HashMap(); params.put(RunInOsgi.PARAM_MODULE_PATH, modularDistPath); params.put(RunInOsgi.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(submenu, window, + CommandUtils.refreshParameterizedCommand(submenu, window, RunInOsgi.ID, RunInOsgi.DEFAULT_LABEL, - RunInOsgi.DEFAULT_ICON, modularDistPath!=null + RunInOsgi.DEFAULT_ICON, modularDistPath != null && singleElement && isLocal, params); // Open generate binaries @@ -335,7 +337,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames params.put(OpenGenerateBinariesWizard.PARAM_WORKSPACE_NAME, workspaceName); - CommandUtils.refreshParametrizedCommand(submenu, window, + CommandUtils.refreshParameterizedCommand(submenu, window, OpenGenerateBinariesWizard.ID, OpenGenerateBinariesWizard.DEFAULT_LABEL, OpenGenerateBinariesWizard.DEFAULT_ICON, @@ -375,8 +377,8 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames /* * DEPENDENCY INJECTION */ - public void setNodeRepository(Repository repository) { - this.nodeRepository = repository; + public void setNodeRepository(Repository nodeRepository) { + this.nodeRepository = nodeRepository; } public void setTreeContentProvider( diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java index 9a3c29cdd..5ec066cc8 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/HelpView.java @@ -23,13 +23,9 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.ViewPart; -/** - * - * Displays some info about the distribution - * - */ +/** Display some info about the distribution */ public class HelpView extends ViewPart { - public final static String ID = DistPlugin.ID + ".helpView"; + public final static String ID = DistPlugin.PLUGIN_ID + ".helpView"; @Override public void createPartControl(Composite parent) { @@ -39,9 +35,7 @@ public class HelpView extends ViewPart { browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); } - /** - * Force refresh of the whole view - */ + /** Force refresh of the whole view */ public void refresh() { } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java index 5ce13a245..a698e1a61 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java @@ -15,8 +15,6 @@ */ package org.argeo.slc.client.ui.dist.views; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.jcr.SlcNames; @@ -35,8 +33,8 @@ import org.eclipse.swt.widgets.Text; /** Query SLC Repo to get some artifacts given some predefined parameters */ public class QueryArtifactsForm extends AbstractQueryArtifactsView implements SlcNames { - private static final Log log = LogFactory.getLog(QueryArtifactsForm.class); - public static final String ID = DistPlugin.ID + ".queryArtifactsForm"; + // private static final Log log = LogFactory.getLog(QueryArtifactsForm.class); + public static final String ID = DistPlugin.PLUGIN_ID + ".queryArtifactsForm"; // widgets private Button executeBtn; @@ -113,6 +111,8 @@ public class QueryArtifactsForm extends AbstractQueryArtifactsView implements executeBtn.setLayoutData(gd); Listener executeListener = new Listener() { + private static final long serialVersionUID = 7161585477628774129L; + public void handleEvent(Event event) { refreshQuery(); } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java index 101feaf92..b48018cce 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java @@ -15,8 +15,6 @@ */ package org.argeo.slc.client.ui.dist.views; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.jcr.SlcNames; import org.eclipse.swt.SWT; @@ -34,8 +32,9 @@ import org.eclipse.swt.widgets.Text; /** Query SLC Repo to get some artifacts with a JCR SQL 2 request. */ public class QueryArtifactsText extends AbstractQueryArtifactsView implements SlcNames { - private static final Log log = LogFactory.getLog(QueryArtifactsText.class); - public static final String ID = DistPlugin.ID + ".queryArtifactsText"; + // private static final Log log = + // LogFactory.getLog(QueryArtifactsText.class); + public static final String ID = DistPlugin.PLUGIN_ID + ".queryArtifactsText"; // widgets private Button executeBtn; @@ -91,6 +90,8 @@ public class QueryArtifactsText extends AbstractQueryArtifactsView implements queryText.setText(query); Listener executeListener = new Listener() { + private static final long serialVersionUID = -5028331930076117569L; + public void handleEvent(Event event) { refreshQuery(); } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java index e1d741afa..6494c0752 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java @@ -15,8 +15,6 @@ */ package org.argeo.slc.client.ui.dist.views; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.jcr.SlcNames; @@ -36,8 +34,8 @@ import org.eclipse.swt.widgets.Text; /** Query SLC Repo to get some artifacts given some predefined parameters */ public class QueryBundlesForm extends AbstractQueryArtifactsView implements SlcNames, SlcTypes { - private static final Log log = LogFactory.getLog(QueryBundlesForm.class); - public static final String ID = DistPlugin.ID + ".queryBundlesForm"; + // private static final Log log = LogFactory.getLog(QueryBundlesForm.class); + public static final String ID = DistPlugin.PLUGIN_ID + ".queryBundlesForm"; // widgets private Button executeBtn; @@ -108,6 +106,8 @@ public class QueryBundlesForm extends AbstractQueryArtifactsView implements executeBtn.setLayoutData(gd); Listener executeListener = new Listener() { + private static final long serialVersionUID = 6267263421349073712L; + public void handleEvent(Event event) { refreshQuery(); } diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java index 2c4f477fb..1a66e8faf 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/ChooseRightsPage.java @@ -29,6 +29,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; public class ChooseRightsPage extends WizardPage implements ModifyListener { + private static final long serialVersionUID = 3016024222014878781L; // This page widget private Text groupNameTxt; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java index 5d250c09b..81541d79c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java @@ -34,9 +34,9 @@ import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.UserJcrUtils; +import org.argeo.security.ui.PrivilegedJob; 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.repo.RepoConstants; import org.argeo.slc.repo.RepoSync; @@ -191,6 +191,7 @@ public class FetchWizard extends Wizard { // ////// THE PAGES private class ChooseWkspPage extends WizardPage { + private static final long serialVersionUID = 211336700788047638L; private Map sourceReposMap; private Combo chooseSourceRepoCmb; @@ -245,6 +246,8 @@ public class FetchWizard extends Wizard { // Listeners selectAllBtn.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -2071840477444152170L; + public void widgetSelected(SelectionEvent e) { wkspViewer.setAllChecked(selectAllBtn.getSelection()); getContainer().updateButtons(); @@ -261,6 +264,8 @@ public class FetchWizard extends Wizard { // }); chooseSourceRepoCmb.addModifyListener(new ModifyListener() { + private static final long serialVersionUID = 932462568382594523L; + public void modifyText(ModifyEvent e) { String chosenUri = chooseSourceRepoCmb .getItem(chooseSourceRepoCmb.getSelectionIndex()); @@ -323,6 +328,8 @@ public class FetchWizard extends Wizard { TableViewerColumn column = ViewerUtils.createTableViewerColumn( wkspViewer, "Source names", SWT.NONE, 250); column.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 5906079281065061967L; + @Override public String getText(Object element) { return ((WkspObject) element).srcName; @@ -340,11 +347,12 @@ public class FetchWizard extends Wizard { wkspViewer.setContentProvider(new WkspContentProvider()); // A basic comparator - wkspViewer.setComparator(new WkspComparator()); + wkspViewer.setComparator(new ViewerComparator()); } } private class AdvancedFetchPage extends WizardPage { + private static final long serialVersionUID = 1109183561920445169L; private final WkspObject currentWorkspace; @@ -399,7 +407,7 @@ public class FetchWizard extends Wizard { } private class RecapPage extends WizardPage { - + private static final long serialVersionUID = -7064862323304300989L; private TableViewer recapViewer; public RecapPage() { @@ -465,6 +473,8 @@ public class FetchWizard extends Wizard { TableViewerColumn column = ViewerUtils.createTableViewerColumn( recapViewer, "Sources", SWT.NONE, 250); column.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = 3913459002502680377L; + @Override public String getText(Object element) { return ((WkspObject) element).srcName; @@ -474,6 +484,8 @@ public class FetchWizard extends Wizard { column = ViewerUtils.createTableViewerColumn(recapViewer, "targets", SWT.NONE, 250); column.setLabelProvider(new ColumnLabelProvider() { + private static final long serialVersionUID = -517920072332563632L; + @Override public String getText(Object element) { return ((WkspObject) element).targetName; @@ -481,6 +493,7 @@ public class FetchWizard extends Wizard { }); recapViewer.setContentProvider(new IStructuredContentProvider() { + private static final long serialVersionUID = 4926999891003040865L; public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -496,7 +509,7 @@ public class FetchWizard extends Wizard { }); // A basic comparator - recapViewer.setComparator(new WkspComparator()); + recapViewer.setComparator(new ViewerComparator()); setControl(table); } } @@ -520,7 +533,7 @@ public class FetchWizard extends Wizard { repoSync.setMonitor(monitor); repoSync.run(); } catch (Exception e) { - return new Status(IStatus.ERROR, DistPlugin.ID, + return new Status(IStatus.ERROR, DistPlugin.PLUGIN_ID, "Cannot fetch repository", e); } return Status.OK_STATUS; @@ -544,11 +557,12 @@ public class FetchWizard extends Wizard { } } - private class WkspComparator extends ViewerComparator { - - } + // private class WkspComparator extends ViewerComparator { + // + // } private class WkspContentProvider implements IStructuredContentProvider { + private static final long serialVersionUID = -925058051598536307L; // caches current repo private Node currSourceNodeRepo; private Repository currSourceRepo; 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 3d7df051d..24d13282a 100644 --- 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 @@ -30,7 +30,7 @@ import org.argeo.eclipse.ui.EclipseArgeoMonitor; 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.security.ui.PrivilegedJob; import org.argeo.slc.client.ui.dist.utils.ViewerUtils; import org.argeo.slc.jcr.SlcTypes; import org.argeo.slc.repo.RepoConstants; @@ -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 artifacts; @SuppressWarnings("unchecked") @@ -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); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java index 527fe008e..d5a59d284 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java @@ -157,6 +157,7 @@ public class RegisterRepoWizard extends Wizard { } private class DefineModelPage extends WizardPage { + private static final long serialVersionUID = 874386824101995060L; public DefineModelPage() { super("Main"); @@ -179,6 +180,8 @@ public class RegisterRepoWizard extends Wizard { final Button anonymousLogin = createLC(composite, "Log as anonymous", true); anonymousLogin.addSelectionListener(new SelectionListener() { + private static final long serialVersionUID = 4874716406036981039L; + public void widgetSelected(SelectionEvent e) { if (anonymousLogin.getSelection()) { username.setText(DEFAULT_USER_NAME); @@ -213,6 +216,8 @@ public class RegisterRepoWizard extends Wizard { test.setLayoutData(gd); test.addSelectionListener(new SelectionAdapter() { + private static final long serialVersionUID = -4034851916548656293L; + public void widgetSelected(SelectionEvent arg0) { testConnection(); } -- 2.39.2