Attachment #181080 for bug #283036

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




	}
	
	/**
	 * 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>
	 */




		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()) {

		}
		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()) {

Lines 157-160 Link Here

(-)src/org/eclipse/core/internal/net/ProxySelector.java (+10 lines)
157	return false;	157	return false;
158	}	158	}
159		159
		160	public static ProxyData[] getDefaultProxyData() {
		161	ProxyManager manager = (ProxyManager) ProxyManager.getProxyManager();
		162	return castArray(manager.getDefaultProxyData());
		163	}
		164
		165	public static String[] getDefaultBypassHosts() {
		166	ProxyManager manager = (ProxyManager) ProxyManager.getProxyManager();
		167	return manager.getDefaultNonProxiedHosts();
		168	}
		169
160	}	170	}




		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();
	}

}




package org.eclipse.ui.internal.net;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;


		}
		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();
	}
}

Lines 110-115 Link Here

(-)src/org/eclipse/ui/internal/net/ProxyPreferencePage.java (+2 lines)
110	index = 2;	110	index = 2;
111	}	111	}
112	providerCombo.select(index);	112	providerCombo.select(index);
		113	proxyEntriesComposite.performDefaults();
		114	nonProxyHostsComposite.performDefaults();
113	setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));	115	setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));
114	}	116	}
115		117

Return to bug 283036

Lines 122-127 Link Here

(-)src/org/eclipse/core/internal/net/ProxyManager.java (+27 lines)
122	System.arraycopy(nonProxiedHosts, 0, result, 0, nonProxiedHosts.length );	122	System.arraycopy(nonProxiedHosts, 0, result, 0, nonProxiedHosts.length );
123	return result;	123	return result;
124	}	124	}
		125
		126	public String[] getDefaultNonProxiedHosts() {
		127	checkMigrated();
		128	PreferenceManager defaultManager = PreferenceManager.createDefaultManager(Activator.ID);
		129	String[] defaultNonProxiedHosts = null;
		130	if (defaultNonProxiedHosts == null) {
		131	String prop = defaultManager.getString(PreferenceManager.ROOT, PREF_NON_PROXIED_HOSTS);
		132	defaultNonProxiedHosts = ProxyType.convertPropertyStringToHosts(prop);
		133	}
		134	if (defaultNonProxiedHosts.length == 0) {
		135	return defaultNonProxiedHosts;
		136	}
		137	String[] result = new String[defaultNonProxiedHosts.length];
		138	System.arraycopy(defaultNonProxiedHosts, 0, result, 0, defaultNonProxiedHosts.length);
		139	return result;
		140	}
125		141
126	public String[] getNativeNonProxiedHosts() {	142	public String[] getNativeNonProxiedHosts() {
127	if (hasSystemProxies()) {	143	if (hasSystemProxies()) {
Lines 169-174 Link Here
169	}	185	}
170	return resolveType(result);	186	return resolveType(result);
171	}	187	}
		188
		189	IProxyData[] getDefaultProxyData() {
		190	checkMigrated();
		191	PreferenceManager defaultManager = PreferenceManager.createDefaultManager(Activator.ID);
		192	IProxyData[] result = new IProxyData[proxies.length];
		193	for (int i = 0; i < proxies.length; i++) {
		194	ProxyType defaultType = new ProxyType(proxies[i].getName(), defaultManager);
		195	result[i] = defaultType.getProxyData(ProxyType.DO_NOT_VERIFY);
		196	}
		197	return resolveType(result);
		198	}
172		199
173	public IProxyData[] getNativeProxyData() {	200	public IProxyData[] getNativeProxyData() {
174	if (hasSystemProxies()) {	201	if (hasSystemProxies()) {

Lines 349-352 Link Here

(-)src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java (+18 lines)
349	return bypassProxyData;	349	return bypassProxyData;
350	}	350	}
351		351
		352	public void performDefaults() {
		353	bypassHosts.clear();
		354	String editableProvider = getEditableProvider();
		355	String providers[] = ProxySelector.getProviders();
		356	for (int i = 0; i < providers.length; i++) {
		357	if (providers[i].equals(editableProvider)) {
		358	String[] hosts = ProxySelector.getDefaultBypassHosts();
		359	for (int j = 0; hosts != null && j < hosts.length; j++) {
		360	ProxyBypassData data = new ProxyBypassData(hosts[j], editableProvider);
		361	bypassHosts.add(data);
		362	}
		363	} else {
		364	bypassHosts.addAll(getProxyBypassData(providers[i]));
		365	}
		366	}
		367	hostsViewer.refresh();
		368	}
		369
352	}	370	}

Lines 64-69 Link Here

(-)src/org/eclipse/core/internal/net/PreferenceManager.java (+12 lines)
64	}	64	}
65		65
66	/**	66	/**
		67	* Creates the preferences manager for the node defined by id
		68	* in default scope.
		69	* @param id node name for which node should be created in default scope
		70	* @return {@link PreferenceManager}
		71	*/
		72	public static PreferenceManager createDefaultManager(String id) {
		73	PreferenceManager manager = new PreferenceManager(id);
		74	manager.currentScope = manager.defaultScope;
		75	return manager;
		76	}
		77
		78	/**
67	* Checks if preference migration was already performed.	79	* Checks if preference migration was already performed.
68	* @return <code>boolean</code>	80	* @return <code>boolean</code>
69	*/	81	*/

Lines 11-16 Link Here

(-)src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java (+19 lines)
11	package org.eclipse.ui.internal.net;	11	package org.eclipse.ui.internal.net;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
		14	import java.util.Arrays;
14	import java.util.Iterator;	15	import java.util.Iterator;
15	import java.util.List;	16	import java.util.List;
16		17
Lines 327-330 Link Here
327	}	328	}
328	return proxyDatas;	329	return proxyDatas;
329	}	330	}
		331
		332	public void performDefaults() {
		333	proxyEntries.clear();
		334	String editableProvider = getEditableProvider();
		335	String providers[] = ProxySelector.getProviders();
		336	for (int i = 0; i < providers.length; i++) {
		337	if (providers[i].equals(editableProvider)) {
		338	ProxyData[] entries = ProxySelector.getDefaultProxyData();
		339	for (int j = 0; j < entries.length; j++) {
		340	entries[j].setSource(editableProvider);
		341	}
		342	proxyEntries.addAll(Arrays.asList(entries));
		343	} else {
		344	proxyEntries.addAll(getProxyData(providers[i]));
		345	}
		346	}
		347	entriesViewer.refresh();
		348	}
330	}	349	}