Changeset 34512 in osm for applications

Timestamp:

2018-08-18T17:21:22+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/geochat

Files:

• build.xml (modified) (1 diff)
• src/geochat/ChatPaneManager.java (modified) (2 diffs)
• src/geochat/ChatServerConnection.java (modified) (8 diffs)
• src/geochat/GeoChatPanel.java (modified) (7 diffs)
• src/geochat/JsonQueryUtil.java (modified) (2 diffs)

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

@@ -5 +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="12840"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

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

@@ -23 +23 @@
 import javax.swing.text.StyleConstants;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -155 +155 @@
         chatPane.setEditable(false);
         Font font = chatPane.getFont();
-        float size = Main.pref.getInt("geochat.fontsize", -1);
+        float size = Config.getPref().getInt("geochat.fontsize", -1);
         if (size < 6)
             size += font.getSize2D();

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

@@ -19 +19 @@
 import javax.json.JsonObject;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -88 +89 @@
      */
     public void autoLogin(final String userName) {
-        final int uid = Main.pref.getInt("geochat.lastuid", 0);
+        final int uid = Config.getPref().getInt("geochat.lastuid", 0);
         if (uid <= 0) {
             if (userName != null && userName.length() > 1)
@@ -173 +174 @@
         this.userId = userId;
         this.userName = userName;
-        Main.pref.putInt("geochat.lastuid", userId);
+        Config.getPref().putInt("geochat.lastuid", userId);
         for (ChatServerConnectionListener listener : listeners) {
             listener.loggedIn(userName);
@@ -182 +183 @@
         ChatServerConnection.this.userId = 0;
         ChatServerConnection.this.userName = null;
-        Main.pref.put("geochat.lastuid", null);
+        Config.getPref().put("geochat.lastuid", null);
         for (ChatServerConnectionListener listener : listeners) {
             listener.notLoggedIn(null);
@@ -280 +281 @@
         if (getCurrentZoom() < 10)
             return null;
-        Projection proj = Main.getProjection();
+        Projection proj = ProjectionRegistry.getProjection();
         return proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
     }
@@ -328 +329 @@
         @Override
         public void run() {
-            //            lastId = Main.pref.getLong("geochat.lastid", 0);
-            int interval = Main.pref.getInt("geochat.interval", 2);
+            //            lastId = Config.getPref().getLong("geochat.lastid", 0);
+            int interval = Config.getPref().getInt("geochat.interval", 2);
             while (!stopping) {
                 process();
@@ -362 +363 @@
                 // reset messages
                 lastId = 0;
-                //                Main.pref.put("geochat.lastid", null);
+                //                Config.getPref().put("geochat.lastid", null);
                 needReset = true;
             } else
@@ -413 +414 @@
                 }
             }
-            //                    if (lastId > 0 && Main.pref.getBoolean("geochat.store.lastid", true) )
-            //                        Main.pref.putLong("geochat.lastid", lastId);
+            //                    if (lastId > 0 && Config.getPref().getBoolean("geochat.store.lastid", true) )
+            //                        Config.getPref().putLong("geochat.lastid", lastId);
         }
 

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

@@ -34 +34 @@
 import javax.swing.SwingConstants;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.UserIdentityManager;
@@ -44 +43 @@
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -96 +96 @@
         connection = ChatServerConnection.getInstance();
         connection.addListener(this);
-        boolean autoLogin = Main.pref.get("geochat.username", null) == null ? false : Main.pref.getBoolean("geochat.autologin", true);
+        boolean autoLogin = Config.getPref().get("geochat.username", null) == null ? false : Config.getPref().getBoolean("geochat.autologin", true);
         connection.autoLoginWithDelay(autoLogin ? defaultUserName : null);
         updateTitleAlarm();
@@ -102 +102 @@
 
     private String constructUserName() {
-        String userName = Main.pref.get("geochat.username", null); // so the default is null
+        String userName = Config.getPref().get("geochat.username", null); // so the default is null
         if (userName == null)
             userName = UserIdentityManager.getInstance().getUserName();
@@ -131 +131 @@
         nameField.setPreferredSize(new Dimension(nameField.getPreferredSize().width, loginButton.getPreferredSize().height));
 
-        final JCheckBox autoLoginBox = new JCheckBox(tr("Enable autologin"), Main.pref.getBoolean("geochat.autologin", true));
+        final JCheckBox autoLoginBox = new JCheckBox(tr("Enable autologin"), Config.getPref().getBoolean("geochat.autologin", true));
         autoLoginBox.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Main.pref.putBoolean("geochat.autologin", autoLoginBox.isSelected());
+                Config.getPref().putBoolean("geochat.autologin", autoLoginBox.isSelected());
             }
         });
@@ -153 +153 @@
     public void destroy() {
         try {
-            if (Main.pref.getBoolean("geochat.logout.on.close", true)) {
+            if (Config.getPref().getBoolean("geochat.logout.on.close", true)) {
                 connection.removeListener(this);
                 connection.bruteLogout();
@@ -257 +257 @@
     @Override
     public void loggedIn(String userName) {
-        Main.pref.put("geochat.username", userName);
+        Config.getPref().put("geochat.username", userName);
         if (gcPanel.getComponentCount() == 1) {
             GuiHelper.runInEDTAndWait(new Runnable() {

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

@@ -13 +13 @@
 import javax.json.JsonObject;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -32 +32 @@
     public static JsonObject query(String query) throws IOException {
         try {
-            String serverURL = Main.pref.get("geochat.server", "https://zverik.dev.openstreetmap.org/osmochat.php?action=");
+            String serverURL = Config.getPref().get("geochat.server", "https://zverik.dev.openstreetmap.org/osmochat.php?action=");
             URL url = new URL(serverURL + query);
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();