[JavaAmp-CVS] javaamp/src Docker.java,1.4,1.5 EqualizerDialog.java,1.21,1.22 JavaAmp.java,1.24,1.25 PlayDialog.java,1.20,1.21 PlaylistDialog.java,1.28,1.29

[WiESi <wi...@us...>]

Update of /cvsroot/javaamp/javaamp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27010/src

Modified Files:
	Docker.java EqualizerDialog.java JavaAmp.java PlayDialog.java 
	PlaylistDialog.java 
Log Message:
Updated window docking

Index: Docker.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/Docker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Docker.java	11 Apr 2006 07:01:11 -0000	1.4
+++ Docker.java	11 Apr 2006 07:42:53 -0000	1.5
@@ -2,8 +2,13 @@
 
 public class Docker {
 	
-	public final static void dockScreen(Point o, Rectangle t,
-			GraphicsConfiguration gc) {
+	private static GraphicsConfiguration gc;
+	
+	public final static void init(GraphicsConfiguration graphicsConfig) {
+		gc = graphicsConfig;
+	}
+	
+	public final static void dockScreen(Point o, Rectangle t) {
 		int dd = Settings.dockingd;
 		Insets si = Toolkit.getDefaultToolkit().getScreenInsets(gc);
 		Dimension sd = Toolkit.getDefaultToolkit().getScreenSize();

Index: PlayDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PlayDialog.java	11 Apr 2006 07:01:11 -0000	1.20
+++ PlayDialog.java	11 Apr 2006 07:42:53 -0000	1.21
@@ -549,8 +549,7 @@
 			oh3 = owner.equalizerDialog.getLocation().y - oh;
 		}
 		Point p = new Point(ow, oh);
-		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()),
-			getGraphicsConfiguration());
+		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()));
 		if(!dockedPlaylist2 && owner.playlistDialog.isVisible())
 			dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(),
 				getHeight()), owner.playlistDialog.getBounds());
@@ -565,7 +564,7 @@
 			p = new Point(ow + ow2, oh + oh2);
 			Docker.dockScreen(p, new Rectangle(ow + ow2, oh + oh2,
 				owner.playlistDialog.getWidth(),
-				owner.playlistDialog.getHeight()), getGraphicsConfiguration());
+				owner.playlistDialog.getHeight()));
 			ow = p.x - ow2;
 			oh = p.y - oh2;
 		}
@@ -575,7 +574,7 @@
 			p = new Point(ow + ow3, oh + oh3);
 			Docker.dockScreen(p, new Rectangle(ow + ow3, oh + oh3,
 				owner.equalizerDialog.getWidth(),
-				owner.equalizerDialog.getHeight()), getGraphicsConfiguration());
+				owner.equalizerDialog.getHeight()));
 			ow = p.x - ow3;
 			oh = p.y - oh3;
 		}

Index: PlaylistDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- PlaylistDialog.java	11 Apr 2006 07:01:11 -0000	1.28
+++ PlaylistDialog.java	11 Apr 2006 07:42:53 -0000	1.29
@@ -538,8 +538,7 @@
 			oh = getLocation().y;
 		}
 		Point p = new Point(ow, oh);
-		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()),
-			getGraphicsConfiguration());
+		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()));
 		owner.playDialog.dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh,
 			getWidth(), getHeight()), owner.playDialog.getBounds());
 		ow = p.x;

Index: JavaAmp.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/JavaAmp.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- JavaAmp.java	11 Apr 2006 06:49:26 -0000	1.24
+++ JavaAmp.java	11 Apr 2006 07:42:53 -0000	1.25
@@ -23,6 +23,7 @@
 	
 	public JavaAmp() throws Exception {
 		GraphicsLoader.startLoading(this);
+		Docker.init(getGraphicsConfiguration());
 		
 		Runtime.getRuntime().addShutdownHook(new Thread() {
 			public void run() {

Index: EqualizerDialog.java
===================================================================
RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- EqualizerDialog.java	11 Apr 2006 07:01:11 -0000	1.21
+++ EqualizerDialog.java	11 Apr 2006 07:42:53 -0000	1.22
@@ -196,8 +196,7 @@
 			oh = getLocation().y;
 		}
 		Point p = new Point(ow, oh);
-		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()),
-			getGraphicsConfiguration());
+		Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()));
 		ow = p.x;
 		oh = p.y;
 		owner.playDialog.dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh,