Changeset 32046 in osm for applications/editors/josm

Timestamp:

2016-02-03T00:44:44+01:00 (9 years ago)

Author:

donvip

Message:

[josm_iodb] update to JOSM 9168 - use HttpClient

Location:

applications/editors/josm/plugins/imagery_offset_db

Files:

• build.xml (modified) (1 diff)
• src/iodb/OffsetDialog.java (modified) (10 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Imagery Offset Database"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7687"/>
+    <property name="plugin.main.version" value="9168"/>
         <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -15 +15 @@
 import java.awt.event.KeyEvent;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
@@ -41 +40 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -94 +93 @@
         calibrationBox.addActionListener(new ActionListener() {
             @Override
-                        public void actionPerformed( ActionEvent e ) {
+            public void actionPerformed( ActionEvent e ) {
                 Main.pref.put(PREF_CALIBRATION, calibrationBox.isSelected());
                 updateButtonPanel();
@@ -103 +102 @@
         deprecatedBox.addActionListener(new ActionListener() {
             @Override
-                        public void actionPerformed( ActionEvent e ) {
+            public void actionPerformed( ActionEvent e ) {
                 Main.pref.put(PREF_DEPRECATED, deprecatedBox.isSelected());
                 updateButtonPanel();
@@ -181 +180 @@
      */
     @Override
-        public void zoomChanged() {
+    public void zoomChanged() {
         for( Component c : buttonPanel.getComponents() ) {
             if( c instanceof OffsetDialogButton ) {
@@ -194 +193 @@
      */
     @Override
-        public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
+    public void paint( Graphics2D g, MapView mv, Bounds bbox ) {
         if( offsets == null )
             return;
@@ -237 +236 @@
      */
     @Override
-        public void actionPerformed( ActionEvent e ) {
+    public void actionPerformed( ActionEvent e ) {
         if( e.getSource() instanceof OffsetDialogButton ) {
             selectedOffset = ((OffsetDialogButton)e.getSource()).getOffset();
@@ -313 +312 @@
          */
         @Override
-                public void queryPassed() {
+        public void queryPassed() {
             offset.setDeprecated(new Date(), JosmUserIdentityManager.getInstance().getUserName(), "");
             updateButtonPanel();
@@ -330 +329 @@
 
         @Override
-                public void actionPerformed( ActionEvent e ) {
+        public void actionPerformed( ActionEvent e ) {
             String base = Main.pref.get("url.openstreetmap-wiki", "http://wiki.openstreetmap.org/wiki/");
             String lang = LanguageInfo.getWikiLanguagePrefix();
@@ -336 +335 @@
             try {
                 // this logic was snatched from {@link org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog.HelpAction}
-                HttpURLConnection conn = Utils.openHttpConnection(new URL(base + lang + page));
-                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 10) * 1000);
-                if( conn.getResponseCode() != 200 ) {
+                HttpClient.Response conn = HttpClient.create(new URL(base + lang + page), "HEAD").connect();
+                if (conn.getResponseCode() != 200) {
                     conn.disconnect();
                     lang = "";