From f0fdf0895b15c61b1f582670dac0db6fb2daab58 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 2 Feb 2017 13:58:21 -0800 Subject: [PATCH] Put the "No Org/Space" message constant where it belongs --- .../client/cftarget/CFParamsProviderMessages.java | 10 ++++++---- .../client/cftarget/CfCliParamsProvider.java | 2 +- .../client/cftarget/CfCliProviderMessages.java | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java index 234ef0e0e..986b41b97 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java @@ -15,12 +15,14 @@ package org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget; * */ public interface CFParamsProviderMessages { - - + + String noTargetsFound(); - + String unauthorised(); - + String noNetworkConnection(); + String noOrgSpace(); + } diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java index 92b329917..e48f725bc 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java @@ -67,7 +67,7 @@ public class CfCliParamsProvider implements ClientParamsProvider { String orgName = (String) orgFields.get(NAME); String spaceName = (String) spaceFields.get(NAME); if (!StringUtil.hasText(orgName) || !StringUtil.hasText(spaceName)) { - throw new NoTargetsException("No org/space selected: Use CF CLI to login"); + throw new NoTargetsException(getMessages().noOrgSpace()); } params.add(new CFClientParams(target, null, credentials, orgName, spaceName, sslDisabled)); } diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java index 644eea102..7a8687292 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java @@ -20,6 +20,7 @@ public final class CfCliProviderMessages implements CFParamsProviderMessages { */ public static final String NO_CLI_TARGETS_FOUND_MESSAGE = "No Cloud Foundry targets found: Use cf CLI to login"; public static final String NO_NETWORK_CONNECTION = "No connection to Cloud Foundry: Use cf CLI to login or verify network connection"; + public static final String NO_ORG_SPACE = "No org/space selected: Use CF CLI to login"; @Override public String noTargetsFound() { @@ -35,4 +36,9 @@ public final class CfCliProviderMessages implements CFParamsProviderMessages { public String noNetworkConnection() { return NO_NETWORK_CONNECTION; } + + @Override + public String noOrgSpace() { + return NO_ORG_SPACE; + } } \ No newline at end of file