[Schmitzm-commits] r1502 - in trunk: schmitzm-core schmitzm-core/src/main/java/de/schmitzm/swing schmitzm-gt

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-02-17 14:27:28 +0100 (Thu, 17 Feb 2011)
New Revision: 1502

Modified:
   trunk/schmitzm-core/pom.xml
   trunk/schmitzm-core/src/main/java/de/schmitzm/swing/AtlasDialog.java
   trunk/schmitzm-gt/pom.xml
Log:
Upgrade Miglayer 3.7.4

Modified: trunk/schmitzm-core/pom.xml
===================================================================
--- trunk/schmitzm-core/pom.xml	2011-02-13 15:00:43 UTC (rev 1501)
+++ trunk/schmitzm-core/pom.xml	2011-02-17 13:27:28 UTC (rev 1502)
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.miglayout</groupId>
 			<artifactId>miglayout</artifactId>
-			<version>3.7.3</version>
+			<version>3.7.4</version> 
 			<classifier>swing</classifier>
 			<scope>compile</scope>
 		</dependency>

Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/swing/AtlasDialog.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/swing/AtlasDialog.java	2011-02-13 15:00:43 UTC (rev 1501)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/swing/AtlasDialog.java	2011-02-17 13:27:28 UTC (rev 1502)
@@ -12,9 +12,9 @@
 import javax.swing.JDialog;
 import javax.swing.JRootPane;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
+import de.schmitzm.lang.LangUtil;
 
 /**
  * A basic super class for atlas dialogs. It listens to the ESC key and calls
@@ -132,15 +132,40 @@
 	 * MigLayout hs troubles when Swing wraps HTML JLabels.. This is a bugfix
 	 */
 	public void pack() {
-		super.pack();
+		// super.pack();
+		// //
+		// SwingUtilities.invokeLater(new Runnable() {
+		//
+		// @Override
+		// public void run() {
+		// // boolean v = isVisible();
+		// // boolean m = isModal();
+		// // setModal(false);
+		// // setVisible(true);
+		// // LangUtil.sleepExceptionless(150);
+		// AtlasDialog.super.pack();
+		// // setVisible(v);
+		// // setModal(m);
+		// }
+		// });
 
-		SwingUtilities.invokeLater(new Runnable() {
+		// super.pack();
 
-			@Override
-			public void run() {
-				AtlasDialog.super.pack();
-			}
-		});
+		// boolean v = isVisible();
+		// boolean m = isModal();
+		// setModal(false);
+		// setVisible(true);
 
+		AtlasDialog.super.pack();
+
+		// TODO The next two lines are only needed if the LayoutManager is
+		// MigLayout and wrapped multi-line JLabels aer part
+		if (getContentPane().getLayout() instanceof MigLayout) {
+			LangUtil.sleepExceptionless(150);
+			AtlasDialog.super.pack();
+		}
+		// setVisible(v);
+		// setModal(m);
+
 	}
 }

Modified: trunk/schmitzm-gt/pom.xml
===================================================================
--- trunk/schmitzm-gt/pom.xml	2011-02-13 15:00:43 UTC (rev 1501)
+++ trunk/schmitzm-gt/pom.xml	2011-02-17 13:27:28 UTC (rev 1502)
@@ -121,7 +121,7 @@
 			<type>jar</type>
 			<scope>compile</scope>
 			<exclusions>
-				<!-- We use miglayout 3.7.3, not 3.7 -->
+				<!-- We use a newer miglayout from schmitzm, not 3.7 -->
 				<exclusion>
 					<groupId>com.miglayout</groupId>
 					<artifactId>miglayout</artifactId>