From a7ffcebc90c14142448967eb4e845e00e6c572f0 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:31:39 +0200 Subject: [PATCH] Move de.bmotionstudio.rodin classes to appropriate packages --- de.bmotionstudio.gef.editor/plugin.xml | 18 +++++++++--------- .../editor/action}/ActionCollection.java | 3 ++- .../action}/BMotionStudioActionProvider.java | 3 ++- .../editor/action}/YesToAllMessageDialog.java | 2 +- .../StartEventBVisualizationHandler.java | 4 ++-- .../editor/internal}/BMotionLabelProvider.java | 2 +- .../BMotionStudioContentProvider.java | 2 +- .../internal}/BMotionStudioRodinFile.java | 2 +- .../internal}/PerspectiveEditFactory.java | 2 +- .../internal}/PerspectiveRunFactory.java | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/action}/ActionCollection.java (97%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/action}/BMotionStudioActionProvider.java (95%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/action}/YesToAllMessageDialog.java (96%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/handler}/StartEventBVisualizationHandler.java (91%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/internal}/BMotionLabelProvider.java (96%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/internal}/BMotionStudioContentProvider.java (97%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/internal}/BMotionStudioRodinFile.java (92%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/internal}/PerspectiveEditFactory.java (96%) rename de.bmotionstudio.gef.editor/src/de/bmotionstudio/{rodin => gef/editor/internal}/PerspectiveRunFactory.java (96%) diff --git a/de.bmotionstudio.gef.editor/plugin.xml b/de.bmotionstudio.gef.editor/plugin.xml index c35d015c..1b017381 100644 --- a/de.bmotionstudio.gef.editor/plugin.xml +++ b/de.bmotionstudio.gef.editor/plugin.xml @@ -13,13 +13,13 @@ <extension point="org.eclipse.ui.perspectives"> <perspective - class="de.bmotionstudio.rodin.PerspectiveEditFactory" + class="de.bmotionstudio.gef.editor.internal.PerspectiveEditFactory" icon="icons/logo_bmotion.png" id="de.bmotionstudio.perspective.edit" name="BMS Edit"> </perspective> <perspective - class="de.bmotionstudio.rodin.PerspectiveRunFactory" + class="de.bmotionstudio.gef.editor.internal.PerspectiveRunFactory" icon="icons/icon_run.png" id="de.bmotionstudio.perspective.run" name="BMS Run"> @@ -122,7 +122,7 @@ <iterate operator="or"> <instanceof - value="de.bmotionstudio.rodin.BMotionStudioRodinFile"> + value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile"> </instanceof> </iterate> </with> @@ -142,7 +142,7 @@ name="Start Visualization from File"> </command> <command - defaultHandler="de.bmotionstudio.rodin.StartEventBVisualizationHandler" + defaultHandler="de.bmotionstudio.gef.editor.handler.StartEventBVisualizationHandler" id="de.bmotionstudio.rodin.command.startVisualization" name="Start Visualization"> </command> @@ -165,9 +165,9 @@ <extension point="org.eclipse.ui.navigator.navigatorContent"> <navigatorContent - contentProvider="de.bmotionstudio.rodin.BMotionStudioContentProvider" + contentProvider="de.bmotionstudio.gef.editor.internal.BMotionStudioContentProvider" id="de.bmotionstudio.ui.navigatorContent" - labelProvider="de.bmotionstudio.rodin.BMotionLabelProvider" + labelProvider="de.bmotionstudio.gef.editor.internal.BMotionLabelProvider" name="BMotion Studio Navigator Content" priority="normal"> <triggerPoints> @@ -177,15 +177,15 @@ </triggerPoints> <possibleChildren> <instanceof - value="de.bmotionstudio.rodin.BMotionStudioRodinFile"> + value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile"> </instanceof> </possibleChildren> <actionProvider - class="de.bmotionstudio.rodin.BMotionStudioActionProvider" + class="de.bmotionstudio.gef.editor.action.BMotionStudioActionProvider" id="de.bmotionstudio.ui.navigatorAction" priority="normal"> <enablement> - <instanceof value="de.bmotionstudio.rodin.BMotionStudioRodinFile"> + <instanceof value="de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile"> </instanceof> </enablement> </actionProvider> diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java similarity index 97% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java index b70999a3..6b5be76d 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/ActionCollection.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/ActionCollection.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.action; import java.util.ArrayList; import java.util.Collection; @@ -30,6 +30,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.part.FileEditorInput; import de.bmotionstudio.gef.editor.BMotionEditorPlugin; +import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile; public class ActionCollection { diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java similarity index 95% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java index e6b1ca71..6d2f467a 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioActionProvider.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/BMotionStudioActionProvider.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.action; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IMenuManager; @@ -20,6 +20,7 @@ import org.eclipse.ui.navigator.ICommonActionExtensionSite; import org.eclipse.ui.navigator.ICommonMenuConstants; import de.bmotionstudio.gef.editor.BMotionEditorPlugin; +import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile; public class BMotionStudioActionProvider extends CommonActionProvider { diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java similarity index 96% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java index ed59926e..643ab8b9 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/YesToAllMessageDialog.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/action/YesToAllMessageDialog.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.action; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java similarity index 91% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java index 73fdccad..3f78d944 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/StartEventBVisualizationHandler.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/handler/StartEventBVisualizationHandler.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.handler; import org.eclipse.core.commands.IHandler; import org.eclipse.core.resources.IFile; @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jface.viewers.IStructuredSelection; -import de.bmotionstudio.gef.editor.handler.StartVisualizationFileHandler; +import de.bmotionstudio.gef.editor.internal.BMotionStudioRodinFile; /** * @author Lukas Ladenberger diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java similarity index 96% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java index 06ae49b3..925bdc09 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionLabelProvider.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionLabelProvider.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.internal; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java similarity index 97% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java index ed93b697..ce9ebd95 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioContentProvider.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioContentProvider.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.internal; import java.util.ArrayList; import java.util.List; diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java similarity index 92% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java index 6286b03e..77ff770e 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/BMotionStudioRodinFile.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/BMotionStudioRodinFile.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.internal; import org.eclipse.core.resources.IResource; diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java similarity index 96% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java index 35a2c477..2603fee3 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveEditFactory.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveEditFactory.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.internal; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java similarity index 96% rename from de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java rename to de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java index f8c425f5..7586a12d 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/rodin/PerspectiveRunFactory.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/internal/PerspectiveRunFactory.java @@ -4,7 +4,7 @@ * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html) * */ -package de.bmotionstudio.rodin; +package de.bmotionstudio.gef.editor.internal; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; -- GitLab