Changeset 33577 in osm for applications/editors/josm

Timestamp:

2017-08-27T21:11:20+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12671

Location:

applications/editors/josm/plugins/ColumbusCSV

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (modified) (2 diffs)

applications/editors/josm/plugins/ColumbusCSV/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- Enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12671"/>
     
     <!-- Plugin meta data -->

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java

@@ -24 +24 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.importexport.FileImporter;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.FileImporter;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -89 +91 @@
         
                 // add layer to show way points
-                Main.getLayerManager().addLayer(gpxLayer);
+                MainApplication.getLayerManager().addLayer(gpxLayer);
         
                 progressMonitor.setTicksCount(3);
@@ -108 +110 @@
                         assert ml.data != null;
             
-                        Main.info("Layer: " + ml);
-                        Main.info("Data size: " + ml.data.size());
+                        Logging.info("Layer: " + ml);
+                        Logging.info("Data size: " + ml.data.size());
             
-                        Main.getLayerManager().addLayer(ml);
+                        MainApplication.getLayerManager().addLayer(ml);
                         if (ml.data.isEmpty()) {
-                            Main.warn("File contains no markers.");
+                                Logging.warn("File contains no markers.");
                         }
                     } catch (Exception exLayer) {
-                        Main.error(exLayer);
+                        Logging.error(exLayer);
                     }
                 } else {
-                    Main.warn("Option 'marker.makeautomarkers' is not set; audio marker layer is not created.");
+                        Logging.warn("Option 'marker.makeautomarkers' is not set; audio marker layer is not created.");
                 }
             } catch (Exception e) {
                 // catch and forward exception
-                Main.error(e);
+                Logging.error(e);
                 throw new IllegalDataException(e);
             } finally { // take care of monitor...

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java

@@ -55 +55 @@
      * Ui elements for each flag.
      */
-    private JCheckBox colCSVShowSummary = new JCheckBox(tr("Show summary after import"));
-    private JCheckBox colCSVDontZoomAfterImport = new JCheckBox(tr("Do not zoom after import"));
-    private JCheckBox colCSVIgnoreVDOP = new JCheckBox(tr("Ignore hdop/vdop/pdop entries"));
-    private JCheckBox colCSVWarnMissingAudio = new JCheckBox(tr("Warn on missing audio files"));
-    private JCheckBox colCSVWarnConversionErrors = new JCheckBox(tr("Warn on conversion errors"));
+    private final JCheckBox colCSVShowSummary = new JCheckBox(tr("Show summary after import"));
+    private final JCheckBox colCSVDontZoomAfterImport = new JCheckBox(tr("Do not zoom after import"));
+    private final JCheckBox colCSVIgnoreVDOP = new JCheckBox(tr("Ignore hdop/vdop/pdop entries"));
+    private final JCheckBox colCSVWarnMissingAudio = new JCheckBox(tr("Warn on missing audio files"));
+    private final JCheckBox colCSVWarnConversionErrors = new JCheckBox(tr("Warn on conversion errors"));
     
     /**
@@ -150 +150 @@
     }
 
+    @Override
     public boolean isExpert() {
         return false;

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java

@@ -34 +34 @@
 import java.util.zip.DataFormatException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -42 +41 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.IllegalDataException;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -293 +293 @@
             String nextVoxFile = String.format("vox%05d.wav", i + 1);
             if (!voxFiles.containsKey(voxFile)) {
-                Main.info("Found lost vox file " + voxFile);
+                Logging.info("Found lost vox file " + voxFile);
         
                 File f = getVoxFilePath(voxFile);
@@ -315 +315 @@
                 if (nearestWpt != null) {
                     if (addLinkToWayPoint(nearestWpt, "*" + voxFile + "*", f)) {
-                        Main.info(String.format(
+                        Logging.info(String.format(
                             "Linked file %s to position %s", voxFile,
                             nearestWpt.getCoor().toDisplayString()));
@@ -322 +322 @@
                         rescuedFiles++;
                     } else {
-                        Main.error(String.format("Could not link vox file %s due to invalid parameters.", voxFile));
+                        Logging.error(String.format("Could not link vox file %s due to invalid parameters.", voxFile));
                     }
                 }
@@ -442 +442 @@
         
                 if (!"V".equals(csvLine[1])) {
-                    Main.info("Rescued unlinked audio file " + voxFile);
+                    Logging.info("Rescued unlinked audio file " + voxFile);
                 }
                 voxFiles.put(voxFile, wpt);
@@ -449 +449 @@
                 wpt.attr.put(TYPE_TAG, "V");
             } else { // audio file not found -> issue warning
-                Main.error("File " + voxFile + " not found!");
+                Logging.error("File " + voxFile + " not found!");
                 String warnMsg = tr("Missing audio file") + ": " + voxFile;
-                Main.error(warnMsg);
+                Logging.error(warnMsg);
                 if (ColumbusCSVPreferences.warnMissingAudio()) {
                     ColumbusCSVUtils.showInfoMessage(warnMsg);
@@ -475 +475 @@
         } catch (ParseException ex) {
             dateConversionErrors++;
-            Main.error(ex);
+            Logging.error(ex);
         }
     

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java

@@ -25 +25 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -63 +63 @@
                 return Double.parseDouble(height);
             } catch (NumberFormatException e) {
-                Main.error(String.format(
+                Logging.error(String.format(
                         "Cannot parse double from '%s': %s", height, e
                                 .getMessage()));