Changeset 29854 in osm for applications/editors/josm/plugins/geochat

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/geochat

Files:

• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (2 diffs)
• src/geochat/ChatMessage.java (modified) (2 diffs)
• src/geochat/ChatServerConnection.java (modified) (2 diffs)

applications/editors/josm/plugins/geochat/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="geochat" default="dist" basedir=".">
 
@@ -17 +5 @@
     <property name="commit.message" value="[josm_geochat] copypaste from keyboard, font size advanced parameters"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4666"/>
+    <property name="plugin.main.version" value="6162"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

applications/editors/josm/plugins/geochat/src/geochat/ChatMessage.java

@@ -10 +10 @@
  * @author zverik
  */
-public class ChatMessage implements Comparable {
+public class ChatMessage implements Comparable<ChatMessage> {
     private LatLon pos;
     private Date time;
@@ -96 +96 @@
     }
 
-    public int compareTo(Object o) {
-        long otherId = ((ChatMessage)o).id;
+    public int compareTo(ChatMessage o) {
+        long otherId = o.id;
         return otherId < id ? 1 : otherId == id ? 0 : 1;
     }

applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

@@ -1 +1 @@
 // License: WTFPL
 package geochat;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
-import java.util.logging.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -15 +23 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**