Changeset 30262 in osm for applications

Timestamp:

2014-02-05T21:39:01+01:00 (11 years ago)

Author:

donvip

Message:

[josm_geochat] repair plugin + fix edt violation (fix #josm9636)

Location:

applications/editors/josm/plugins/geochat

Files:

• . (modified) (1 prop)
• src/geochat/ChatServerConnection.java (modified) (2 diffs)
• src/geochat/GeoChatPanel.java (modified) (1 diff)

applications/editors/josm/plugins/geochat

@@ -1 +1 @@
 bin
+build

@@ -1 +1 @@
 bin
+build

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

@@ -402 +402 @@
                 try {
                         JsonObject msg = messages.getJsonObject(i);
-                    long id = msg.getJsonNumber("id").longValue();
-                    double lat = msg.getJsonNumber("lat").doubleValue();
-                    double lon = msg.getJsonNumber("lon").doubleValue();
-                    long timeStamp = msg.getJsonNumber("timestamp").longValue();
+                    long id = Long.parseLong(msg.getString("id"));
+                    double lat = Double.parseDouble(msg.getString("lat"));
+                    double lon = Double.parseDouble(msg.getString("lon"));
+                    long timeStamp = Long.parseLong(msg.getString("timestamp"));
                     String author = msg.getString("author");
                     String message = msg.getString("message");
@@ -428 +428 @@
                         JsonObject user = users.getJsonObject(i);
                     String name = user.getString("user");
-                    double lat = user.getJsonNumber("lat").doubleValue();
-                    double lon = user.getJsonNumber("lon").doubleValue();
+                    double lat = Double.parseDouble(user.getString("lat"));
+                    double lon = Double.parseDouble(user.getString("lon"));
                     result.put(name, new LatLon(lat, lon));
                 } catch( JsonException e ) {

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

@@ -226 +226 @@
         Main.pref.put("geochat.username", userName);
         if( gcPanel.getComponentCount() == 1 ) {
-            gcPanel.remove(0);
-            gcPanel.add(tabs, BorderLayout.CENTER);
-            gcPanel.add(input, BorderLayout.SOUTH);
+                GuiHelper.runInEDTAndWait(new Runnable() {
+                                @Override
+                                public void run() {
+                            gcPanel.remove(0);
+                            gcPanel.add(tabs, BorderLayout.CENTER);
+                            gcPanel.add(input, BorderLayout.SOUTH);
+                                }
+                        });
         }
         updateTitleAlarm();

@@ -1 +1 @@
 bin
+build