Hadn't actually tested modules properly and oh boy were they broken (…

…and maybe still are).
andrewauclair · Dec 12, 2023 · 865317b · 865317b
1 parent 4262c21
commit 865317b
Show file tree

Hide file tree

Showing 32 changed files with 160 additions and 120 deletions.
diff --git a/demo-multi-app/src/basic/MainFrame.java b/demo-multi-app/src/basic/MainFrame.java
@@ -27,14 +27,13 @@ of this software and associated documentation files (the "Software"), to deal
 import ModernDocking.exception.DockingLayoutException;
 import ModernDocking.layouts.ApplicationLayout;
 import ModernDocking.layouts.DockingLayouts;
-import ModernDocking.api.WindowLayoutBuilderAPI;
 import ModernDocking.settings.Settings;
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme;
 import com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubDarkIJTheme;
-import docking.ui.DockingUI;
+import ModernDocking.ext.ui.DockingUI;
 import exception.FailOnThreadViolationRepaintManager;
 import picocli.CommandLine;
 

diff --git a/demo-multi-app/src/basic/MultipleInstances.java b/demo-multi-app/src/basic/MultipleInstances.java
@@ -21,12 +21,6 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package basic;
 
-import docking.ui.DockingUI;
-import picocli.CommandLine;
-
-import javax.swing.*;
-import java.io.File;
-
 public class MultipleInstances {
 
 }
diff --git a/demo-single-app/src/basic/BasePanel.java b/demo-single-app/src/basic/BasePanel.java
@@ -22,7 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
 package basic;
 
 import ModernDocking.Dockable;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/demo-single-app/src/basic/DialogWithDocking.java b/demo-single-app/src/basic/DialogWithDocking.java
@@ -23,6 +23,8 @@ of this software and associated documentation files (the "Software"), to deal
 
 import ModernDocking.*;
 import ModernDocking.api.RootDockingPanelAPI;
+import ModernDocking.app.Docking;
+import ModernDocking.app.RootDockingPanel;
 
 import javax.swing.*;
 

diff --git a/demo-single-app/src/basic/Example.java b/demo-single-app/src/basic/Example.java
@@ -22,6 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
 package basic;
 
 import ModernDocking.*;
+import ModernDocking.app.AppState;
+import ModernDocking.app.Docking;
+import ModernDocking.app.RootDockingPanel;
 import ModernDocking.exception.DockingLayoutException;
 
 import javax.swing.*;

diff --git a/demo-single-app/src/basic/FloatingSample.java b/demo-single-app/src/basic/FloatingSample.java
@@ -22,9 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
 package basic;
 
 import ModernDocking.Dockable;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 import ModernDocking.DockingRegion;
-import ModernDocking.RootDockingPanel;
+import ModernDocking.app.RootDockingPanel;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/demo-single-app/src/basic/MainFrame.java b/demo-single-app/src/basic/MainFrame.java
@@ -22,6 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
 package basic;
 
 import ModernDocking.*;
+import ModernDocking.app.*;
 import ModernDocking.exception.DockingLayoutException;
 import ModernDocking.layouts.ApplicationLayout;
 import ModernDocking.layouts.DockingLayouts;
@@ -31,7 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.intellijthemes.FlatSolarizedDarkIJTheme;
 import com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatGitHubDarkIJTheme;
-import docking.ui.DockingUI;
+import ModernDocking.ext.ui.DockingUI;
 import exception.FailOnThreadViolationRepaintManager;
 import picocli.CommandLine;
 

diff --git a/demo-single-app/src/basic/OutputPanel.java b/demo-single-app/src/basic/OutputPanel.java
@@ -1,6 +1,6 @@
 package basic;
 
-import ModernDocking.AppState;
+import ModernDocking.app.AppState;
 import ModernDocking.DockableStyle;
 import ModernDocking.DockingProperty;
 

diff --git a/demo-single-app/src/basic/PropertiesDemoPanel.java b/demo-single-app/src/basic/PropertiesDemoPanel.java
@@ -21,10 +21,9 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package basic;
 
