From 0a8daf450d114a44d96ef9d384719fc7b56e6607 Mon Sep 17 00:00:00 2001
From: 15knots <11367029+15knots@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:05:48 +0200
Subject: [PATCH] move tree content provider to new package navigator

---
 de.marw.cmake4eclipse.mbs.ui/plugin.xml        | 18 +++++++++---------
 .../{slim => navigator}/BuildTargetAction.java |  2 +-
 .../BuildTargetsContainer.java                 |  2 +-
 .../BuildTargetsContainerActionProvider.java   |  2 +-
 .../BuildTargetsLabelProvider.java             |  2 +-
 .../BuildTargetsTreeContentProvider.java       |  5 ++++-
 .../EditBuildTargetsAction.java                |  2 +-
 .../EditBuildTargetsActionProvider.java        |  2 +-
 .../ui/{slim => navigator}/NavBuildTarget.java |  2 +-
 .../NavBuildTargetActionProvider.java          |  2 +-
 .../mbs/ui/navigator/package-info.java         | 15 +++++++++++++++
 .../mbs/ui/slim/BuildTargetEvent.java          |  2 +-
 .../mbs/ui/slim/BuildTargetsManager.java       |  2 +-
 13 files changed, 38 insertions(+), 20 deletions(-)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/BuildTargetAction.java (99%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/BuildTargetsContainer.java (97%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/BuildTargetsContainerActionProvider.java (97%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/BuildTargetsLabelProvider.java (97%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/BuildTargetsTreeContentProvider.java (96%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/EditBuildTargetsAction.java (97%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/EditBuildTargetsActionProvider.java (94%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/NavBuildTarget.java (95%)
 rename de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/{slim => navigator}/NavBuildTargetActionProvider.java (97%)
 create mode 100644 de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/package-info.java

diff --git a/de.marw.cmake4eclipse.mbs.ui/plugin.xml b/de.marw.cmake4eclipse.mbs.ui/plugin.xml
index 4539a584..652893de 100644
--- a/de.marw.cmake4eclipse.mbs.ui/plugin.xml
+++ b/de.marw.cmake4eclipse.mbs.ui/plugin.xml
@@ -336,10 +336,10 @@
         point="org.eclipse.ui.navigator.navigatorContent">
      <navigatorContent
            activeByDefault="true"
-           contentProvider="de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetsTreeContentProvider"
+           contentProvider="de.marw.cmake4eclipse.mbs.ui.navigator.BuildTargetsTreeContentProvider"
            icon="platform:/plugin/org.eclipse.cdt.managedbuilder.ui/icons/obj16/target_obj.gif"
            id="de.marw.cmake4eclipse.mbs.ui.buildTargets.content"
-           labelProvider="de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetsLabelProvider"
+           labelProvider="de.marw.cmake4eclipse.mbs.ui.navigator.BuildTargetsLabelProvider"
            name="Build Targets (cmake)">
        <triggerPoints>
              <and>
@@ -354,28 +354,28 @@
        </triggerPoints>
        <possibleChildren>
           <or>
-             <instanceof value="de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetsContainer"/>
-             <instanceof value="de.marw.cmake4eclipse.mbs.ui.slim.NavBuildTarget"/>
+             <instanceof value="de.marw.cmake4eclipse.mbs.ui.navigator.BuildTargetsContainer"/>
+             <instanceof value="de.marw.cmake4eclipse.mbs.ui.navigator.NavBuildTarget"/>
           </or>
        </possibleChildren>
        <actionProvider
-             class="de.marw.cmake4eclipse.mbs.ui.slim.NavBuildTargetActionProvider"
+             class="de.marw.cmake4eclipse.mbs.ui.navigator.NavBuildTargetActionProvider"
              id="de.marw.cmake4eclipse.mbs.ui.buildTargets.actions">
           <enablement>
              <instanceof
-                   value="de.marw.cmake4eclipse.mbs.ui.slim.NavBuildTarget">
+                   value="de.marw.cmake4eclipse.mbs.ui.navigator.NavBuildTarget">
              </instanceof>
           </enablement>
        </actionProvider>
        <actionProvider
-             class="de.marw.cmake4eclipse.mbs.ui.slim.EditBuildTargetsActionProvider">
+             class="de.marw.cmake4eclipse.mbs.ui.navigator.EditBuildTargetsActionProvider">
           <enablement>
              <or>
                 <instanceof
-                      value="de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetsContainer">
+                      value="de.marw.cmake4eclipse.mbs.ui.navigator.BuildTargetsContainer">
                 </instanceof>
              <instanceof
-                   value="de.marw.cmake4eclipse.mbs.ui.slim.NavBuildTarget">
+                   value="de.marw.cmake4eclipse.mbs.ui.navigator.NavBuildTarget">
              </instanceof>
              </or>
           </enablement>
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetAction.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetAction.java
similarity index 99%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetAction.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetAction.java
index d696be56..0b68376d 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetAction.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetAction.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainer.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainer.java
similarity index 97%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainer.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainer.java
index 4c2ef9aa..148b22ef 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainer.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainer.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainerActionProvider.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainerActionProvider.java
similarity index 97%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainerActionProvider.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainerActionProvider.java
index 3c044abd..057573be 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsContainerActionProvider.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsContainerActionProvider.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsLabelProvider.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsLabelProvider.java
similarity index 97%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsLabelProvider.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsLabelProvider.java
index 3c9c15b2..d4a2ee62 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsLabelProvider.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsLabelProvider.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsTreeContentProvider.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsTreeContentProvider.java
similarity index 96%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsTreeContentProvider.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsTreeContentProvider.java
index d782e542..3db820cf 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsTreeContentProvider.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/BuildTargetsTreeContentProvider.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +26,9 @@
 import de.marw.cmake4eclipse.mbs.internal.storage.BuildTargetSerializer;
 import de.marw.cmake4eclipse.mbs.internal.storage.Util;
 import de.marw.cmake4eclipse.mbs.settings.CMakeSettings;
+import de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetEvent;
+import de.marw.cmake4eclipse.mbs.ui.slim.BuildTargetsManager;
+import de.marw.cmake4eclipse.mbs.ui.slim.IBuildTargetListener;
 
 /**
  * Contributes the build target nodes to the project explorer.
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsAction.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsAction.java
similarity index 97%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsAction.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsAction.java
index fc95f1f1..f94dbb5c 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsAction.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsAction.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsActionProvider.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsActionProvider.java
similarity index 94%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsActionProvider.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsActionProvider.java
index 5748dae3..6b849fe4 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/EditBuildTargetsActionProvider.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/EditBuildTargetsActionProvider.java
@@ -1,4 +1,4 @@
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTarget.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTarget.java
similarity index 95%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTarget.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTarget.java
index 05673d7d..be2954da 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTarget.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTarget.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import java.util.Objects;
 
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTargetActionProvider.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTargetActionProvider.java
similarity index 97%
rename from de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTargetActionProvider.java
rename to de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTargetActionProvider.java
index db330d3a..1b35444d 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/NavBuildTargetActionProvider.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/NavBuildTargetActionProvider.java
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package de.marw.cmake4eclipse.mbs.ui.slim;
+package de.marw.cmake4eclipse.mbs.ui.navigator;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/package-info.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/package-info.java
new file mode 100644
index 00000000..aa97fad2
--- /dev/null
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/navigator/package-info.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Martin Weber.
+ *
+ * Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 "EPL".
+ * A copy of the EPL is available at http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+/**
+ * Tree content provider for the project explorer view.
+ *
+ * @author Martin Weber
+ */
+package de.marw.cmake4eclipse.mbs.ui.navigator;
\ No newline at end of file
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetEvent.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetEvent.java
index 1ff3a1e7..d66cee1e 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetEvent.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetEvent.java
@@ -20,7 +20,7 @@
  *
  * @author Martin Weber
  */
-class BuildTargetEvent {
+public class BuildTargetEvent {
 
   private final IProject project;
   private final List<String> targets;
diff --git a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsManager.java b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsManager.java
index 1a2b4e75..2c0096c5 100644
--- a/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsManager.java
+++ b/de.marw.cmake4eclipse.mbs.ui/src/de/marw/cmake4eclipse/mbs/ui/slim/BuildTargetsManager.java
@@ -20,7 +20,7 @@
  *
  * @author Martin Weber
  */
-class BuildTargetsManager {
+public class BuildTargetsManager {
   private static BuildTargetsManager instance;
 
   private final ListenerList<IBuildTargetListener> listeners = new ListenerList<>(ListenerList.IDENTITY);