harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r405122 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java: java/net/ProxySelector.java org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java org/apache/harmony/luni/net/NetUtil.java
Date Mon, 08 May 2006 18:24:23 GMT
Author: tellison
Date: Mon May  8 11:24:21 2006
New Revision: 405122

URL: http://svn.apache.org/viewcvs?rev=405122&view=rev
Log:
Generics uplift.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ProxySelector.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ProxySelector.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ProxySelector.java?rev=405122&r1=405121&r2=405122&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ProxySelector.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ProxySelector.java
Mon May  8 11:24:21 2006
@@ -106,7 +106,7 @@
 	 * @throws IllegalArgumentException
 	 *             If any argument is null.
 	 */
-	public abstract List select(URI uri);
+	public abstract List<Proxy> select(URI uri);
 
 	/**
 	 * If the connection can not be established to the proxy server, this method

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java?rev=405122&r1=405121&r2=405122&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
Mon May  8 11:24:21 2006
@@ -87,7 +87,7 @@
     private Proxy proxy = null;
 
     // the proxy list which is used to make the connection.
-    private List proxyList = null;
+    private List<Proxy> proxyList = null;
 
     // the current proxy which is used to make the connection.
     private Proxy currentProxy;
@@ -1142,7 +1142,7 @@
         // Use system-wide ProxySelect to select proxy list,
         // then try to connect via elements in the proxy list.
         if (null != proxy) {
-            proxyList = new ArrayList(1);
+            proxyList = new ArrayList<Proxy>(1);
             proxyList.add(proxy);
         } else {
             proxyList = NetUtil.getProxyList(uri);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java?rev=405122&r1=405121&r2=405122&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
Mon May  8 11:24:21 2006
@@ -88,7 +88,6 @@
 		if(null == selector){
 			return null;
 		}
-		List proxyList = selector.select(uri);
-    	return proxyList;
+		return selector.select(uri);
     }
 }



Mime
View raw message