Attachment 181080 Details for Bug 283036 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch.txt (text/plain), 7.09 KB, created by Wojciech Galanciak

on 2010-10-18 06:53:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wojciech Galanciak

Created: 2010-10-18 06:53:34 EDT

Size: 7.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.net
>Index: src/org/eclipse/core/internal/net/PreferenceManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java,v
>retrieving revision 1.1
>diff -u -r1.1 PreferenceManager.java
>--- src/org/eclipse/core/internal/net/PreferenceManager.java	7 Oct 2010 11:24:26 -0000	1.1
>+++ src/org/eclipse/core/internal/net/PreferenceManager.java	18 Oct 2010 10:51:10 -0000
>@@ -64,6 +64,18 @@
> 	}
> 	
> 	/**
>+	 * Creates the preferences manager for the node defined by id
>+	 * in default scope.
>+	 * @param id node name for which node should be created in default scope 
>+	 * @return {@link PreferenceManager}
>+	 */
>+	public static PreferenceManager createDefaultManager(String id) {
>+		PreferenceManager manager = new PreferenceManager(id);
>+		manager.currentScope = manager.defaultScope;
>+		return manager;
>+	}
>+	
>+	/**
> 	 * Checks if preference migration was already performed.
> 	 * @return <code>boolean</code>
> 	 */
>Index: src/org/eclipse/core/internal/net/ProxyManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java,v
>retrieving revision 1.27
>diff -u -r1.27 ProxyManager.java
>--- src/org/eclipse/core/internal/net/ProxyManager.java	7 Oct 2010 11:24:26 -0000	1.27
>+++ src/org/eclipse/core/internal/net/ProxyManager.java	18 Oct 2010 10:51:10 -0000
>@@ -122,6 +122,22 @@
> 		System.arraycopy(nonProxiedHosts, 0, result, 0, nonProxiedHosts.length );
> 		return result;
> 	}
>+	
>+	public String[] getDefaultNonProxiedHosts() {
>+		checkMigrated();
>+		PreferenceManager defaultManager = PreferenceManager.createDefaultManager(Activator.ID);
>+		String[] defaultNonProxiedHosts = null;
>+		if (defaultNonProxiedHosts == null) {
>+			String prop = defaultManager.getString(PreferenceManager.ROOT, PREF_NON_PROXIED_HOSTS);
>+			defaultNonProxiedHosts = ProxyType.convertPropertyStringToHosts(prop);
>+		}
>+		if (defaultNonProxiedHosts.length == 0) {
>+			return defaultNonProxiedHosts;
>+		}
>+		String[] result = new String[defaultNonProxiedHosts.length];
>+		System.arraycopy(defaultNonProxiedHosts, 0, result, 0, defaultNonProxiedHosts.length);
>+		return result;
>+	}
> 
> 	public String[] getNativeNonProxiedHosts() {
> 		if (hasSystemProxies()) {
>@@ -169,6 +185,17 @@
> 		}
> 		return resolveType(result);
> 	}
>+	
>+	IProxyData[] getDefaultProxyData() {
>+		checkMigrated();
>+		PreferenceManager defaultManager = PreferenceManager.createDefaultManager(Activator.ID);
>+		IProxyData[] result = new IProxyData[proxies.length];
>+		for (int i = 0; i < proxies.length; i++) {
>+			ProxyType defaultType = new ProxyType(proxies[i].getName(), defaultManager);
>+			result[i] = defaultType.getProxyData(ProxyType.DO_NOT_VERIFY);
>+		}
>+		return resolveType(result);
>+	}
> 
> 	public IProxyData[] getNativeProxyData() {
> 		if (hasSystemProxies()) {
>Index: src/org/eclipse/core/internal/net/ProxySelector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java,v
>retrieving revision 1.6
>diff -u -r1.6 ProxySelector.java
>--- src/org/eclipse/core/internal/net/ProxySelector.java	2 Apr 2009 14:49:53 -0000	1.6
>+++ src/org/eclipse/core/internal/net/ProxySelector.java	18 Oct 2010 10:51:10 -0000
>@@ -157,4 +157,14 @@
> 		return false;
> 	}
> 
>+	public static ProxyData[] getDefaultProxyData() {
>+		ProxyManager manager = (ProxyManager) ProxyManager.getProxyManager();
>+		return castArray(manager.getDefaultProxyData());
>+	}
>+
>+	public static String[] getDefaultBypassHosts() {
>+		ProxyManager manager = (ProxyManager) ProxyManager.getProxyManager();
>+		return manager.getDefaultNonProxiedHosts();
>+	}
>+
> }
>#P org.eclipse.ui.net
>Index: src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java,v
>retrieving revision 1.9
>diff -u -r1.9 NonProxyHostsComposite.java
>--- src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java	8 Oct 2010 09:45:59 -0000	1.9
>+++ src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java	18 Oct 2010 10:51:11 -0000
>@@ -349,4 +349,22 @@
> 		return bypassProxyData;
> 	}
> 
>+	public void performDefaults() {
>+		bypassHosts.clear();
>+		String editableProvider = getEditableProvider();
>+		String providers[] = ProxySelector.getProviders();
>+		for (int i = 0; i < providers.length; i++) {
>+			if (providers[i].equals(editableProvider)) {
>+				String[] hosts = ProxySelector.getDefaultBypassHosts();
>+				for (int j = 0; hosts != null && j < hosts.length; j++) {
>+					ProxyBypassData data = new ProxyBypassData(hosts[j], editableProvider);
>+					bypassHosts.add(data);
>+				}
>+			} else {
>+				bypassHosts.addAll(getProxyBypassData(providers[i]));
>+			}
>+		}
>+		hostsViewer.refresh();
>+	}
>+
> }
>Index: src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java,v
>retrieving revision 1.5
>diff -u -r1.5 ProxyEntriesComposite.java
>--- src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java	20 Sep 2010 08:02:30 -0000	1.5
>+++ src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java	18 Oct 2010 10:51:11 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.ui.internal.net;
> 
> import java.util.ArrayList;
>+import java.util.Arrays;
> import java.util.Iterator;
> import java.util.List;
> 
>@@ -327,4 +328,22 @@
> 		}
> 		return proxyDatas;
> 	}
>+
>+	public void performDefaults() {
>+		proxyEntries.clear();
>+		String editableProvider = getEditableProvider();
>+		String providers[] = ProxySelector.getProviders();
>+		for (int i = 0; i < providers.length; i++) {
>+			if (providers[i].equals(editableProvider)) {
>+				ProxyData[] entries = ProxySelector.getDefaultProxyData();
>+				for (int j = 0; j < entries.length; j++) {
>+					entries[j].setSource(editableProvider);
>+				}
>+				proxyEntries.addAll(Arrays.asList(entries));
>+			} else {
>+				proxyEntries.addAll(getProxyData(providers[i]));
>+			}
>+		}
>+		entriesViewer.refresh();
>+	}
> }
>Index: src/org/eclipse/ui/internal/net/ProxyPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java,v
>retrieving revision 1.20
>diff -u -r1.20 ProxyPreferencePage.java
>--- src/org/eclipse/ui/internal/net/ProxyPreferencePage.java	20 Sep 2010 08:02:30 -0000	1.20
>+++ src/org/eclipse/ui/internal/net/ProxyPreferencePage.java	18 Oct 2010 10:51:11 -0000
>@@ -110,6 +110,8 @@
> 			index = 2;
> 		}
> 		providerCombo.select(index);
>+		proxyEntriesComposite.performDefaults();
>+		nonProxyHostsComposite.performDefaults();
> 		setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));
> 	}
>

Actions: View | Diff

Attachments on bug 283036: 177437 | 179048 | 181080