Changeset 9548 in josm


Ignore:
Timestamp:
2016-01-20T08:46:24+01:00 (5 years ago)
Author:
Don-vip
Message:

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

Location:
trunk
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

    r9543 r9548  
    5050    protected final void build() {
    5151        setLayout(new GridBagLayout());
    52         JPanel pnl = new JPanel(new BorderLayout());
     52        final JPanel pnl = new JPanel(new BorderLayout());
    5353        pnl.add(lblHeader = new JMultilineLabel(""));
    5454        GridBagConstraints gc = new GridBagConstraints();
     
    6464        gc.insets = new Insets(0, 0, 0, 0);
    6565        add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc);
    66         pnl = new JPanel(new BoxLayout(pnl, BoxLayout.Y_AXIS));
    67         pnl.add(buildRoleEditingPanel());
    68         pnl.add(buildTagRelationsPanel());
     66
     67        final JPanel pnl2 = new JPanel();
     68        pnl2.setLayout(new BoxLayout(pnl2, BoxLayout.Y_AXIS));
     69        pnl2.add(buildRoleEditingPanel());
     70        pnl2.add(buildTagRelationsPanel());
    6971        gc.gridy = 2;
    7072        gc.weighty = 0.0;
    7173        gc.fill = GridBagConstraints.HORIZONTAL;
    72         add(pnl, gc);
     74        add(pnl2, gc);
    7375    }
    7476
Note: See TracChangeset for help on using the changeset viewer.