Changeset 29854 in osm for applications/editors/josm/plugins/wms-turbo-challenge2

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/wms-turbo-challenge2

Files:

• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (2 diffs)
• src/wmsturbochallenge/FakeMapView.java (modified) (2 diffs)
• src/wmsturbochallenge/GameWindow.java (modified) (4 diffs)
• src/wmsturbochallenge/WMSRacer.java (modified) (3 diffs)

applications/editors/josm/plugins/wms-turbo-challenge2/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================
-** See README.template
-**
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="wms-turbo-challenge2" default="dist" basedir=".">
 
@@ -17 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4670"/>
+    <property name="plugin.main.version" value="6162"/>
 
     <property name="plugin.author" value="Andrzej Zaborowski"/>

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.MapView;
 
-class fake_map_view extends MapView {
+class FakeMapView extends MapView {
     public ProjectionBounds view_bounds;
     public MapView parent;
@@ -36 +36 @@
     public double max_east_west;
 
-    public fake_map_view(MapView parent, double scale) {
+    public FakeMapView(MapView parent, double scale) {
         super(null, null); //TODO MapView constructor contains registering listeners and other code, that probably shouldn't be called in fake map view
         this.parent = parent;

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java

@@ -62 +62 @@
 
         this.ground = ground;
-        ground_view = new fake_map_view(Main.map.mapView, 0.0000001);
+        ground_view = new FakeMapView(Main.map.mapView, 0.0000001);
 
         /* Retrieve start position */
@@ -474 +474 @@
     }
 
-    protected class sprite_pos implements Comparable {
+    protected class sprite_pos implements Comparable<sprite_pos> {
         double dist;
 
@@ -483 +483 @@
         }
 
-        public int compareTo(Object x) {
-            sprite_pos other = (sprite_pos) x;
-            return (int) ((other.dist - this.dist) * 1000000.0);
+        public int compareTo(sprite_pos x) {
+            return (int) ((x.dist - this.dist) * 1000000.0);
         }
     }
@@ -700 +699 @@
         }
     }
-    protected fake_map_view ground_view;
+    protected FakeMapView ground_view;
 }

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -95 +96 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (oldFrame != null)
-            oldFrame.mapView.removeLayerChangeListener(this);
+            MapView.removeLayerChangeListener(this);
 
         driveAction.frame = newFrame;
@@ -101 +102 @@
 
         if (newFrame != null)
-            newFrame.mapView.addLayerChangeListener(this);
+            MapView.addLayerChangeListener(this);
     }