Changeset 30173 in osm for applications/editors/josm/plugins/print/src/org

Timestamp:

2014-01-02T17:51:00+01:00 (11 years ago)

Author:

donvip

Message:

[JOSM-print] remove useless code that no longer compiles with JOSM 6578

Location:

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print

Files:

• PrintDialog.java (modified) (2 diffs)
• PrintPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java

@@ -236 +236 @@
         caption = new JLabel(" 1 :");
         add(caption, std.grid(GBC.RELATIVE, row));
-        int mapScale = (int)Main.pref.getInteger("print.map-scale", PrintPlugin.DEF_MAP_SCALE);
+        int mapScale = Main.pref.getInteger("print.map-scale", PrintPlugin.DEF_MAP_SCALE);
         mapView.setFixedMapScale(mapScale);
         scaleModel = new SpinnerNumberModel(mapScale, 500, 5000000, 500);
@@ -265 +265 @@
         add(caption, std.grid(GBC.RELATIVE, row));
         resolutionModel = new SpinnerNumberModel(
-          (int)Main.pref.getInteger("print.resolution.dpi", PrintPlugin.DEF_RESOLUTION_DPI),
+          Main.pref.getInteger("print.resolution.dpi", PrintPlugin.DEF_RESOLUTION_DPI),
           30, 1200, 10 );
         final JSpinner resolutionField = new JSpinner(resolutionModel);

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPlugin.java

@@ -28 +28 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -80 +79 @@
 
         fileMenu.insertSeparator(pos);
-
-        /* Make this plugin's preferences known */
-        Main.pref.putDefault(
-          "print.map-scale", Integer.toString(DEF_MAP_SCALE));
-        Main.pref.putDefault(
-          "print.resolution.dpi", Integer.toString(DEF_RESOLUTION_DPI));
-        Main.pref.putDefault(
-          "print.attribution", AbstractOsmTileSource.DEFAULT_OSM_ATTRIBUTION);
-        Main.pref.putDefault(
-          "print.preview.enabled", new Boolean(false).toString());
 
         restorePrefs(); // Recover after crash if necessary
@@ -175 +164 @@
     
     /**
-     * Undo temporary adjustments to the preferences made by 
-     * adjustPrefs().
+     * Undo temporary adjustments to the preferences made by adjustPrefs().
      */
     public static void restorePrefs() {
@@ -201 +189 @@
         Main.pref.put(savedKey, null);
     }
-    
 }
-