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

Some tweaks to ProjectObserver.Listener users

Browse Source
This commit is contained in:
Kris De Volder
2018-03-20 14:57:11 -07:00
parent 90e52ab6e0
commit ceaca41c3d
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
View File

@@ -50,7 +50,7 @@ public final class CompilationUnitCache {
public CompilationUnitCache(JavaProjectFinder projectFinder, SimpleTextDocumentService documentService, ProjectObserver projectObserver) {
this.projectFinder = projectFinder;
this.projectObserver = projectObserver;
projectListener = new CUProjectListener();
projectListener = ProjectObserver.onAny(this::invalidateProject);
uriToCu = CacheBuilder.newBuilder().build();
projectToDocs = CacheBuilder.newBuilder().build();
@@ -185,22 +185,4 @@ public final class CompilationUnitCache {
}
}
}
private class CUProjectListener implements ProjectObserver.Listener {
@Override
public void created(IJavaProject project) {
}
@Override
public void changed(IJavaProject project) {
invalidateProject(project);
}
@Override
public void deleted(IJavaProject project) {
invalidateProject(project);
}
}
}

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/jdt/ls/JdtLsProjectCache.java
View File

@@ -57,14 +57,14 @@ public class JdtLsProjectCache implements JavaProjectFinder, ProjectObserver {
@Override
public void changed(Event event) {
synchronized (table) {
log.info("Classpath changed: " + event.projectUri);
String uri = UriUtil.normalize(event.projectUri);
log.info("Classpath changed: " + uri);
if (event.deleted) {
JdtLsProject deleted = table.remove(uri);
notifyDelete(deleted);
} else {
JdtLsProject newProject = new JdtLsProject(event.name, uri, event.classpath);
JdtLsProject oldProject = table.put(event.projectUri, newProject);
JdtLsProject oldProject = table.put(uri, newProject);
if (oldProject != null) {
notifyChanged(newProject);
} else {

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
View File

@@ -44,7 +44,7 @@ public class SpringPropertiesIndexManager extends ListenerManager<Listener<Sprin
@Override
public void created(IJavaProject project) {
// ignore
indexes.invalidate(project);
}
@Override