Changeset 29846 in osm

Timestamp:

2013-08-19T11:11:40+02:00 (11 years ago)

Author:

donvip

Message:

[josm_print] fix #josm8980 - OSM attribution is outdated

Location:

applications/editors/josm/plugins/print

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5670"/>
+    <property name="plugin.main.version" value="6154"/>
 
     <property name="plugin.author" value="Kai Pastor"/>

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

@@ -55 +55 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
+import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SpinnerNumberModel;
@@ -63 +64 @@
 import javax.swing.event.DocumentListener;
 
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
@@ -275 +277 @@
 
         row++;
-        final javax.swing.JTextArea attributionText = new javax.swing.JTextArea(Main.pref.get("print.attribution", PrintPlugin.DEF_ATTRIBUTION));
+        final JTextArea attributionText = new JTextArea(Main.pref.get("print.attribution", AbstractOsmTileSource.DEFAULT_OSM_ATTRIBUTION));
         attributionText.setRows(10);
         attributionText.setLineWrap(true);

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;
@@ -55 +56 @@
 
     /**
-     * The default attribution text
-     */
-    public static final String DEF_ATTRIBUTION = 
-      "OSM Map data (c) OpenStreetMap contributors, CC-BY-SA";
-
-    /**
      * Adds the PrintPlugin to the GUI
      *
@@ -92 +87 @@
           "print.resolution.dpi", Integer.toString(DEF_RESOLUTION_DPI));
         Main.pref.putDefault(
-          "print.attribution", DEF_ATTRIBUTION);
+          "print.attribution", AbstractOsmTileSource.DEFAULT_OSM_ATTRIBUTION);
         Main.pref.putDefault(
           "print.preview.enabled", new Boolean(false).toString());

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

@@ -48 +48 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -325 +326 @@
      */
     public void paintMapAttribution(Graphics2D g2d, PageFormat pageFormat) {
-        String text = Main.pref.get("print.attribution", PrintPlugin.DEF_ATTRIBUTION);
+        String text = Main.pref.get("print.attribution", AbstractOsmTileSource.DEFAULT_OSM_ATTRIBUTION);
         
         if (text == null) {