-import ModernDocking.AppState;
+import ModernDocking.app.AppState;
 import ModernDocking.DockingProperty;
 import ModernDocking.DockingRegion;
-import ModernDocking.internal.DockableProperties;
 
 import javax.swing.*;
 import javax.swing.text.*;

diff --git a/demo-single-app/src/examples/Docking_dock.java b/demo-single-app/src/examples/Docking_dock.java
@@ -22,9 +22,9 @@ of this software and associated documentation files (the "Software"), to deal
 package examples;
 
 import ModernDocking.Dockable;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 import ModernDocking.DockingRegion;
-import ModernDocking.RootDockingPanel;
+import ModernDocking.app.RootDockingPanel;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/demo-single-app/src/examples/NewWindow.java b/demo-single-app/src/examples/NewWindow.java
@@ -1,10 +1,10 @@
 package examples;
 
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 import ModernDocking.DockingRegion;
-import ModernDocking.RootDockingPanel;
+import ModernDocking.app.RootDockingPanel;
 import ModernDocking.ui.DefaultDockingPanel;
-import docking.ui.DockingUI;
+import ModernDocking.ext.ui.DockingUI;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/demo-single-app/src/packets/MainFrame.java b/demo-single-app/src/packets/MainFrame.java
@@ -21,10 +21,10 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package packets;
 
-import ModernDocking.AppState;
-import ModernDocking.DockableMenuItem;
-import ModernDocking.Docking;
-import ModernDocking.RootDockingPanel;
+import ModernDocking.app.AppState;
+import ModernDocking.app.DockableMenuItem;
+import ModernDocking.app.Docking;
+import ModernDocking.app.RootDockingPanel;
 import ModernDocking.exception.DockingLayoutException;
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.FlatLaf;

diff --git a/demo-single-app/src/packets/PacketBytesPanel.java b/demo-single-app/src/packets/PacketBytesPanel.java
@@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import ModernDocking.Dockable;
 import ModernDocking.DockableStyle;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 
 import javax.swing.*;
 

diff --git a/demo-single-app/src/packets/PacketInfoPanel.java b/demo-single-app/src/packets/PacketInfoPanel.java
@@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import ModernDocking.Dockable;
 import ModernDocking.DockableStyle;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 
 import javax.swing.*;
 

diff --git a/demo-single-app/src/packets/PacketListPanel.java b/demo-single-app/src/packets/PacketListPanel.java
@@ -22,7 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
 package packets;
 
 import ModernDocking.Dockable;
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 
 import javax.swing.*;
 

diff --git a/demo-single-app/src/tests/DeregisterTests.java b/demo-single-app/src/tests/DeregisterTests.java
@@ -21,11 +21,11 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package tests;
 
-import ModernDocking.Docking;
+import ModernDocking.app.Docking;
 import ModernDocking.DockingRegion;
-import ModernDocking.RootDockingPanel;
+import ModernDocking.app.RootDockingPanel;
 import ModernDocking.ui.DefaultDockingPanel;
-import docking.ui.DockingUI;
+import ModernDocking.ext.ui.DockingUI;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/demo-single-app/src/tests/WindowLayoutBuilderTests.java b/demo-single-app/src/tests/WindowLayoutBuilderTests.java
@@ -22,9 +22,12 @@ of this software and associated documentation files (the "Software"), to deal
 package tests;
 
 import ModernDocking.*;
+import ModernDocking.app.ApplicationLayoutMenuItem;
+import ModernDocking.app.Docking;
+import ModernDocking.app.RootDockingPanel;
+import ModernDocking.app.WindowLayoutBuilder;
 import ModernDocking.event.DockingLayoutEvent;
 import ModernDocking.event.DockingLayoutListener;
-import ModernDocking.layouts.ApplicationLayout;
 import ModernDocking.layouts.DockingLayouts;
 import basic.SimplePanel;
 import com.formdev.flatlaf.FlatDarkLaf;

