From 2063ff438e686c6d39cc5fde59dd65eaa867fefc Mon Sep 17 00:00:00 2001 From: aboyko Date: Tue, 17 Jan 2023 10:15:22 -0500 Subject: [PATCH] Don't forget to dispose wizard page image --- .../livexp/ui/WizardPageWithSections.java | 3 ++- .../jdt/ls/commons/BootProjectTracker.java | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/WizardPageWithSections.java b/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/WizardPageWithSections.java index 6930f57e5..0373a7311 100644 --- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/WizardPageWithSections.java +++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.livexp/src/org/springsource/ide/eclipse/commons/livexp/ui/WizardPageWithSections.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2020 Pivotal Software, Inc. + * Copyright (c) 2012, 2023 Pivotal Software, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -189,6 +189,7 @@ public abstract class WizardPageWithSections extends WizardPage implements IPage for (WizardPageSection s : sections) { s.dispose(); } + super.dispose(); } @Override diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/BootProjectTracker.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/BootProjectTracker.java index 08f18580f..5089bcafb 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/BootProjectTracker.java +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/BootProjectTracker.java @@ -84,16 +84,18 @@ public class BootProjectTracker { } private boolean isSpringProject(IJavaProject jp) { - try { - IClasspathEntry[] classpath = jp.getResolvedClasspath(true); - //Look for a 'spring-core' jar or project entry - for (IClasspathEntry e : classpath) { - if (isBootJar(e) || isBootProject(e)) { - return true; + if (jp.exists()) { + try { + IClasspathEntry[] classpath = jp.getResolvedClasspath(true); + //Look for a 'spring-core' jar or project entry + for (IClasspathEntry e : classpath) { + if (isBootJar(e) || isBootProject(e)) { + return true; + } } + } catch (JavaModelException e) { + logger.log(e); } - } catch (JavaModelException e) { - logger.log(e); } return false; }