source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java@ 2512

Last change on this file since 2512 was 2512, checked in by stoecker, 14 years ago

i18n updated, fixed files to reduce problems when applying patches, fix #4017

File size: 2.3 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.gui.conflict.pair.relation;
3
4import java.util.logging.Logger;
5
6import javax.swing.JScrollPane;
7import javax.swing.JTable;
8
9import org.openstreetmap.josm.data.osm.Relation;
10import org.openstreetmap.josm.data.osm.RelationMember;
11import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
12
13/**
14 * A UI component for resolving conflicts in the member lists of two {@see Relation}
15 */
16public class RelationMemberMerger extends ListMerger<RelationMember> {
17 private static final Logger logger = Logger.getLogger(RelationMemberMerger.class.getName());
18
19 @Override
20 protected JScrollPane buildMyElementsTable() {
21 myEntriesTable = new JTable(
22 model.getMyTableModel(),
23 new RelationMemberListColumnModel(),
24 model.getMySelectionModel()
25 );
26 myEntriesTable.setName("table.mynodes");
27 myEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
28 return embeddInScrollPane(myEntriesTable);
29 }
30
31 @Override
32 protected JScrollPane buildMergedElementsTable() {
33 mergedEntriesTable = new JTable(
34 model.getMergedTableModel(),
35 new RelationMemberListColumnModel(),
36 model.getMergedSelectionModel()
37 );
38 mergedEntriesTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
39 mergedEntriesTable.setName("table.mergednodes");
40 mergedEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
41 return embeddInScrollPane(mergedEntriesTable);
42 }
43
44 @Override
45 protected JScrollPane buildTheirElementsTable() {
46 theirEntriesTable = new JTable(
47 model.getTheirTableModel(),
48 new RelationMemberListColumnModel(),
49 model.getTheirSelectionModel()
50 );
51 theirEntriesTable.setName("table.theirnodes");
52 theirEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
53 return embeddInScrollPane(theirEntriesTable);
54 }
55
56 public void populate(Relation my, Relation their) {
57 RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
58 model.populate(my,their);
59 }
60
61 public RelationMemberMerger() {
62 super(new RelationMemberListMergeModel());
63 }
64}
Note: See TracBrowser for help on using the repository browser.