Changeset 12687 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2017-08-28T18:16:17+02:00 (8 years ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/io/IUploadDialog.java

    r9685 r12687  
    33
    44import java.util.Map;
     5
     6import org.openstreetmap.josm.io.UploadStrategySpecification;
    57
    68/**

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r12678 r12687  
    5757import org.openstreetmap.josm.gui.util.WindowGeometry;
    5858import org.openstreetmap.josm.io.OsmApi;
     59import org.openstreetmap.josm.io.UploadStrategy;
     60import org.openstreetmap.josm.io.UploadStrategySpecification;
    5961import org.openstreetmap.josm.tools.GBC;
    6062import org.openstreetmap.josm.tools.ImageOverlay;

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

    r12673 r12687  
    2323import org.openstreetmap.josm.io.OsmServerWriter;
    2424import org.openstreetmap.josm.io.OsmTransferException;
     25import org.openstreetmap.josm.io.UploadStrategySpecification;
    2526import org.openstreetmap.josm.tools.CheckParameterUtil;
    2627import org.openstreetmap.josm.tools.Logging;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r12494 r12687  
    1919import org.openstreetmap.josm.io.Capabilities;
    2020import org.openstreetmap.josm.io.OsmApi;
     21import org.openstreetmap.josm.io.UploadStrategySpecification;
    2122import org.openstreetmap.josm.tools.ImageProvider;
    2223

  • trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

    r12663 r12687  
    3131import org.openstreetmap.josm.gui.util.GuiHelper;
    3232import org.openstreetmap.josm.io.ChangesetClosedException;
     33import org.openstreetmap.josm.io.MaxChangesetSizeExceededPolicy;
    3334import org.openstreetmap.josm.io.MessageNotifier;
    3435import org.openstreetmap.josm.io.OsmApi;
    … …  
    3738import org.openstreetmap.josm.io.OsmTransferCanceledException;
    3839import org.openstreetmap.josm.io.OsmTransferException;
     40import org.openstreetmap.josm.io.UploadStrategySpecification;
    3941import org.openstreetmap.josm.tools.ImageProvider;
    4042import org.openstreetmap.josm.tools.Logging;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r12620 r12687  
    3535import org.openstreetmap.josm.gui.widgets.JosmTextField;
    3636import org.openstreetmap.josm.io.Capabilities;
     37import org.openstreetmap.josm.io.MaxChangesetSizeExceededPolicy;
    3738import org.openstreetmap.josm.io.OsmApi;
     39import org.openstreetmap.josm.io.UploadStrategy;
     40import org.openstreetmap.josm.io.UploadStrategySpecification;
    3841import org.openstreetmap.josm.tools.Logging;
    3942

  • trunk/src/org/openstreetmap/josm/io/MaxChangesetSizeExceededPolicy.java

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

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r11480 r12687  
    1717import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    1818import org.openstreetmap.josm.gui.JosmUserIdentityManager;
    19 import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
    2019import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    2120import org.openstreetmap.josm.gui.progress.ProgressMonitor;

  • trunk/src/org/openstreetmap/josm/io/UploadStrategy.java

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

  • trunk/src/org/openstreetmap/josm/io/UploadStrategySpecification.java

    r12686 r12687  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.io;
     2package org.openstreetmap.josm.io;
    33
    44import java.util.Objects;
    … …  
    1414 * <li>whether to close the changeset used after the upload</li>
    1515 * </ul>
     16 * @since 12687 (moved from {@code gui.io} package)
    1617 */
    1718public class UploadStrategySpecification {
Note: See TracChangeset for help on using the changeset viewer.