Changeset 27101 in osm for applications/editors/josm/plugins/ColumbusCSV/src/org

Timestamp:

2011-11-20T13:43:31+01:00 (13 years ago)

Author:

oliverw

Message:

• Renamed DONT_ZOOM_AFTER_IMPORT to ZOOM_AFTER_IMPORT to avoid duplicate 'not'
• Enabled ZOOM_AFTER_IMPORT by default

Location:

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV

Files:

• ColumbusCSVImporter.java (modified) (2 diffs)
• ColumbusCSVPreferences.java (modified) (4 diffs)
• ColumbusCSVReader.java (modified) (1 diff)

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

@@ -46 +46 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.io.FileImporter#importData(java.io.File, org.openstreetmap.josm.gui.progress.ProgressMonitor)
+         */
         @Override
         public void importData(File file, ProgressMonitor progressMonitor)
@@ -80 +83 @@
 
                                 // ... and scale view appropriately - if wished by user
-                                if (!ColumbusCSVPreferences.dontZoom()) {
+                                if (ColumbusCSVPreferences.zoomAfterImport()) {
                                         AutoScaleAction action = new AutoScaleAction("data");
                                         action.autoScale();

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

@@ -41 +41 @@
          * Disable auto zoom after import.
          */
-        public static final String DONT_ZOOM_AFTER_IMPORT = PREFIX + "import.dontZoomAfterImport";
+        public static final String ZOOM_AFTER_IMPORT = PREFIX + "import.dontZoomAfterImport";
         /** 
          * If <tt>true</tt>, all DOP values (hdop, vdop, pdop) are ignored. If the V-900 runs in simple mode,
@@ -78 +78 @@
         public boolean ok() {
                 Main.pref.put(SHOW_SUMMARY, colCSVShowSummary.isSelected());
-                Main.pref.put(DONT_ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected());
+                Main.pref.put(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected());
                 Main.pref.put(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected());
                 Main.pref.put(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected());
@@ -107 +107 @@
          * @return
          */
-        public static boolean dontZoom() {
-                return Main.pref.getBoolean(DONT_ZOOM_AFTER_IMPORT, true);
+        public static boolean zoomAfterImport() {
+                return Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true);
         }
         
@@ -169 +169 @@
         // Apply settings
         colCSVShowSummary.setSelected(Main.pref.getBoolean(SHOW_SUMMARY, true));
-        colCSVDontZoomAfterImport.setSelected(Main.pref.getBoolean(DONT_ZOOM_AFTER_IMPORT, true));
+        colCSVDontZoomAfterImport.setSelected(Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true));
         colCSVIgnoreVDOP.setSelected(Main.pref.getBoolean(IGNORE_VDOP, false));
         colCSVWarnConversionErrors.setSelected(Main.pref.getBoolean(WARN_CONVERSION_ERRORS, true));

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

@@ -218 +218 @@
          * there is no other way to assign the audio files to way points.
          * 
-         * @param reader
+         * @param gpx
          * @return
          */