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

Merge branch 'master' of github.com:spring-projects/sts4

Browse Source
This commit is contained in:
Kris De Volder
2018-02-01 13:49:43 -08:00
parent 42fc5da462 2c634432ed
commit d53158c7c7
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/DelegatingCachedClasspath.java
View File

@@ -17,7 +17,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Optional;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicReference;
@@ -220,7 +219,7 @@ public class DelegatingCachedClasspath<T extends IClasspath> implements IClasspa
return data;
}
}
return EMPTY_CLASSPATH_DATA;
return ClasspathData.EMPTY_CLASSPATH_DATA;
}
@Override

5
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java
View File

@@ -12,7 +12,6 @@ package org.springframework.ide.vscode.commons.java;
import java.io.File;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Optional;
import java.util.function.Predicate;
@@ -63,8 +62,4 @@ public interface IClasspath {
Optional<File> findClasspathResourceContainer(String fqName);
ClasspathData createClasspathData() throws Exception;
public static final ClasspathData EMPTY_CLASSPATH_DATA = new ClasspathData(null, Collections.emptySet(),
Collections.emptySet(), null);
}