[vassalengine-svn] SF.net SVN: vassalengine:[5683] VASSAL-src/branches/uckelman-test/src/ VASSAL

[<uck...@us...>]

Revision: 5683
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5683&view=rev
Author:   uckelman
Date:     2009-05-31 15:09:38 +0000 (Sun, 31 May 2009)

Log Message:
-----------
Must put buttons all in the same cell to get platform-specific button order.

Modified Paths:
--------------
    VASSAL-src/branches/uckelman-test/src/VASSAL/editor/EditorDialog.java
    VASSAL-src/branches/uckelman-test/src/VASSAL/tools/BugDialog.java

Modified: VASSAL-src/branches/uckelman-test/src/VASSAL/editor/EditorDialog.java
===================================================================
--- VASSAL-src/branches/uckelman-test/src/VASSAL/editor/EditorDialog.java	2009-05-31 13:55:26 UTC (rev 5682)
+++ VASSAL-src/branches/uckelman-test/src/VASSAL/editor/EditorDialog.java	2009-05-31 15:09:38 UTC (rev 5683)
@@ -52,16 +52,18 @@
     setLayout(new MigLayout("insets dialog"));
     final JPanel panel = new JPanel(new MigLayout());
     add(panel, "spanx, push, grow");
-    add(closeButton, "tag ok");
+    add(closeButton, "split, tag ok");
     add(helpButton, "tag help");
 
     // populate the inner panel with Editors
     for (Editor e : editors) {
-      final Component[] comp = e.getComponents();
-      final String[] constraint = e.getConstraints();
+      final Component[][] comp = e.getComponents();
+      final String[][] constraint = e.getConstraints();
 
-      for (int i = 0; i < comp.length; ++i) {
-        panel.add(comp[i], constraint[i]);
+      for (int row = 0; row < comp.length; ++row) {
+        for (int col = 0; col < comp[row].length; ++col) {
+          panel.add(comp[row][col], constraint[row][col]);
+        }
       }
     }
   }

Modified: VASSAL-src/branches/uckelman-test/src/VASSAL/tools/BugDialog.java
===================================================================
--- VASSAL-src/branches/uckelman-test/src/VASSAL/tools/BugDialog.java	2009-05-31 13:55:26 UTC (rev 5682)
+++ VASSAL-src/branches/uckelman-test/src/VASSAL/tools/BugDialog.java	2009-05-31 15:09:38 UTC (rev 5683)
@@ -183,7 +183,7 @@
 
 // FIXME: tags don't push buttons to ends?
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(cancelButton, "tag cancel");
+    panel.add(cancelButton, "split, tag cancel");
     
     return panel;
   }
@@ -254,7 +254,7 @@
     );
 
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(sendButton, "tag ok");
+    panel.add(sendButton, "split, tag ok");
     panel.add(dontSendButton, "tag cancel");
     
     return panel;
@@ -302,7 +302,7 @@
     );
 
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(okButton, "tag ok");
+    panel.add(okButton, "split, tag ok");
     
     return panel;
   }
@@ -345,7 +345,7 @@
     );
 
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(okButton, "tag ok");
+    panel.add(okButton, "split, tag ok");
 
     return panel;
   }
@@ -395,7 +395,7 @@
     );
 
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(okButton, "tag ok");
+    panel.add(okButton, "split, tag ok");
 
     return panel;
   }
@@ -525,7 +525,7 @@
     );
 
     final JPanel panel = new JPanel(new MigLayout("align right"));
-    panel.add(cancelButton, "tag cancel");
+    panel.add(cancelButton, "split, tag cancel");
 
     return panel;
   }


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