Changeset 12673 in josm


Ignore:
Timestamp:
2017-08-27T17:24:14+02:00 (4 weeks ago)
Author:
Don-vip
Message:

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

Location:
trunk
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

    r12365 r12673  
    1818import org.openstreetmap.josm.Main;
    1919import org.openstreetmap.josm.data.APIDataSet;
     20import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
    2021import org.openstreetmap.josm.data.osm.Relation;
    2122import org.openstreetmap.josm.gui.ExtendedDialog;
  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r12374 r12673  
    1515import java.util.stream.Stream;
    1616
    17 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
    1817import org.openstreetmap.josm.data.conflict.ConflictCollection;
     18import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
    1919import org.openstreetmap.josm.data.osm.DataSet;
    2020import org.openstreetmap.josm.data.osm.IPrimitive;
  • trunk/src/org/openstreetmap/josm/data/osm/CyclicUploadDependencyException.java

    r12672 r12673  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.actions.upload;
     2package org.openstreetmap.josm.data.osm;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    99import java.util.Stack;
    1010
    11 import org.openstreetmap.josm.data.osm.Relation;
    12 
    1311/**
    1412 * 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)
    1514 */
    1615public class CyclicUploadDependencyException extends Exception {
  • trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

    r12663 r12673  
    99import java.util.Set;
    1010
    11 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
    1211import org.openstreetmap.josm.data.APIDataSet;
    1312import org.openstreetmap.josm.data.osm.Changeset;
     13import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
    1414import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
    1515import org.openstreetmap.josm.data.osm.IPrimitive;
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r11324 r12673  
    2727import org.openstreetmap.josm.JOSMFixture;
    2828import org.openstreetmap.josm.Main;
    29 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
    3029import org.openstreetmap.josm.data.APIDataSet;
    3130import org.openstreetmap.josm.data.coor.LatLon;
    3231import org.openstreetmap.josm.data.osm.Changeset;
     32import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
    3333import org.openstreetmap.josm.data.osm.DataSet;
    3434import org.openstreetmap.josm.data.osm.Node;
  • trunk/test/unit/org/openstreetmap/josm/data/APIDataSetTest.java

    r12672 r12673  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.data.osm;
     2package org.openstreetmap.josm.data;
    33
    44import static org.junit.Assert.assertEquals;
     
    1111import org.junit.Rule;
    1212import org.junit.Test;
    13 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
    14 import org.openstreetmap.josm.data.APIDataSet;
    1513import org.openstreetmap.josm.data.conflict.ConflictCollection;
     14import org.openstreetmap.josm.data.osm.CyclicUploadDependencyException;
     15import org.openstreetmap.josm.data.osm.DataSet;
     16import org.openstreetmap.josm.data.osm.Node;
     17import org.openstreetmap.josm.data.osm.OsmPrimitive;
     18import org.openstreetmap.josm.data.osm.Relation;
     19import org.openstreetmap.josm.data.osm.RelationMember;
     20import org.openstreetmap.josm.data.osm.Way;
    1621import org.openstreetmap.josm.testutils.JOSMTestRules;
    1722
Note: See TracChangeset for help on using the changeset viewer.