[DebianGIS-dev] r1588 - packages/josm/trunk/debian/patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2008-05-20 20:07:25 +0000 (Tue, 20 May 2008)
New Revision: 1588

Added:
   packages/josm/trunk/debian/patches/50_sun.dpatch
Log:
New patch to try to make josm work despite use of non-standard Sun interface
Not enabled, because right now it doesn't work as expected


Added: packages/josm/trunk/debian/patches/50_sun.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/50_sun.dpatch	                        (rev 0)
+++ packages/josm/trunk/debian/patches/50_sun.dpatch	2008-05-20 20:07:25 UTC (rev 1588)
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_sun.dpatch by  <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpHandler.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpHandler.java	2008-05-10 21:47:30.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpHandler.java	2008-05-19 18:09:26.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ // This is also a java.net.URLStreamHandler
+ // Basically a copy of sun.net.www.protocol.http.Handler
+-public class MyHttpHandler extends sun.net.www.protocol.http.Handler  {
++public class MyHttpHandler extends gnu.java.net.protocol.http.Handler  {
+             protected String proxy;
+             protected int proxyPort;
+ 
+@@ -17,12 +17,12 @@
+                 proxyPort = -1;
+             }
+ 
+-            protected java.net.URLConnection openConnection(URL u)
++            public java.net.URLConnection openConnection(URL u)
+                     throws IOException {
+                 return openConnection(u, (Proxy) null);
+             }
+             public MyHttpHandler(String proxy, int port) {
+-                proxy = proxy;
++                this.proxy = proxy;
+                 proxyPort = port;
+             }
+   
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpURLConnection.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java	2008-05-10 21:47:30.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpURLConnection.java	2008-05-19 18:10:41.000000000 +0200
+@@ -6,10 +6,11 @@
+ import java.net.URL;
+ import java.net.Proxy;
+ 
+-public class MyHttpURLConnection extends sun.net.www.protocol.http.HttpURLConnection {
+-            protected MyHttpURLConnection(URL u, Proxy p, sun.net.www.protocol.http.Handler handler)
++public class MyHttpURLConnection extends gnu.java.net.protocol.http.HTTPURLConnection {
++            protected MyHttpURLConnection(URL u, Proxy p, gnu.java.net.protocol.http.Handler handler) throws IOException
+             {
+-              super(u,p,handler);
++              //super(u,p,handler);
++              super(u);
+             }
+ 
+ public synchronized OutputStream getOutputStream()


Property changes on: packages/josm/trunk/debian/patches/50_sun.dpatch
___________________________________________________________________
Name: svn:executable
   + *