[ jEdit-commits ] SF.net SVN: jedit:[13178] jEdit/branches/docking_framework/org/gjt/sp/jedit

[<sh...@us...>]

Revision: 13178
          http://jedit.svn.sourceforge.net/jedit/?rev=13178&view=rev
Author:   shlomy
Date:     2008-08-04 15:05:57 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
Hide the toolbar position setting from the docking framework. It is now implemented purely by the view, like the split configuration of the edit panes.

Modified Paths:
--------------
    jEdit/branches/docking_framework/org/gjt/sp/jedit/View.java
    jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableLayout.java
    jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManager.java
    jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManagerImpl.java

Modified: jEdit/branches/docking_framework/org/gjt/sp/jedit/View.java
===================================================================
--- jEdit/branches/docking_framework/org/gjt/sp/jedit/View.java	2008-08-04 12:24:03 UTC (rev 13177)
+++ jEdit/branches/docking_framework/org/gjt/sp/jedit/View.java	2008-08-04 15:05:57 UTC (rev 13178)
@@ -1644,8 +1644,8 @@
 		}
 		else
 		{
-			dockableWindowManager.setTopToolbars(topToolBars);
-			dockableWindowManager.setBottomToolbars(bottomToolBars);
+			mainPanel.add(topToolBars, BorderLayout.NORTH);
+			mainPanel.add(bottomToolBars, BorderLayout.SOUTH);
 			if (showStatus)
 				getContentPane().add(BorderLayout.SOUTH,status);
 		}

Modified: jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableLayout.java
===================================================================
--- jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableLayout.java	2008-08-04 12:24:03 UTC (rev 13177)
+++ jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableLayout.java	2008-08-04 15:05:57 UTC (rev 13178)
@@ -32,16 +32,12 @@
 	// jEdit's UI layout
 	static final String CENTER = BorderLayout.CENTER;
 
-	public static final String TOP_TOOLBARS = "top-toolbars";
-	public static final String BOTTOM_TOOLBARS = "bottom-toolbars";
-
 	static final String TOP_BUTTONS = "top-buttons";
 	static final String LEFT_BUTTONS = "left-buttons";
 	static final String BOTTOM_BUTTONS = "bottom-buttons";
 	static final String RIGHT_BUTTONS = "right-buttons";
 
 	private boolean alternateLayout;
-	private Component topToolbars, bottomToolbars;
 	private Component center;
 
 	/* No good */
@@ -85,10 +81,6 @@
 	{
 		if(cons == null || CENTER.equals(cons))
 			center = comp;
-		else if(TOP_TOOLBARS.equals(cons))
-			topToolbars = comp;
-		else if(BOTTOM_TOOLBARS.equals(cons))
-			bottomToolbars = comp;
 		else if(DockableWindowManager.TOP.equals(cons))
 			top = (DockablePanel)comp;
 		else if(DockableWindowManager.LEFT.equals(cons))
@@ -112,10 +104,6 @@
 	{
 		if(center == comp)
 			center = null;
-		else if(comp == topToolbars)
-			topToolbars = null;
-		else if(comp == bottomToolbars)
-			bottomToolbars = null;
 		else if(comp == top)
 			top = null;
 		else if(comp == left)
@@ -141,12 +129,8 @@
 		Dimension _center = (center == null
 			? new Dimension(0,0)
 			: center.getPreferredSize());
-		Dimension _topToolbars = (topToolbars == null
-			? new Dimension(0,0)
-			: topToolbars.getPreferredSize());
-		Dimension _bottomToolbars = (bottomToolbars == null
-			? new Dimension(0,0)
-			: bottomToolbars.getPreferredSize());
+		Dimension _topToolbars = new Dimension(0,0);
+		Dimension _bottomToolbars = new Dimension(0,0);
 
 		prefSize.height = _top.height + _bottom.height + _center.height
 			+ _topButtons.height + _bottomButtons.height
@@ -177,12 +161,8 @@
 	{
 		Dimension size = parent.getSize();
 
-		Dimension _topToolbars = (topToolbars == null
-			? new Dimension(0,0)
-			: topToolbars.getPreferredSize());
-		Dimension _bottomToolbars = (bottomToolbars == null
-			? new Dimension(0,0)
-			: bottomToolbars.getPreferredSize());
+		Dimension _topToolbars = new Dimension(0,0);
+		Dimension _bottomToolbars = new Dimension(0,0);
 
 		int topButtonHeight = -1;
 		int bottomButtonHeight = -1;
@@ -404,29 +384,6 @@
 				_height); //}}}
 		}
 
-		//{{{ Position tool bars if they are managed by us
-		if(topToolbars != null)
-		{
-			topToolbars.setBounds(
-				leftButtonWidth + leftWidth,
-				topButtonHeight + topHeight,
-				size.width - leftWidth - rightWidth
-				- leftButtonWidth - rightButtonWidth,
-				_topToolbars.height);
-		}
-
-		if(bottomToolbars != null)
-		{
-			bottomToolbars.setBounds(
-				leftButtonWidth + leftWidth,
-				size.height - bottomHeight
-				- bottomButtonHeight
-				- _bottomToolbars.height,
-				size.width - leftWidth - rightWidth
-				- leftButtonWidth - rightButtonWidth,
-				_bottomToolbars.height);
-		} //}}}
-
 		//{{{ Position center (edit pane, or split pane)
 		if(center != null)
 		{

Modified: jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManager.java
===================================================================
--- jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManager.java	2008-08-04 12:24:03 UTC (rev 13177)
+++ jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManager.java	2008-08-04 15:05:57 UTC (rev 13178)
@@ -88,8 +88,6 @@
 	abstract public void showDockableWindow(String name);
 	abstract public void hideDockableWindow(String name);
 	abstract public JComponent floatDockableWindow(String name);
-	abstract public void setTopToolbars(JPanel toolbars);
-	abstract public void setBottomToolbars(JPanel toolbars);
 	public JComponent getDockable(String name)
 	{
 		return windows.get(name);

Modified: jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManagerImpl.java
===================================================================
--- jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManagerImpl.java	2008-08-04 12:24:03 UTC (rev 13177)
+++ jEdit/branches/docking_framework/org/gjt/sp/jedit/gui/DockableWindowManagerImpl.java	2008-08-04 15:05:57 UTC (rev 13178)
@@ -1352,14 +1352,4 @@
 			view.setLocationRelativeTo(parent);
 	}
 
-	@Override
-	public void setBottomToolbars(JPanel toolbars) {
-		add(toolbars, DockableLayout.BOTTOM_TOOLBARS, 0);		
-	}
-
-	@Override
-	public void setTopToolbars(JPanel toolbars) {
-		add(toolbars, DockableLayout.TOP_TOOLBARS, 0);		
-	}
-
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.