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

fixed logic around specific project name setting

Browse Source
This commit is contained in:
Martin Lippert
2018-07-31 14:08:51 +02:00
parent 92fbe9ecdd
commit 007b2c5f95
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppMatcher.java
View File

@@ -33,19 +33,28 @@ public class RunningAppMatcher {
return RunningAppMatcher.doesProjectMatch(app, project);
}).collect(CollectorUtil.toImmutableList());
if (matchedProjects.size() > 0) {
return matchedProjects;
}
return matchedProjects;
}
return apps;
}
private static boolean doesProjectMatch(SpringBootApp app, IJavaProject project) {
if (doesProjectNameMatch(app, project)) return true;
if (doesProjectThinJarWrapperMatch(app, project)) return true;
if (doesClasspathMatch(app, project)) return true;
if (hasProjectName(app, project)) {
return doesProjectNameMatch(app, project);
}
else {
return doesProjectThinJarWrapperMatch(app, project) || doesClasspathMatch(app, project);
}
}
return false;
public static boolean hasProjectName(SpringBootApp app, IJavaProject project) {
try {
String projectName = app.getSystemProperty("spring.boot.project.name");
return projectName != null && projectName.trim().length() > 0;
}
catch (Exception e) {
return false;
}
}
public static boolean doesProjectNameMatch(SpringBootApp app, IJavaProject project) {