diff options
author | Igor Fedorenko | 2011-02-08 23:18:36 -0500 |
---|---|---|
committer | Igor Fedorenko | 2011-02-08 23:18:36 -0500 |
commit | 681d24add5d563c8e8bdf99748177af91e2f4ba2 (patch) | |
tree | f2e46a12fad4c51f426a5c50f6af363a9c44cfcc /org.eclipse.m2e.scm | |
parent | 7939c6692abd1c7db8c36f197b969894b6291f47 (diff) | |
download | m2e-core-681d24add5d563c8e8bdf99748177af91e2f4ba2.tar.gz m2e-core-681d24add5d563c8e8bdf99748177af91e2f4ba2.tar.xz m2e-core-681d24add5d563c8e8bdf99748177af91e2f4ba2.zip |
clarified names and non-api status of m2e.scm packages
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.scm')
-rw-r--r-- | org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 6 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java | 7 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/Messages.java | 4 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/ScmHandlerFactory.java (renamed from org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerFactory.java) | 5 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties | 2 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java | 4 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandler.java (renamed from org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandler.java) | 4 | ||||
-rw-r--r-- | org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandlerUi.java (renamed from org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerUi.java) | 3 |
8 files changed, 24 insertions, 11 deletions
diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index c3cb45fc..c339e64a 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -6,9 +6,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Export-Package: org.eclipse.m2e.scm, +Export-Package: org.eclipse.m2e.scm;x-internal:=true, + org.eclipse.m2e.scm.internal;x-internal:=true, org.eclipse.m2e.scm.internal.actions;x-internal:=true, - org.eclipse.m2e.scm.internal.wizards;x-internal:=true + org.eclipse.m2e.scm.internal.wizards;x-internal:=true, + org.eclipse.m2e.scm.spi;x-internal:=true Require-Bundle: org.eclipse.core.resources;bundle-version="3.5.2", org.eclipse.equinox.common;bundle-version="3.5.1", org.eclipse.osgi;bundle-version="3.5.2", diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java index e63b87ea..3da9102e 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java @@ -19,10 +19,11 @@ import java.util.List; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osgi.util.NLS; - import org.eclipse.m2e.core.core.MavenConsole; -import org.eclipse.m2e.core.internal.Messages; +import org.eclipse.m2e.scm.internal.Messages; +import org.eclipse.m2e.scm.internal.ScmHandlerFactory; +import org.eclipse.m2e.scm.spi.ScmHandler; +import org.eclipse.osgi.util.NLS; /** diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/Messages.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/Messages.java index 46aa8942..d0ce0eca 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/Messages.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/Messages.java @@ -82,6 +82,10 @@ public class Messages extends NLS { public static String MavenProjectCheckoutJob_job; + public static String MavenCheckoutOperation_task_scanning; + + public static String MavenCheckoutOperation_task_checking; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerFactory.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/ScmHandlerFactory.java index 1bb4fa15..396ecf7f 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerFactory.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/ScmHandlerFactory.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.scm; +package org.eclipse.m2e.scm.internal; import java.util.ArrayList; import java.util.Collections; @@ -24,6 +24,9 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.m2e.core.core.MavenLogger; +import org.eclipse.m2e.scm.ScmUrl; +import org.eclipse.m2e.scm.spi.ScmHandler; +import org.eclipse.m2e.scm.spi.ScmHandlerUi; /** diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties index a8ed03b0..c54c4c28 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties @@ -28,3 +28,5 @@ MavenMaterializePomWizard_dialog_title=Select Maven artifacts MavenMaterializePomWizard_location_message=Select project location and working set MavenMaterializePomWizard_location_title=Select project location MavenMaterializePomWizard_title=Import Maven Projects +MavenCheckoutOperation_task_checking=Checking out {0} {1} +MavenCheckoutOperation_task_scanning=Scanning {0} {1} diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java index 072b7519..24c0aa30 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java @@ -18,10 +18,10 @@ import org.apache.maven.model.Scm; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.m2e.scm.internal.Messages; +import org.eclipse.m2e.scm.internal.ScmHandlerFactory; +import org.eclipse.m2e.scm.spi.ScmHandlerUi; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.wizards.AbstractMavenWizardPage; -import org.eclipse.m2e.scm.ScmHandlerFactory; -import org.eclipse.m2e.scm.ScmHandlerUi; import org.eclipse.m2e.scm.ScmTag; import org.eclipse.m2e.scm.ScmUrl; import org.eclipse.swt.SWT; diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandler.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandler.java index 502386f0..9ca4d0c9 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandler.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandler.java @@ -9,7 +9,7 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.scm; +package org.eclipse.m2e.scm.spi; import java.io.File; import java.io.InputStream; @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.IProgressMonitor; - import org.eclipse.m2e.core.core.MavenLogger; +import org.eclipse.m2e.scm.MavenProjectScmInfo; /** * An SCM handler base class diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerUi.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandlerUi.java index dd2ca1c3..865a0214 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/ScmHandlerUi.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/spi/ScmHandlerUi.java @@ -9,10 +9,11 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -package org.eclipse.m2e.scm; +package org.eclipse.m2e.scm.spi; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; +import org.eclipse.m2e.scm.ScmUrl; import org.eclipse.swt.widgets.Shell; /** |