Changeset 12673 in josm
- Timestamp:
- 2017-08-27T17:24:14+02:00 (7 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java
r12365 r12673 18 18 import org.openstreetmap.josm.Main; 19 19 import org.openstreetmap.josm.data.APIDataSet; 20 import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException; 20 21 import org.openstreetmap.josm.data.osm.Relation; 21 22 import org.openstreetmap.josm.gui.ExtendedDialog; -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r12374 r12673 15 15 import java.util.stream.Stream; 16 16 17 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;18 17 import org.openstreetmap.josm.data.conflict.ConflictCollection; 18 import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException; 19 19 import org.openstreetmap.josm.data.osm.DataSet; 20 20 import org.openstreetmap.josm.data.osm.IPrimitive; -
trunk/src/org/openstreetmap/josm/data/osm/CyclicUploadDependencyException.java
r12672 r12673 1 1 // License: GPL. For details, see LICENSE file. 2 package org.openstreetmap.josm. actions.upload;2 package org.openstreetmap.josm.data.osm; 3 3 4 4 import static org.openstreetmap.josm.tools.I18n.tr; … … 9 9 import java.util.Stack; 10 10 11 import org.openstreetmap.josm.data.osm.Relation;12 13 11 /** 14 12 * This is an exception that is thrown if the user attempts to upload a list of relations with a cyclic dependency in them 13 * @since 12673 (moved from {@code action.upload} package) 15 14 */ 16 15 public class CyclicUploadDependencyException extends Exception { -
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r12663 r12673 9 9 import java.util.Set; 10 10 11 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;12 11 import org.openstreetmap.josm.data.APIDataSet; 13 12 import org.openstreetmap.josm.data.osm.Changeset; 13 import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException; 14 14 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 15 15 import org.openstreetmap.josm.data.osm.IPrimitive; -
trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
r11324 r12673 27 27 import org.openstreetmap.josm.JOSMFixture; 28 28 import org.openstreetmap.josm.Main; 29 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;30 29 import org.openstreetmap.josm.data.APIDataSet; 31 30 import org.openstreetmap.josm.data.coor.LatLon; 32 31 import org.openstreetmap.josm.data.osm.Changeset; 32 import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException; 33 33 import org.openstreetmap.josm.data.osm.DataSet; 34 34 import org.openstreetmap.josm.data.osm.Node; -
trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java
r12672 r12673 1 1 // License: GPL. For details, see LICENSE file. 2 package org.openstreetmap.josm.data .osm;2 package org.openstreetmap.josm.data; 3 3 4 4 import static org.junit.Assert.assertEquals; … … 11 11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;14 import org.openstreetmap.josm.data.APIDataSet;15 13 import org.openstreetmap.josm.data.conflict.ConflictCollection; 14 import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException; 15 import org.openstreetmap.josm.data.osm.DataSet; 16 import org.openstreetmap.josm.data.osm.Node; 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 18 import org.openstreetmap.josm.data.osm.Relation; 19 import org.openstreetmap.josm.data.osm.RelationMember; 20 import org.openstreetmap.josm.data.osm.Way; 16 21 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 22
Note:
See TracChangeset
for help on using the changeset viewer.