Changeset 10622 in josm for trunk

Timestamp:

2016-07-24T13:19:12+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13198 - Add new flow layout that does the right height computation (patch by michael2402, modified) - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (5 diffs)
• src/org/openstreetmap/josm/tools/MultiLineFlowLayout.java (added)
• test/unit/org/openstreetmap/josm/tools/MultiLineFlowLayoutTest.java (added)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -60 +59 @@
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
+import org.openstreetmap.josm.tools.MultiLineFlowLayout;
 
 /**
@@ -166 +166 @@
 
         pnl.add(tpConfigPanels, GBC.eol().fill(GBC.HORIZONTAL));
+
+        pnl.add(buildActionPanel(), GBC.eol().fill(GBC.HORIZONTAL));
         return pnl;
     }
@@ -175 +177 @@
      */
     protected JPanel buildActionPanel() {
-        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
+        JPanel pnl = new JPanel(new MultiLineFlowLayout(FlowLayout.CENTER));
         pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
@@ -202 +204 @@
     protected void build() {
         setTitle(tr("Upload to ''{0}''", OsmApi.getOsmApi().getBaseUrl()));
-        getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(buildContentPanel(), BorderLayout.CENTER);
-        getContentPane().add(buildActionPanel(), BorderLayout.SOUTH);
+        setContentPane(buildContentPanel());
 
         addWindowListener(new WindowEventHandler());