Ignore:
Timestamp:
2016-05-11T02:44:10+02:00 (8 years ago)
Author:
Don-vip
Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9548 r10179  
    4040public class RelationMemberConflictResolver extends JPanel {
    4141
    42     private AutoCompletingTextField tfRole;
    43     private AutoCompletingTextField tfKey;
    44     private AutoCompletingTextField tfValue;
     42    private final AutoCompletingTextField tfRole = new AutoCompletingTextField(10);
     43    private final AutoCompletingTextField tfKey = new AutoCompletingTextField(10);
     44    private final AutoCompletingTextField tfValue = new AutoCompletingTextField(10);
    4545    private JCheckBox cbTagRelations;
    4646    private final RelationMemberConflictResolverModel model;
    47     private RelationMemberConflictResolverTable tblResolver;
    48     private JMultilineLabel lblHeader;
     47    private final RelationMemberConflictResolverTable tblResolver;
     48    private final JMultilineLabel lblHeader = new JMultilineLabel("");
    4949
    5050    protected final void build() {
    5151        setLayout(new GridBagLayout());
    5252        final JPanel pnl = new JPanel(new BorderLayout());
    53         pnl.add(lblHeader = new JMultilineLabel(""));
     53        pnl.add(lblHeader);
    5454        GridBagConstraints gc = new GridBagConstraints();
    5555        gc.fill = GridBagConstraints.HORIZONTAL;
    … …  
    6363        gc.fill = GridBagConstraints.BOTH;
    6464        gc.insets = new Insets(0, 0, 0, 0);
    65         add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc);
     65        add(new JScrollPane(tblResolver), gc);
    6666
    6767        final JPanel pnl2 = new JPanel();
    … …  
    7878        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
    7979        pnl.add(new JLabel(tr("Role:")));
    80         pnl.add(tfRole = new AutoCompletingTextField(10));
     80        pnl.add(tfRole);
    8181        tfRole.setToolTipText(tr("Enter a role for all relation memberships"));
    8282        pnl.add(new JButton(new ApplyRoleAction()));
    … …  
    102102        pnl.add(cbTagRelations);
    103103        pnl.add(new JLabel(trc("tag", "Key:")));
    104         pnl.add(tfKey = new AutoCompletingTextField(10));
     104        pnl.add(tfKey);
    105105        tfKey.setToolTipText(tr("<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"));
    106106        pnl.add(new JLabel(tr("Value:")));
    107         pnl.add(tfValue = new AutoCompletingTextField(10));
     107        pnl.add(tfValue);
    108108        tfValue.setToolTipText(tr("<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"));
    109109        cbTagRelations.setSelected(false);
    … …  
    120120    public RelationMemberConflictResolver(RelationMemberConflictResolverModel model) {
    121121        this.model = model;
     122        this.tblResolver = new RelationMemberConflictResolverTable(model);
    122123        build();
    123124    }
Note: See TracChangeset for help on using the changeset viewer.