Changeset 6267 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
- Timestamp:
- 2013-09-27T13:38:15+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r6085 r6267 41 41 private JTable theirTable; 42 42 private final TagMergeModel model; 43 private JButton btnKeepMine;44 private JButton btnKeepTheir;45 43 AdjustmentSynchronizer adjustmentSynchronizer; 46 44 … … 173 171 KeepMineAction keepMineAction = new KeepMineAction(); 174 172 mineTable.getSelectionModel().addListSelectionListener(keepMineAction); 175 btnKeepMine = new JButton(keepMineAction);173 JButton btnKeepMine = new JButton(keepMineAction); 176 174 btnKeepMine.setName("button.keepmine"); 177 175 add(btnKeepMine, gc); … … 196 194 gc.weighty = 0.0; 197 195 KeepTheirAction keepTheirAction = new KeepTheirAction(); 198 btnKeepTheir = new JButton(keepTheirAction);196 JButton btnKeepTheir = new JButton(keepTheirAction); 199 197 btnKeepTheir.setName("button.keeptheir"); 200 198 add(btnKeepTheir, gc);
Note:
See TracChangeset
for help on using the changeset viewer.