diff --git a/eclipse-distribution/local-build.sh b/eclipse-distribution/local-build.sh index e5027d910..61f0352d8 100755 --- a/eclipse-distribution/local-build.sh +++ b/eclipse-distribution/local-build.sh @@ -1,3 +1,2 @@ -export JAVA_HOME=/home/kdvolder/Applications/jdk-11.0.8+10 -mvn clean package -Pe417 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true +mvn clean package -Pe426 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/LocalBootDashModel.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/LocalBootDashModel.java index 3e3ec8f53..9678275bd 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/LocalBootDashModel.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/LocalBootDashModel.java @@ -28,7 +28,11 @@ import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jdt.core.IJavaProject; import org.osgi.framework.Bundle; import org.osgi.framework.BundleEvent; @@ -111,7 +115,7 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio super(RunTargets.LOCAL, parent); this.workspace = context.getWorkspace(); this.localServices = new LocalServicesModel(getViewModel(), this, context.getBootInstallManager().getDefaultInstallExp()); - this.refreshState = new LiveExpression() { + this.refreshState = new LiveExpression<>() { { dependsOn(bootAppsRefreshState); dependsOn(localServices.getRefreshState()); @@ -173,7 +177,7 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio WorkspaceListener workspaceListener = new WorkspaceListener(); this.openCloseListenerManager = new ProjectChangeListenerManager(workspace, workspaceListener); this.classpathListenerManager = new ClasspathListenerManager(workspaceListener); - projectExclusion.addListener(projectExclusionListener = new ValueListener() { + projectExclusion.addListener(projectExclusionListener = new ValueListener<>() { public void gotValue(LiveExpression exp, Pattern value) { updateElementsFromWorkspace(); } @@ -287,6 +291,17 @@ public class LocalBootDashModel extends AbstractBootDashModel implements Deletio } void updateElementsFromWorkspace() { + new Job("Updating Local Contents for Boot Dashboard") { + @Override + protected IStatus run(IProgressMonitor monitor) { + doUpdateElementsFromWorkspace(); + return Status.OK_STATUS; + } + + }.schedule(); + } + + private void doUpdateElementsFromWorkspace() { LiveSetVariable apps = this.applications; if (apps!=null) { Set newElements = Arrays.stream(this.workspace.getRoot().getProjects())