Changeset 6881 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair
- Timestamp:
- 2014-02-24T17:49:12+01:00 (11 years ago)
- Location:
- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
r6264 r6881 60 60 } 61 61 62 /** 63 * Constructs a new {@code NodeListMergerTest}. 64 */ 62 65 public NodeListMergerTest() { 63 66 build(); … … 70 73 test.setVisible(true); 71 74 } 72 73 74 75 } -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
r5556 r6881 35 35 } 36 36 37 /** 38 * Constructs a new {@code PropertiesMergerTest}. 39 */ 37 40 public PropertiesMergerTest() { 38 41 build(); … … 45 48 app.setVisible(true); 46 49 } 47 48 50 } -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
r3034 r6881 39 39 } 40 40 41 /** 42 * Constructs a new {@code RelationMemberMergerTest}. 43 */ 41 44 public RelationMemberMergerTest() { 42 45 build(); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
r2041 r6881 6 6 import javax.swing.JFrame; 7 7 8 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;9 import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;10 11 8 public class TagMergerTest extends JFrame { 12 9 13 10 private TagMerger tagMerger; 14 11 15 12 protected void build() { 16 13 tagMerger = new TagMerger(); 17 14 getContentPane().setLayout(new BorderLayout()); 18 getContentPane().add(tagMerger, BorderLayout.CENTER); 15 getContentPane().add(tagMerger, BorderLayout.CENTER); 19 16 } 20 17 18 /** 19 * Constructs a new {@code TagMergerTest}. 20 */ 21 21 public TagMergerTest() { 22 22 build(); … … 29 29 } 30 30 } 31 31 32 32 public static void main(String args[]) { 33 33 TagMergerTest test = new TagMergerTest(); … … 35 35 test.setVisible(true); 36 36 } 37 38 37 }
Note:
See TracChangeset
for help on using the changeset viewer.