Issue #256

Removing `Dockable.getTabPosition`, `Settings.alwaysDisplayTabsMode` and `Settings.setAlwaysDisplayTabsMode`.
andrewauclair · Jan 29, 2025 · bc61da4 · bc61da4
1 parent 9c05e35
commit bc61da4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/demo-multi-app/src/basic/MainFrame.java b/demo-multi-app/src/basic/MainFrame.java
@@ -86,7 +86,9 @@ public void setVisible(boolean visible) {
 
 		docking = new Docking(this);
 
-		Settings.setAlwaysDisplayTabMode(alwaysUseTabs);
+		if (alwaysUseTabs) {
+			Settings.setDefaultTabPreference(DockableTabPreference.TOP_ALWAYS);
+		}
 
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);

diff --git a/docking-api/src/ModernDocking/Dockable.java b/docking-api/src/ModernDocking/Dockable.java
@@ -185,14 +185,6 @@ default boolean getHasMoreOptions() {
 		return false;
 	}
 
-	/**
-	 * @deprecated Replaced with getTabPreference. Will be removed in future release.
-	 */
-	@Deprecated(since = "0.12.0", forRemoval = true)
-	default int getTabPosition() {
-		return SwingConstants.BOTTOM;
-	}
-
 	default DockableTabPreference getTabPreference() {
 		return DockableTabPreference.NONE;
 	}

diff --git a/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java b/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java
@@ -347,7 +347,7 @@ public void dockAtIndex(Dockable dockable, int index) {
 	public void undock(Dockable dockable) {
 		removePanel(DockingInternal.get(docking).getWrapper(dockable));
 
-		if (!Floating.isFloatingTabbedPane() && !Settings.alwaysDisplayTabsMode() && panels.size() == 1 && parent != null && panels.get(0).getDockable().getTabPosition() != SwingConstants.TOP) {
+		if (!Floating.isFloatingTabbedPane() && !Settings.alwaysDisplayTabsMode() && panels.size() == 1 && parent != null && panels.get(0).getDockable().getTabPreference() != DockableTabPreference.TOP) {
 			parent.replaceChild(this, new DockedSimplePanel(docking, panels.get(0)));
 		}
 

diff --git a/docking-api/src/ModernDocking/internal/InternalRootDockingPanel.java b/docking-api/src/ModernDocking/internal/InternalRootDockingPanel.java
@@ -22,6 +22,7 @@ of this software and associated documentation files (the "Software"), to deal
 package ModernDocking.internal;
 
 import ModernDocking.Dockable;
+import ModernDocking.DockableTabPreference;
 import ModernDocking.DockingRegion;
 import ModernDocking.api.DockingAPI;
 import ModernDocking.api.RootDockingPanelAPI;
@@ -145,7 +146,7 @@ public void dock(Dockable dockable, DockingRegion region, double dividerProporti
         if (panel != null) {
             panel.dock(dockable, region, dividerProportion);
         }
-        else if (Settings.alwaysDisplayTabsMode(dockable)) {
+        else if (Settings.defaultTabPreference() == DockableTabPreference.TOP_ALWAYS) {
             setPanel(new DockedTabbedPanel(docking, wrapper));
             wrapper.setWindow(rootPanel.getWindow());
         }

diff --git a/docking-api/src/ModernDocking/settings/Settings.java b/docking-api/src/ModernDocking/settings/Settings.java
@@ -37,22 +37,6 @@ public static boolean alwaysDisplayTabsMode() {
         return defaultTabPreference == DockableTabPreference.TOP_ALWAYS || defaultTabPreference == DockableTabPreference.BOTTOM_ALWAYS;
     }
 
-    /**
-     * @deprecated Replaced with defaultTabPreference. Will be removed in future release.
-     */
-    @Deprecated(since = "0.12.0", forRemoval = true)
-    public static boolean alwaysDisplayTabsMode(Dockable dockable) {
-        return defaultTabPreference == DockableTabPreference.TOP_ALWAYS || dockable.getTabPosition() == SwingConstants.TOP;
-    }
-
-    /**
-     * @deprecated Replaced with setDefaultTabPreference. Will be removed in future release.
-     */
-    @Deprecated(since = "0.12.0", forRemoval = true)
-    public static void setAlwaysDisplayTabMode(boolean alwaysDisplayTabsMode) {
-        defaultTabPreference = alwaysDisplayTabsMode ? DockableTabPreference.TOP_ALWAYS : DockableTabPreference.BOTTOM;
-    }
-
     public static DockableTabPreference defaultTabPreference() {
         return defaultTabPreference;
     }