From 2c634432ed1f5bf7ff2986bbfeed701c9f9f0ba3 Mon Sep 17 00:00:00 2001 From: nsingh Date: Thu, 1 Feb 2018 12:42:33 -0800 Subject: [PATCH] Removed duplicate empty classpath data --- .../ide/vscode/commons/java/DelegatingCachedClasspath.java | 3 +-- .../springframework/ide/vscode/commons/java/IClasspath.java | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/DelegatingCachedClasspath.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/DelegatingCachedClasspath.java index cd5cb8ad0..7ba840d22 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/DelegatingCachedClasspath.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/DelegatingCachedClasspath.java @@ -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 implements IClasspa return data; } } - return EMPTY_CLASSPATH_DATA; + return ClasspathData.EMPTY_CLASSPATH_DATA; } @Override diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java index ec58a40c4..325270ccb 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java @@ -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 findClasspathResourceContainer(String fqName); ClasspathData createClasspathData() throws Exception; - - public static final ClasspathData EMPTY_CLASSPATH_DATA = new ClasspathData(null, Collections.emptySet(), - Collections.emptySet(), null); - }