Changeset 10111 in osm for applications/editors/josm/plugins/slippymap

Timestamp:

2008-08-24T16:37:05+02:00 (16 years ago)

Author:

stoecker

Message:

I18N, remove deprecated interface

Location:

applications/editors/josm/plugins/slippymap

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java (modified) (3 diffs)

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

@@ -49 +49 @@
   <target name="compile" depends="init">
     <echo message="creating ${plugin.jar}"/>
-    <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build" />
+    <javac srcdir="src" classpath="../../core/dist/josm-custom.jar" destdir="build">
+      <compilerarg value="-Xlint:deprecation"/>
+    </javac>
   </target>
   

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.slippymap;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -54 +56 @@
     public SlippyMapLayer()
     {
-        super("Slippy Map");
+        super(tr("Slippy Map"));
 
         clearTileStorage();
 
         tileOptionMenu = new JPopupMenu();
-        tileOptionMenu.add(new JMenuItem(new AbstractAction("Load Tile")
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Load Tile"))
         {
             public void actionPerformed(ActionEvent ae)
@@ -72 +74 @@
         }));
 
-        tileOptionMenu.add(new JMenuItem(new AbstractAction("Show Tile Status")
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Show Tile Status"))
         {
             public void actionPerformed(ActionEvent ae)
@@ -85 +87 @@
         }));
 
-        tileOptionMenu.add(new JMenuItem(new AbstractAction("Request Update")
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Request Update"))
         {
             public void actionPerformed(ActionEvent ae)
@@ -98 +100 @@
         }));
 
-        tileOptionMenu.add(new JMenuItem(new AbstractAction("Load All Tiles")
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Load All Tiles"))
         {
             public void actionPerformed(ActionEvent ae)
@@ -125 +127 @@
                 });
 
-                Main.map.mapView
-                        .addLayerChangeListener(new MapView.LayerChangeListener()
+                listeners.add(new LayerChangeListener()
                         {
                             public void activeLayerChange(Layer oldLayer,
@@ -324 +325 @@
                 if (tile.getImage() == null)
                 {
-                    g.drawString("image not loaded", p.x + 2, texty);
+                    g.drawString(tr("image not loaded"), p.x + 2, texty);
                     texty += 1 + fontHeight;
                 }
@@ -474 +475 @@
         if (key.startsWith(SlippyMapPreferences.PREFERENCE_PREFIX))
         {
-            System.err.println(this + ".preferenceChanged('" + key + "', '"
-                    + newValue + "') called");
+//            System.err.println(this + ".preferenceChanged('" + key + "', '"
+//                    + newValue + "') called");
 
             clearTileStorage();

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java

@@ -40 +40 @@
         for (int i = 0; i < allMapUrls.length; i++)
         {
-            System.err.println("Comparing '" + source + "' to '"
-                    + allMapUrls[i]);
+//            System.err.println("Comparing '" + source + "' to '"
+//                   + allMapUrls[i]);
 
             if (source.equals(allMapUrls[i]))

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.slippymap;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Image;
@@ -67 +69 @@
             BufferedReader in = new BufferedReader(new InputStreamReader(devc
                     .getInputStream()));
-            metadata = in.readLine();
+            metadata = tr(in.readLine());
         }
         catch (Exception ex)
         {
-            metadata = "error loading metadata";
+            metadata = tr("error loading metadata");
         }
 
@@ -85 +87 @@
             BufferedReader in = new BufferedReader(new InputStreamReader(devc
                     .getInputStream()));
-            metadata = "requested: " + in.readLine();
+            metadata = tr("requested: {0}", tr(in.readLine()));
         }
         catch (Exception ex)
         {
-            metadata = "error requesting update";
+            metadata = tr("error requesting update");
         }
     }