bug 256081: [Net] Remove unnecessary API from IProxyData

4 files changed, 15 insertions, 9 deletions

diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java
index ee7a83e58..8c143d270 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java
@@ -56,19 +56,25 @@ public class ProxySelector {
 		}
 	}
 
-	public static IProxyData[] getProxyData(String provider) {
+	public static ProxyData[] getProxyData(String provider) {
 		ProxyManager manager = (ProxyManager) ProxyManager.getProxyManager();
 		if (provider.equals(DIRECT_PROVIDER)) {
-			return new IProxyData[0];
+			return new ProxyData[0];
 		} else if (provider.equals(ECLIPSE_PROVIDER)) {
-			return manager.getProxyData();
+			return castArray(manager.getProxyData());
 		} else if (provider.equals(NATIVE_PROVIDER)) {
-			return manager.getNativeProxyData();
+			return castArray(manager.getNativeProxyData());
 		}
 		throw new IllegalArgumentException("Provider not supported"); //$NON-NLS-1$
 	}
 
-	public static void setProxyData(String provider, IProxyData proxies[]) {
+	private static ProxyData[] castArray(IProxyData data[]) {
+		ProxyData[] ret = new ProxyData[data.length];
+		System.arraycopy(data, 0, ret, 0, data.length);
+		return ret;
+	}
+
+	public static void setProxyData(String provider, ProxyData proxies[]) {
 		if (provider.equals(ECLIPSE_PROVIDER)) {
 			IProxyService service = ProxyManager.getProxyManager();
 			try {
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java
index 4c44efc66..9a98c6f92 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java
@@ -153,7 +153,7 @@ public final class ProxyProviderUtil {
 
 	private static IProxyData createProxy(String scheme, String host, int port) {
 		String type = resolveProxyType(scheme);
-		IProxyData proxy = new ProxyData(type);
+		ProxyData proxy = new ProxyData(type);
 		proxy.setHost(host);
 		proxy.setPort(port);
 		proxy.setSource("WINDOWS_IE"); //$NON-NLS-1$
@@ -224,7 +224,7 @@ public final class ProxyProviderUtil {
 		String hostname = getHostname(pacHostnameAndPort);
 		if (hostname != null) {
 			int port = getPort(pacHostnameAndPort);
-			IProxyData proxy = new ProxyData(proxyType);
+			ProxyData proxy = new ProxyData(proxyType);
 			proxy.setHost(hostname);
 			proxy.setPort(port);
 			proxy.setSource("WINDOWS_IE"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java
index f6b6c2b21..2184fdccd 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java
@@ -107,7 +107,7 @@ public class StaticProxyConfig {
 			return new IProxyData[0];
 		}
 		IProxyData[] data = new IProxyData[KNOWN_TYPES.length];
-		IProxyData universal = (IProxyData) universalProxies.get(0);
+		ProxyData universal = (ProxyData) universalProxies.get(0);
 		for (int i = 0; i < KNOWN_TYPES.length; i++) {
 			ProxyData newData = new ProxyData(KNOWN_TYPES[i], universal
 					.getHost(), universal.getPort(), universal
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java
index 50082622e..05a284d42 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java
@@ -107,7 +107,7 @@ public class WinHttpProxyProvider {
 		if (!tryPac && wpadAutoConfigUrl == null)
 			return new IProxyData[0];
 
-		IProxyData data = new ProxyData(IProxyData.HTTP_PROXY_TYPE, "", -1, //$NON-NLS-1$
+		ProxyData data = new ProxyData(IProxyData.HTTP_PROXY_TYPE, "", -1, //$NON-NLS-1$
 				false, "WINDOWS_IE"); //$NON-NLS-1$
 		data.setDynamic(true);
 		return new IProxyData[] { data };