Changeset 12046 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
- Timestamp:
- 2017-05-03T14:07:20+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r11330 r12046 12 12 13 13 import javax.swing.ImageIcon; 14 import javax.swing.JComponent; 14 15 import javax.swing.JPanel; 16 import javax.swing.JScrollPane; 15 17 import javax.swing.JTabbedPane; 16 18 … … 98 100 propertiesMerger.setName("panel.propertiesmerger"); 99 101 propertiesMerger.getModel().addPropertyChangeListener(this); 100 tabbedPane.add(tr("Properties"), propertiesMerger);102 addTab(tr("Properties"), propertiesMerger); 101 103 102 104 tagMerger = new TagMerger(); 103 105 tagMerger.setName("panel.tagmerger"); 104 106 tagMerger.getModel().addPropertyChangeListener(this); 105 tabbedPane.add(tr("Tags"), tagMerger);107 addTab(tr("Tags"), tagMerger); 106 108 107 109 nodeListMerger = new NodeListMerger(); 108 110 nodeListMerger.setName("panel.nodelistmerger"); 109 111 nodeListMerger.getModel().addPropertyChangeListener(this); 110 tabbedPane.add(tr("Nodes"), nodeListMerger);112 addTab(tr("Nodes"), nodeListMerger); 111 113 112 114 relationMemberMerger = new RelationMemberMerger(); 113 115 relationMemberMerger.setName("panel.relationmembermerger"); 114 116 relationMemberMerger.getModel().addPropertyChangeListener(this); 115 tabbedPane.add(tr("Members"), relationMemberMerger);117 addTab(tr("Members"), relationMemberMerger); 116 118 117 119 setLayout(new BorderLayout()); … … 122 124 conflictResolvers.add(nodeListMerger); 123 125 conflictResolvers.add(relationMemberMerger); 126 } 127 128 private void addTab(String title, JComponent tabContent) { 129 JScrollPane scrollPanel = new JScrollPane(tabContent); 130 tabbedPane.add(title, scrollPanel); 124 131 } 125 132
Note:
See TracChangeset
for help on using the changeset viewer.