Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 283036 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java (-1 / +7 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2005, 2009 IBM Corporation and others.
2
 * Copyright (c) 2005, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 325-329 Link Here
325
		String data[] = (String[]) hosts.toArray(new String[0]);
325
		String data[] = (String[]) hosts.toArray(new String[0]);
326
		ProxySelector.setBypassHosts(provider, data);
326
		ProxySelector.setBypassHosts(provider, data);
327
	}
327
	}
328
	
329
	public void performDefaults() {
330
		// TODO restore default settings for bypasses
331
		bypassHosts.clear();
332
		initializeValues();
333
	}
328
334
329
}
335
}
(-)src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java (-1 / +16 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2008, 2009 IBM Corporation and others.
2
 * Copyright (c) 2008, 2010 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 299-303 Link Here
299
		ProxyData data[] = (ProxyData[]) proxies.toArray(new ProxyData[0]);
299
		ProxyData data[] = (ProxyData[]) proxies.toArray(new ProxyData[0]);
300
		ProxySelector.setProxyData(provider, data);
300
		ProxySelector.setProxyData(provider, data);
301
	}
301
	}
302
	
303
	public void performDefaults() {
304
		String provider = getEditableProvider();
305
		Iterator it = proxyEntries.iterator();
306
		while (it.hasNext()) {
307
			ProxyData data = (ProxyData) it.next();
308
			if (data.getSource().equals(provider)) {
309
				data.setHost(""); //$NON-NLS-1$
310
				data.setPort(-1);
311
				data.setUserid(null);
312
				data.setPassword(null);
313
			}
314
		}
315
		entriesViewer.refresh();
316
	}
302
317
303
}
318
}
(-)src/org/eclipse/ui/internal/net/ProxyPreferencePage.java (+2 lines)
Lines 109-114 Link Here
109
			index = 2;
109
			index = 2;
110
		}
110
		}
111
		providerCombo.select(index);
111
		providerCombo.select(index);
112
		proxyEntriesComposite.performDefaults();
113
		nonProxyHostsComposite.performDefaults();
112
		setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));
114
		setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));
113
	}
115
	}
114
116

Return to bug 283036