diff --git a/docking-api/src/ModernDocking/api/WindowLayoutBuilderAPI.java b/docking-api/src/ModernDocking/api/WindowLayoutBuilderAPI.java
@@ -24,12 +24,17 @@ of this software and associated documentation files (the "Software"), to deal
 import ModernDocking.DockingRegion;
 import ModernDocking.layouts.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Utility to help create layouts without directly applying them to the actual app
  */
 public class WindowLayoutBuilderAPI {
 	private final DockingLayoutRootNode rootNode;
 
+	private final Map<String, Map<String, String>> properties = new HashMap<>();
+
 	/**
 	 * Start building a new layout
 	 *
@@ -106,6 +111,16 @@ public WindowLayoutBuilderAPI display(String persistentID) {
 		return this;
 	}
 
+	public WindowLayoutBuilderAPI addProperty(String persistentID, String property, String value) {
+		Map<String, String> props = properties.getOrDefault(persistentID, new HashMap<>());
+
+		props.put(property, value);
+
+		properties.put(persistentID, props);
+
+		return this;
+	}
+
 	// build a WindowLayout using the rootNode
 	public WindowLayout build() {
 		return new WindowLayout(rootNode.getNode());

diff --git a/docking-api/src/module-info.java b/docking-api/src/module-info.java
@@ -1,7 +1,7 @@
 /**
  * Module for the Modern Docking framework
  */
-module modern_docking {
+module modern.docking.api {
 	requires java.desktop;
     requires java.logging;
 
@@ -12,4 +12,5 @@
 	exports ModernDocking.persist;
 	exports ModernDocking.ui;
     exports ModernDocking.api;
+	exports ModernDocking.internal;
 }
diff --git a/...ingle-app/src/ModernDocking/AppState.java → ...e-app/src/ModernDocking/app/AppState.java b/...ingle-app/src/ModernDocking/AppState.java → ...e-app/src/ModernDocking/app/AppState.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.AppStateAPI;
 import ModernDocking.exception.DockingLayoutException;
 import ModernDocking.layouts.ApplicationLayout;

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.layouts.ApplicationLayout;
 import ModernDocking.layouts.DockingLayouts;

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.exception.DockableRegistrationFailureException;
 import ModernDocking.internal.DockingInternal;
 

diff --git a/...single-app/src/ModernDocking/Docking.java → ...le-app/src/ModernDocking/app/Docking.java b/...single-app/src/ModernDocking/Docking.java → ...le-app/src/ModernDocking/app/Docking.java
@@ -19,8 +19,10 @@ 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.DockingRegion;
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.RootDockingPanelAPI;
 import ModernDocking.event.DockingListener;

diff --git a/...e-app/src/ModernDocking/DockingState.java → ...p/src/ModernDocking/app/DockingState.java b/...e-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.DockingStateAPI;
 import ModernDocking.layouts.ApplicationLayout;

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.LayoutPersistenceAPI;
 import ModernDocking.exception.DockingLayoutException;

diff --git a/...le-app/src/ModernDocking/LayoutsMenu.java → ...pp/src/ModernDocking/app/LayoutsMenu.java b/...le-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.event.DockingLayoutEvent;
 import ModernDocking.event.DockingLayoutListener;

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.RootDockingPanelAPI;
 import ModernDocking.ui.ToolbarLocation;

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.WindowLayoutBuilderAPI;
 

diff --git a/docking-single-app/src/module-info.java b/docking-single-app/src/module-info.java
@@ -0,0 +1,9 @@
+/**
+ * Module for the Modern Docking framework
+ */
+module modern.docking.ui {
+	requires modern.docking.api;
+	requires java.desktop;
+
+	exports ModernDocking.app;
+}
diff --git a/docking-ui/src/docking/ui/DockingUI.java → ...i/src/ModernDocking/ext/ui/DockingUI.java b/docking-ui/src/docking/ui/DockingUI.java → ...i/src/ModernDocking/ext/ui/DockingUI.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 docking.ui;
+package ModernDocking.ext.ui;
 
 import ModernDocking.internal.DockedTabbedPanel;
 import ModernDocking.internal.DockingInternal;