Ignore:
Timestamp:
2014-10-27T23:25:38+01:00 (9 years ago)
Author:
Don-vip
Message:

see #10668 - code refactoring to avoid hacks in merge-overlap plugin

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r6890 r7661  
    4444    private AutoCompletingTextField tfValue;
    4545    private JCheckBox cbTagRelations;
    46     private RelationMemberConflictResolverModel model;
     46    private final RelationMemberConflictResolverModel model;
    4747    private RelationMemberConflictResolverTable tblResolver;
    4848    private JMultilineLabel lblHeader;
    … …  
    5959        gc.insets = new Insets(5,5,5,5);
    6060        add(pnl, gc);
    61         model = new RelationMemberConflictResolverModel();
    6261
    6362        gc.gridy = 1;
    … …  
    118117    /**
    119118     * Constructs a new {@code RelationMemberConflictResolver}.
     119     * @param model model managing a list of conflicting relation members
     120     * @since 7661
    120121     */
    121     public RelationMemberConflictResolver() {
     122    public RelationMemberConflictResolver(RelationMemberConflictResolverModel model) {
     123        this.model = model;
    122124        build();
    123125    }
Note: See TracChangeset for help on using the changeset viewer.