Ignore:
Timestamp:
2006-04-21T14:31:51+02:00 (18 years ago)
Author:
imi
Message:
  • added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

Location:
src/org/openstreetmap/josm/test
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • src/org/openstreetmap/josm/test/GpxWriterTest.java

    r71 r86  
    3131        @Bug(47)
    3232        public void testDeleteNewDoesReallyRemove() throws JDOMException, IOException {
    33                 ds.ways.iterator().next().setDeleted(true);
     33                ds.ways.iterator().next().delete(true);
    3434                root = reparse();
    3535                assertEquals("way has vanished and 3 trk (segments) left", 3, root.getChildren("trk", GPX).size());
     
    7777
    7878
    79         @Override
    80         protected void setUp() throws Exception {
     79        @Override protected void setUp() throws Exception {
    8180                super.setUp();
    8281                ds = DataSetTestCaseHelper.createCommon();
Note: See TracChangeset for help on using the changeset viewer.