move tree content provider to new package navigator

15knots · Oct 1, 2023 · 0a8daf4 · 0a8daf4
1 parent e6df505
commit 0a8daf4
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 20 deletions.
diff --git 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/...clipse/mbs/ui/slim/BuildTargetAction.java → ...e/mbs/ui/navigator/BuildTargetAction.java b/...clipse/mbs/ui/slim/BuildTargetAction.java → ...e/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/...se/mbs/ui/slim/BuildTargetsContainer.java → ...s/ui/navigator/BuildTargetsContainer.java b/...se/mbs/ui/slim/BuildTargetsContainer.java → ...s/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/.../BuildTargetsContainerActionProvider.java → .../BuildTargetsContainerActionProvider.java b/.../BuildTargetsContainerActionProvider.java → .../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/...bs/ui/slim/BuildTargetsLabelProvider.java → .../navigator/BuildTargetsLabelProvider.java b/...bs/ui/slim/BuildTargetsLabelProvider.java → .../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/...slim/BuildTargetsTreeContentProvider.java → ...ator/BuildTargetsTreeContentProvider.java b/...slim/BuildTargetsTreeContentProvider.java → ...ator/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/...e/mbs/ui/slim/EditBuildTargetsAction.java → .../ui/navigator/EditBuildTargetsAction.java b/...e/mbs/ui/slim/EditBuildTargetsAction.java → .../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/.../slim/EditBuildTargetsActionProvider.java → ...gator/EditBuildTargetsActionProvider.java b/.../slim/EditBuildTargetsActionProvider.java → ...gator/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/...e4eclipse/mbs/ui/slim/NavBuildTarget.java → ...ipse/mbs/ui/navigator/NavBuildTarget.java b/...e4eclipse/mbs/ui/slim/NavBuildTarget.java → ...ipse/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/...ui/slim/NavBuildTargetActionProvider.java → ...vigator/NavBuildTargetActionProvider.java b/...ui/slim/NavBuildTargetActionProvider.java → ...vigator/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
@@ -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;
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
@@ -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
@@ -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);