Make same change to multi-app as single-app.

andrewauclair · Dec 12, 2023 · a72dde3 · a72dde3
1 parent b4f0e51
commit a72dde3
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 8 deletions.
diff --git a/demo-multi-app/src/basic/MainFrame.java b/demo-multi-app/src/basic/MainFrame.java
@@ -24,6 +24,7 @@ of this software and associated documentation files (the "Software"), to deal
 import ModernDocking.*;
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.RootDockingPanelAPI;
+import ModernDocking.app.*;
 import ModernDocking.exception.DockingLayoutException;
 import ModernDocking.layouts.ApplicationLayout;
 import ModernDocking.layouts.DockingLayouts;

diff --git a/...ernDocking/ApplicationLayoutMenuItem.java → ...ocking/app/ApplicationLayoutMenuItem.java b/...ernDocking/ApplicationLayoutMenuItem.java → ...ocking/app/ApplicationLayoutMenuItem.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.layouts.ApplicationLayout;

diff --git a/...p/src/ModernDocking/DockableMenuItem.java → ...c/ModernDocking/app/DockableMenuItem.java b/...p/src/ModernDocking/DockableMenuItem.java → ...c/ModernDocking/app/DockableMenuItem.java
@@ -19,8 +19,9 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
+import ModernDocking.Dockable;
 import ModernDocking.api.DockingAPI;
 import ModernDocking.internal.DockingInternal;
 

diff --git a/...-multi-app/src/ModernDocking/Docking.java → ...ti-app/src/ModernDocking/app/Docking.java b/...-multi-app/src/ModernDocking/Docking.java → ...ti-app/src/ModernDocking/app/Docking.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 

diff --git a/...i-app/src/ModernDocking/DockingState.java → ...p/src/ModernDocking/app/DockingState.java b/...i-app/src/ModernDocking/DockingState.java → ...p/src/ModernDocking/app/DockingState.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.DockingStateAPI;

diff --git a/.../src/ModernDocking/LayoutPersistence.java → .../ModernDocking/app/LayoutPersistence.java b/.../src/ModernDocking/LayoutPersistence.java → .../ModernDocking/app/LayoutPersistence.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.LayoutPersistenceAPI;

diff --git a/...ti-app/src/ModernDocking/LayoutsMenu.java → ...pp/src/ModernDocking/app/LayoutsMenu.java b/...ti-app/src/ModernDocking/LayoutsMenu.java → ...pp/src/ModernDocking/app/LayoutsMenu.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.event.DockingLayoutEvent;

diff --git a/...p/src/ModernDocking/RootDockingPanel.java → ...c/ModernDocking/app/RootDockingPanel.java b/...p/src/ModernDocking/RootDockingPanel.java → ...c/ModernDocking/app/RootDockingPanel.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.RootDockingPanelAPI;

diff --git a/...rc/ModernDocking/WindowLayoutBuilder.java → ...odernDocking/app/WindowLayoutBuilder.java b/...rc/ModernDocking/WindowLayoutBuilder.java → ...odernDocking/app/WindowLayoutBuilder.java
@@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
-package ModernDocking;
+package ModernDocking.app;
 
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.WindowLayoutBuilderAPI;

diff --git a/docking-multi-app/src/module-info.java b/docking-multi-app/src/module-info.java
@@ -0,0 +1,9 @@
+/**
+ * Module for the Modern Docking framework
+ */
+module modern_docking.multi_app {
+	requires modern_docking.api;
+	requires java.desktop;
+
+	exports ModernDocking.app;
+}