Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further changes to error messages when no CF proposals are available

Browse Source
This commit is contained in:
nsingh
2017-01-11 22:09:38 -08:00
parent 2cbca3304b
commit d1b9eb1fb8
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
View File

@@ -88,7 +88,7 @@ public class CfCliParamsProvider implements ClientParamsProvider {
*/
@Override
public String noParamsAvailableMessage() {
return "No Cloud Foundry targets. Please use cf CLI to configure and login to a Cloud Foundry target.";
return "No valid Cloud Foundry connection found. Please use cf CLI to configure and login to Cloud Foundry.";
}
private File getConfigJsonFile() throws IOException, InterruptedException {

37
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/AbstractCFHintsProvider.java
View File

@@ -10,6 +10,7 @@
*******************************************************************************/
package org.springframework.ide.vscode.manifest.yaml;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -40,30 +41,28 @@ public abstract class AbstractCFHintsProvider implements Provider<Collection<YVa
@Override
public Collection<YValueHint> get() {
Collection<YValueHint> hints = new ArrayList<>();
List<CFTarget> targets = null;
// TODO: Probably not the most ideal thing to do, but for now show any
// CF errors
// in the CA UI, as well as cases where there are no targets
try {
targets = targetsFactory.getTargets();
} catch (Throwable e) {
// Don't throw exception. Just log, and instead show a "no targets"
// hint below
logger.log(Level.SEVERE, e.getMessage(), e);
}
if (targets == null || targets.isEmpty()) {
// TODO: Probably a wrong thing to do, but for now show that
// there are
// no targets as a "hint" so that it appears
// in CA UI
hints.add(new BasicYValueHint(EMPTY_VALUE, targetsFactory.noTargetsMessage()));
} else {
try {
List<CFTarget> targets = targetsFactory.getTargets();
if (targets == null || targets.isEmpty()) {
hints.add(new BasicYValueHint(EMPTY_VALUE, targetsFactory.noTargetsMessage()));
} else {
Collection<YValueHint> resolvedHints = getHints(targets);
hints.addAll(resolvedHints);
} catch (Exception e) {
throw ExceptionUtil.unchecked(e);
}
} catch (Throwable e) {
logger.log(Level.SEVERE, e.getMessage(), e);
// Don't throw exception as to allow the CA to be displayed to the
// user.
if (e instanceof IOException || ExceptionUtil.getDeepestCause(e) instanceof IOException) {
hints.add(new BasicYValueHint(EMPTY_VALUE, "Connection failure. " + targetsFactory.noTargetsMessage()));
} else {
hints.add(new BasicYValueHint(EMPTY_VALUE,
"Unable to fetch Cloud Foundry proposals due to: " + e.getMessage()));
}
}
return hints;
}

4
vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
View File

@@ -43,6 +43,10 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
}
}
}
if (hints.isEmpty()) {
hints.add(new BasicYValueHint(EMPTY_VALUE, "No buildpacks found. " + targetsFactory.noTargetsMessage()));
}
return hints;
}