Context Navigation

Changeset 12687 in josm

Timestamp:

2017-08-28T18:16:17+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move UploadStrategySpecification and required enums from gui.io to io

Location:

trunk

Files:

r9685	r12687
3	3
4	4	import java.util.Map;
	5
	6	import org.openstreetmap.josm.io.UploadStrategySpecification;
5	7
6	8	/**

r12678	r12687
57	57	import org.openstreetmap.josm.gui.util.WindowGeometry;
58	58	import org.openstreetmap.josm.io.OsmApi;
	59	import org.openstreetmap.josm.io.UploadStrategy;
	60	import org.openstreetmap.josm.io.UploadStrategySpecification;
59	61	import org.openstreetmap.josm.tools.GBC;
60	62	import org.openstreetmap.josm.tools.ImageOverlay;

r12673	r12687
23	23	import org.openstreetmap.josm.io.OsmServerWriter;
24	24	import org.openstreetmap.josm.io.OsmTransferException;
	25	import org.openstreetmap.josm.io.UploadStrategySpecification;
25	26	import org.openstreetmap.josm.tools.CheckParameterUtil;
26	27	import org.openstreetmap.josm.tools.Logging;

r12494	r12687
19	19	import org.openstreetmap.josm.io.Capabilities;
20	20	import org.openstreetmap.josm.io.OsmApi;
	21	import org.openstreetmap.josm.io.UploadStrategySpecification;
21	22	import org.openstreetmap.josm.tools.ImageProvider;
22	23

-              r12663
+              r12687
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.ChangesetClosedException;
+import org.openstreetmap.josm.io.MaxChangesetSizeExceededPolicy;
 import org.openstreetmap.josm.io.MessageNotifier;
 import org.openstreetmap.josm.io.OsmApi;
 …
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;

-              r12620
+              r12687
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.Capabilities;
+import org.openstreetmap.josm.io.MaxChangesetSizeExceededPolicy;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.UploadStrategy;
+import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.tools.Logging;

-              r12686
+              r12687
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+package org.openstreetmap.josm.io;
 /**
  * This determines what to do when the max changeset size was exceeded by a upload.
+ * @since 12687 (moved from {@code gui.io} package)
  */
 public enum MaxChangesetSizeExceededPolicy {

r11480	r12687
17	17	import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
18	18	import org.openstreetmap.josm.gui.JosmUserIdentityManager;
19		~~import org.openstreetmap.josm.gui.io.UploadStrategySpecification;~~
20	19	import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
21	20	import org.openstreetmap.josm.gui.progress.ProgressMonitor;

-              r12686
+              r12687
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+package org.openstreetmap.josm.io;
 import static org.openstreetmap.josm.tools.I18n.tr;
 …
 /**
  * The chunk mode to use when uploading
+ * @since 12687 (moved from {@code gui.io} package)
  */
 public enum UploadStrategy {

-              r12686
+              r12687
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+package org.openstreetmap.josm.io;
 import java.util.Objects;
 …
  * <li>whether to close the changeset used after the upload</li>
  * </ul>
+ * @since 12687 (moved from {@code gui.io} package)
  */
 public class UploadStrategySpecification {

r11324	r12687
37	37	import org.openstreetmap.josm.data.osm.RelationMember;
38	38	import org.openstreetmap.josm.data.osm.Way;
39		~~import org.openstreetmap.josm.gui.io.UploadStrategy;~~
40		~~import org.openstreetmap.josm.gui.io.UploadStrategySpecification;~~
41	39	import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
42	40

r12673	r12687
39	39	import org.openstreetmap.josm.data.osm.Way;
40	40	import org.openstreetmap.josm.data.projection.Projections;
41		~~import org.openstreetmap.josm.gui.io.UploadStrategy;~~
42		~~import org.openstreetmap.josm.gui.io.UploadStrategySpecification;~~
43	41	import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
44	42	import org.openstreetmap.josm.tools.Logging;

r10962	r12687
10	10	import org.junit.Rule;
11	11	import org.junit.Test;
	12	import org.openstreetmap.josm.io.UploadStrategySpecification;
12	13	import org.openstreetmap.josm.testutils.JOSMTestRules;
13	14

r10962	r12687
9	9	import org.openstreetmap.josm.data.osm.DataSet;
10	10	import org.openstreetmap.josm.gui.layer.OsmDataLayer;
	11	import org.openstreetmap.josm.io.UploadStrategySpecification;
11	12	import org.openstreetmap.josm.testutils.JOSMTestRules;
12	13

r10962	r12687
6	6	import org.junit.Rule;
7	7	import org.junit.Test;
	8	import org.openstreetmap.josm.io.UploadStrategy;
	9	import org.openstreetmap.josm.io.UploadStrategySpecification;
8	10	import org.openstreetmap.josm.testutils.JOSMTestRules;
9	11

Note: See TracChangeset for help on using the changeset viewer.