Changeset 12673 in josm for trunk

Timestamp:

2017-08-27T17:24:14+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move CyclicUploadDependencyException from actions.upload to data.osm (used in data.APIDataSet)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/APIDataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/CyclicUploadDependencyException.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java ) (2 diffs)
• src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/APIDataSetTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java ) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.ExtendedDialog;

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -15 +15 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.IPrimitive;

trunk/src/org/openstreetmap/josm/data/osm/CyclicUploadDependencyException.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions.upload;
+package org.openstreetmap.josm.data.osm;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -9 +9 @@
 import java.util.Stack;
 
-import org.openstreetmap.josm.data.osm.Relation;
-
 /**
  * This is an exception that is thrown if the user attempts to upload a list of relations with a cyclic dependency in them
+ * @since 12673 (moved from {@code action.upload} package)
  */
 public class CyclicUploadDependencyException extends Exception {

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -9 +9 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.IPrimitive;

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -27 +27 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;

trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.osm;
+package org.openstreetmap.josm.data;
 
 import static org.junit.Assert.assertEquals;
@@ -11 +11 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
-import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.JOSMTestRules;