Changeset 9548 in josm

Timestamp:

2016-01-20T08:46:24+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12405 - wrong JPanel initialization (regression from r9543)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTest.java (added)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -50 +50 @@
     protected final void build() {
         setLayout(new GridBagLayout());
-        JPanel pnl = new JPanel(new BorderLayout());
+        final JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(lblHeader = new JMultilineLabel(""));
         GridBagConstraints gc = new GridBagConstraints();
@@ -64 +64 @@
         gc.insets = new Insets(0, 0, 0, 0);
         add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc);
-        pnl = new JPanel(new BoxLayout(pnl, BoxLayout.Y_AXIS));
-        pnl.add(buildRoleEditingPanel());
-        pnl.add(buildTagRelationsPanel());
+
+        final JPanel pnl2 = new JPanel();
+        pnl2.setLayout(new BoxLayout(pnl2, BoxLayout.Y_AXIS));
+        pnl2.add(buildRoleEditingPanel());
+        pnl2.add(buildTagRelationsPanel());
         gc.gridy = 2;
         gc.weighty = 0.0;
         gc.fill = GridBagConstraints.HORIZONTAL;
-        add(pnl, gc);
+        add(pnl2, gc);
     }