diff options
| author | Igor Fedorenko | 2014-07-07 20:22:46 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2014-07-08 04:54:43 +0000 |
| commit | 2b6eace30686c8e2961d64a8b508aa231d0c9d61 (patch) | |
| tree | 5df912e647a4d3bb584dcb10a5ce7dd91c8cc8cd /org.eclipse.m2e.core.ui | |
| parent | dc8bf3bfa170f3197426d4e5ea2ce03fc03bc19c (diff) | |
| download | m2e-core-2b6eace30686c8e2961d64a8b508aa231d0c9d61.tar.gz m2e-core-2b6eace30686c8e2961d64a8b508aa231d0c9d61.tar.xz m2e-core-2b6eace30686c8e2961d64a8b508aa231d0c9d61.zip | |
438922 moved cli workspace resolver to a separate git repo
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
Diffstat (limited to 'org.eclipse.m2e.core.ui')
2 files changed, 2 insertions, 8 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties index 424b9bf3..05d56ce4 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties @@ -173,7 +173,7 @@ MavenInstallationWizardPage_btnExternal_text_1=External MavenInstallationWizardPage_btnWorkspace_text=Workspace MavenInstallationWizardPage_lblInstallationType_text=Installation type\: MavenInstallationWizardPage_messageDuplicateInstallationName=The Maven installation name is already in use -MavenInstallationWizardPage_messageHomeDirectoryIsNotMavenInstll=Target is not a Maven Home +MavenInstallationWizardPage_messageHomeDirectoryIsNotMavenInstll=Target is not a supported Maven Home MavenInstallationWizardPage_messageSelectHomeDirectory=Enter the home directory of the Maven Installation MavenInstallationWizardPage_messageSelectInstallatonName=Enter a name for the Maven Installation MavenInstallationWizardPage_selectProjectMessage=Select projects to add\: diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java index be772b5d..f764ac51 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/launch/MavenInstallationWizardPage.java @@ -379,13 +379,7 @@ public class MavenInstallationWizardPage extends WizardPage { if(!selectedDir.isDirectory()) { return false; } - File binDir = new File(dir, "bin"); //$NON-NLS-1$ - File confDir = new File(dir, "conf"); //$NON-NLS-1$ - File libDir = new File(dir, "lib"); //$NON-NLS-1$ - if(!binDir.exists() || !confDir.exists() || !libDir.exists()) { - return false; - } - return true; + return new MavenExternalRuntime(dir).isAvailable(); } protected void updateStatus() { |