From dcb57d46de41efa99e6af9d5e079c62ee54c1b5f Mon Sep 17 00:00:00 2001 From: Paul Gooderham Date: Fri, 10 Jan 2025 20:42:14 -0500 Subject: [PATCH] Fix test failure when you close one project and open another Signed-off-by: Paul Gooderham --- .../java/io/openliberty/tools/intellij/LibertyExplorer.java | 3 ++- .../java/io/openliberty/tools/intellij/LibertyModules.java | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java b/src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java index 123167e8f..f52d4c7ec 100644 --- a/src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java +++ b/src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java @@ -103,7 +103,8 @@ public static ActionToolbar buildActionToolbar(Tree tree) { */ public static Tree buildTree(Project project, Color backgroundColor) { LibertyModules libertyModules = LibertyModules.getInstance().scanLibertyModules(project); - if (libertyModules.isEmpty()) { + // This singleton may contain entries from old projects if you close a project and open another + if (libertyModules.getLibertyModules(project).isEmpty()) { return null; } DefaultMutableTreeNode top = new DefaultMutableTreeNode("Root node"); diff --git a/src/main/java/io/openliberty/tools/intellij/LibertyModules.java b/src/main/java/io/openliberty/tools/intellij/LibertyModules.java index f23a4f2ac..15509ea17 100644 --- a/src/main/java/io/openliberty/tools/intellij/LibertyModules.java +++ b/src/main/java/io/openliberty/tools/intellij/LibertyModules.java @@ -44,9 +44,6 @@ public synchronized static LibertyModules getInstance() { return instance; } - public boolean isEmpty() { - return libertyModules.isEmpty(); - } /** * Scan the project for the modules that are Liberty apps. * @return null if there are no Liberty modules