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

Remove obsolete method 'isProjectRoot' from project finder interface

Browse Source
This commit is contained in:
Kris De Volder
2017-10-17 10:41:56 -07:00
parent 023e623f02
commit 69491029b3
11 changed files with 26 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/AbstractJavaProjectFinder.java
View File

@@ -28,7 +28,7 @@ import org.springframework.ide.vscode.commons.util.text.IDocument;
public abstract class AbstractJavaProjectFinder implements JavaProjectFinder {
@Override
public IJavaProject find(IDocument doc) {
public final IJavaProject find(IDocument doc) {
try {
String uriStr = doc.getUri();
if (StringUtil.hasText(uriStr)) {

13
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java
View File

@@ -26,7 +26,7 @@ import org.springframework.ide.vscode.commons.util.text.IDocument;
* @author Alex Boyko
*
*/
public class CompositeJavaProjectFinder implements JavaProjectFinder {
public class CompositeJavaProjectFinder extends AbstractJavaProjectFinder {
private final List<JavaProjectFinder> projectFinders;
@@ -46,19 +46,8 @@ public class CompositeJavaProjectFinder implements JavaProjectFinder {
return projectFinders.remove(javaProjectFinder);
}
@Override
public IJavaProject find(IDocument doc) {
return projectFinders.stream().map(finder -> finder.find(doc)).filter(Objects::nonNull).findFirst().orElse(null);
}
@Override
public IJavaProject find(File file) {
return projectFinders.stream().map(finder -> finder.find(file)).filter(Objects::nonNull).findFirst().orElse(null);
}
@Override
public boolean isProjectRoot(File file) {
return projectFinders.stream().filter(finder -> finder.isProjectRoot(file)) != null;
}
}

7
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java
View File

@@ -16,14 +16,15 @@ import org.springframework.ide.vscode.commons.java.IJavaProject;
import org.springframework.ide.vscode.commons.util.text.IDocument;
/**
* Java project finder. Able to find a java project for a file or document
*
* Java project finder provides a means to obtain the project context associated with
* a document location.
* *
* @author Alex Boyko
* @author Kris De Volder
*/
public interface JavaProjectFinder {
IJavaProject find(IDocument doc);
IJavaProject find(File file);
boolean isProjectRoot(File file);
}