Ignore:
Timestamp:
2017-08-27T15:19:09+02:00 (22 months ago)
Author:
Don-vip
Message:

see #15182 - move file importers/exporters from io package to gui.io.importexport package, as they rely heavily on GUI and are mainly used from Open/Save actions

Location:
trunk/src/org/openstreetmap/josm/gui/io/importexport
Files:
2 added
18 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/AllFormatsImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/FileExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/FileImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1616import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1717import org.openstreetmap.josm.gui.util.GuiHelper;
     18import org.openstreetmap.josm.io.IllegalDataException;
     19import org.openstreetmap.josm.io.ImportCancelException;
    1820import org.openstreetmap.josm.tools.Logging;
    1921import org.openstreetmap.josm.tools.Utils;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/GeoJSONExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1313import org.openstreetmap.josm.gui.layer.Layer;
    1414import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     15import org.openstreetmap.josm.io.GeoJSONWriter;
    1516
    1617/**
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    3434import org.openstreetmap.josm.gui.widgets.JosmTextArea;
    3535import org.openstreetmap.josm.gui.widgets.JosmTextField;
     36import org.openstreetmap.josm.io.Compression;
     37import org.openstreetmap.josm.io.GpxWriter;
    3638import org.openstreetmap.josm.tools.CheckParameterUtil;
    3739import org.openstreetmap.josm.tools.GBC;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1818import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1919import org.openstreetmap.josm.gui.util.GuiHelper;
     20import org.openstreetmap.josm.io.Compression;
     21import org.openstreetmap.josm.io.GpxReader;
    2022import org.openstreetmap.josm.tools.Logging;
    2123import org.xml.sax.SAXException;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/JpgImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1616import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
    1717import org.openstreetmap.josm.gui.progress.ProgressMonitor;
     18import org.openstreetmap.josm.io.IllegalDataException;
    1819
    1920/**
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/NMEAImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1616import org.openstreetmap.josm.gui.MainApplication;
    1717import org.openstreetmap.josm.gui.Notification;
     18import org.openstreetmap.josm.gui.io.importexport.GpxImporter.GpxImporterData;
    1819import org.openstreetmap.josm.gui.layer.GpxLayer;
    1920import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
    2021import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2122import org.openstreetmap.josm.gui.util.GuiHelper;
    22 import org.openstreetmap.josm.io.GpxImporter.GpxImporterData;
     23import org.openstreetmap.josm.io.Compression;
    2324import org.openstreetmap.josm.io.nmea.NmeaReader;
    2425
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/NoteExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1212import org.openstreetmap.josm.gui.layer.Layer;
    1313import org.openstreetmap.josm.gui.layer.NoteLayer;
     14import org.openstreetmap.josm.io.NoteWriter;
    1415import org.openstreetmap.josm.tools.Logging;
    1516
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/NoteImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1414import org.openstreetmap.josm.gui.layer.NoteLayer;
    1515import org.openstreetmap.josm.gui.progress.ProgressMonitor;
     16import org.openstreetmap.josm.io.Compression;
     17import org.openstreetmap.josm.io.NoteReader;
    1618import org.openstreetmap.josm.tools.Logging;
    1719import org.xml.sax.SAXException;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmBzip2Exporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmChangeImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1818import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1919import org.openstreetmap.josm.gui.util.GuiHelper;
     20import org.openstreetmap.josm.io.Compression;
     21import org.openstreetmap.josm.io.IllegalDataException;
     22import org.openstreetmap.josm.io.OsmChangeReader;
    2023import org.openstreetmap.josm.tools.Logging;
    2124
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1919import org.openstreetmap.josm.gui.layer.Layer;
    2020import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     21import org.openstreetmap.josm.io.Compression;
     22import org.openstreetmap.josm.io.OsmWriter;
     23import org.openstreetmap.josm.io.OsmWriterFactory;
    2124import org.openstreetmap.josm.tools.Logging;
    2225import org.openstreetmap.josm.tools.Utils;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmGzipExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1919import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2020import org.openstreetmap.josm.gui.util.GuiHelper;
     21import org.openstreetmap.josm.io.Compression;
     22import org.openstreetmap.josm.io.IllegalDataException;
     23import org.openstreetmap.josm.io.OsmReader;
    2124import org.openstreetmap.josm.tools.Logging;
    2225
    2326/**
    24  * File importer that reads *.osm data files. (main storage format for OSM data
    25  * in JOSM)
     27 * File importer that reads *.osm data files. (main storage format for OSM data in JOSM)
    2628 */
    2729public class OsmImporter extends FileImporter {
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/ValidatorErrorExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    1414import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1515import org.openstreetmap.josm.gui.layer.ValidatorLayer;
     16import org.openstreetmap.josm.io.ValidatorErrorWriter;
    1617import org.openstreetmap.josm.tools.Logging;
    1718
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerExporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import java.io.File;
  • trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerImporter.java

    r12670 r12671  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
     2package org.openstreetmap.josm.gui.io.importexport;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2020import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2121import org.openstreetmap.josm.gui.util.GuiHelper;
     22import org.openstreetmap.josm.io.IllegalDataException;
    2223import org.openstreetmap.josm.tools.CheckParameterUtil;
    2324
Note: See TracChangeset for help on using the changeset viewer.