Attachment #109299 for bug #240856

View | Details | Raw Unified | Return to bug 240856
Collapse All | Expand All

Lines 262-269 Link Here

(-)src/org/eclipse/ui/internal/net/ProxyPreferencePage.java (-2 / +2 lines)
262	}	262	}
263		263
264	protected void performDefaults() {	264	protected void performDefaults() {
265	directConnectionToButton.setSelection(true);	265	directConnectionToButton.setSelection(false);
266	systemProxyConfigurationButton.setSelection(false);	266	systemProxyConfigurationButton.setSelection(true);
267	manualProxyConfigurationButton.setSelection(false);	267	manualProxyConfigurationButton.setSelection(false);
268	useSameProxyButton.setSelection(false);	268	useSameProxyButton.setSelection(false);
269	enableProxyAuth.setSelection(false);	269	enableProxyAuth.setSelection(false);





	private boolean internalIsProxiesEnabled() {
		return Activator.getInstance().getPreferences().getBoolean(
				PREF_ENABLED, true);
	}

	/* (non-Javadoc)

		}
		
		// migrate proxy data
		boolean proxiesEnabled = netConfigurationPrefs.getBoolean(PREF_ENABLED, true);
		for (int i = 0; i < proxies.length; i++) {
			ProxyType type = proxies[i];
			IProxyData data = type.getProxyData(ProxyType.DO_NOT_VERIFY);

	public void preferenceChange(PreferenceChangeEvent event) {
		if (event.getKey().equals(PREF_ENABLED) || event.getKey().equals(PREF_OS)) {
			checkMigrated();
			internalSetEnabled(Activator.getInstance().getPreferences().getBoolean(PREF_ENABLED, true),
					Activator.getInstance().getPreferences().getBoolean(PREF_OS, true));
		}
	}


	public boolean isSystemProxiesEnabled() {
		checkMigrated();
		return Activator.getInstance().getPreferences().getBoolean(PREF_OS,
				true);
	}

	public void setSystemProxiesEnabled(boolean enabled) {

Return to bug 240856

Lines 218-224 Link Here

(-)src/org/eclipse/core/internal/net/ProxyManager.java (-5 / +5 lines)
218		218
219	private boolean internalIsProxiesEnabled() {	219	private boolean internalIsProxiesEnabled() {
220	return Activator.getInstance().getPreferences().getBoolean(	220	return Activator.getInstance().getPreferences().getBoolean(
221	PREF_ENABLED, false);	221	PREF_ENABLED, true);
222	}	222	}
223		223
224	/* (non-Javadoc)	224	/* (non-Javadoc)
Lines 412-418 Link Here
412	}	412	}
413		413
414	// migrate proxy data	414	// migrate proxy data
415	boolean proxiesEnabled = netConfigurationPrefs.getBoolean(PREF_ENABLED, false);	415	boolean proxiesEnabled = netConfigurationPrefs.getBoolean(PREF_ENABLED, true);
416	for (int i = 0; i < proxies.length; i++) {	416	for (int i = 0; i < proxies.length; i++) {
417	ProxyType type = proxies[i];	417	ProxyType type = proxies[i];
418	IProxyData data = type.getProxyData(ProxyType.DO_NOT_VERIFY);	418	IProxyData data = type.getProxyData(ProxyType.DO_NOT_VERIFY);
Lines 496-503 Link Here
496	public void preferenceChange(PreferenceChangeEvent event) {	496	public void preferenceChange(PreferenceChangeEvent event) {
497	if (event.getKey().equals(PREF_ENABLED) \|\| event.getKey().equals(PREF_OS)) {	497	if (event.getKey().equals(PREF_ENABLED) \|\| event.getKey().equals(PREF_OS)) {
498	checkMigrated();	498	checkMigrated();
499	internalSetEnabled(Activator.getInstance().getPreferences().getBoolean(PREF_ENABLED, false),	499	internalSetEnabled(Activator.getInstance().getPreferences().getBoolean(PREF_ENABLED, true),
500	Activator.getInstance().getPreferences().getBoolean(PREF_OS, false));	500	Activator.getInstance().getPreferences().getBoolean(PREF_OS, true));
501	}	501	}
502	}	502	}
503		503
Lines 508-514 Link Here
508	public boolean isSystemProxiesEnabled() {	508	public boolean isSystemProxiesEnabled() {
509	checkMigrated();	509	checkMigrated();
510	return Activator.getInstance().getPreferences().getBoolean(PREF_OS,	510	return Activator.getInstance().getPreferences().getBoolean(PREF_OS,
511	false);	511	true);
512	}	512	}
513		513
514	public void setSystemProxiesEnabled(boolean enabled) {	514	public void setSystemProxiesEnabled(boolean enabled) {