Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-04-01 15:06:51 -0400
committerMatthew Piggott2011-04-01 15:07:08 -0400
commit0bf2796ebbad582100158a0cfa41cd3d17829f9d (patch)
tree5f6ef36c803334813297a38a09e0152c3bc13e44 /org.eclipse.m2e.scm
parent4f272abae2038764dd66bfce85cb9166035c0b12 (diff)
downloadm2e-core-0bf2796ebbad582100158a0cfa41cd3d17829f9d.tar.gz
m2e-core-0bf2796ebbad582100158a0cfa41cd3d17829f9d.tar.xz
m2e-core-0bf2796ebbad582100158a0cfa41cd3d17829f9d.zip
bug 339932 - Import from SCM Quirks
Diffstat (limited to 'org.eclipse.m2e.scm')
-rw-r--r--org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/messages.properties8
-rw-r--r--org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenCheckoutLocationPage.java9
2 files changed, 9 insertions, 8 deletions
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 c54c4c28..4da8934c 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
@@ -1,6 +1,6 @@
MavenCheckoutLocationPage_btnBrowse=&Browse...
-MavenCheckoutLocationPage_btnCheckout=Check out &All projects
-MavenCheckoutLocationPage_btnHead=Check out &Head Revision
+MavenCheckoutLocationPage_btnCheckout=Checkout &All Projects
+MavenCheckoutLocationPage_btnHead=Checkout &Head Revision
MavenCheckoutLocationPage_btnRevSelect=&Select...
MavenCheckoutLocationPage_description=Select target location and revision
MavenCheckoutLocationPage_error_empty=Select SCM type and URL
@@ -16,12 +16,12 @@ MavenCheckoutWizard_location2=Select project location and working set
MavenCheckoutWizard_title=Checkout as Maven project from SCM
MavenProjectCheckoutJob_confirm_message=No Maven projects found, but there is Eclipse projects configuration avaialble.\nDo you want to select and import Eclipse projects?
MavenProjectCheckoutJob_confirm_title=Project Import
-MavenProjectCheckoutJob_confirm2_message=No Maven projects found. Do you want to create project using new project wizard?\nCheck out location will be copied into clipboard.
+MavenProjectCheckoutJob_confirm2_message=No Maven projects found. Do you want to create project using new project wizard?\nCheckout location will be copied into clipboard.
MavenProjectCheckoutJob_confirm2_title=Project Import
MavenProjectCheckoutJob_job=Importing Maven projects
MavenProjectCheckoutJob_title=Checking out Maven projects
ScmUrl_error=Invalid SCM url {0}
-MavenMaterializePomWizard_btnCheckout=&Check out All projects
+MavenMaterializePomWizard_btnCheckout=&Checkout All Projects
MavenMaterializePomWizard_btnDev=Use &Developer connection
MavenMaterializePomWizard_dialog_message=Select Maven artifacts to import
MavenMaterializePomWizard_dialog_title=Select Maven artifacts
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 24c0aa30..2c0a2c2a 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
@@ -17,13 +17,13 @@ import java.util.Set;
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.ScmTag;
import org.eclipse.m2e.scm.ScmUrl;
+import org.eclipse.m2e.scm.internal.Messages;
+import org.eclipse.m2e.scm.internal.ScmHandlerFactory;
+import org.eclipse.m2e.scm.spi.ScmHandlerUi;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -313,9 +313,10 @@ public class MavenCheckoutLocationPage extends AbstractMavenWizardPage {
if(scmUrlBrowseButton!=null) {
scmUrlBrowseButton.setEnabled(canSelectUrl);
+ scmUrlBrowseButton.setVisible(canSelectUrl);
}
-
revisionBrowseButton.setEnabled(canSelectRevision);
+ revisionBrowseButton.setVisible(canSelectRevision);
boolean isHeadRevision = isHeadRevision();
revisionLabel.setEnabled(!isHeadRevision);

Back to the top