Attachment 179048 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.txt (text/plain), 3.83 KB, created by Wojciech Galanciak

on 2010-09-16 12:29:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wojciech Galanciak

Created: 2010-09-16 12:29:03 EDT

Size: 3.83 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.7
>diff -u -r1.7 NonProxyHostsComposite.java
>--- src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java	7 Jul 2009 11:38:29 -0000	1.7
>+++ src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java	16 Sep 2010 16:26:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * Copyright (c) 2005, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -325,5 +325,21 @@
> 		String data[] = (String[]) hosts.toArray(new String[0]);
> 		ProxySelector.setBypassHosts(provider, data);
> 	}
>+	
>+	public void performDefaults() {
>+		String provider = getEditableProvider();
>+		Iterator it = bypassHosts.iterator();
>+		ArrayList hosts = new ArrayList();
>+		while (it.hasNext()) {
>+			ProxyBypassData data = (ProxyBypassData) it.next();
>+			if (data.getSource().equalsIgnoreCase(provider)) {
>+				hosts.add(data);
>+			}
>+		}
>+		bypassHosts.removeAll(hosts);
>+		bypassHosts.add(0, new ProxyBypassData("127.0.0.1", provider)); //$NON-NLS-1$
>+		bypassHosts.add(0, new ProxyBypassData("localhost", provider)); //$NON-NLS-1$
>+		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.4
>diff -u -r1.4 ProxyEntriesComposite.java
>--- src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java	7 Jul 2009 11:38:29 -0000	1.4
>+++ src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java	16 Sep 2010 16:26:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 IBM Corporation and others.
>+ * Copyright (c) 2008, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -299,5 +299,20 @@
> 		ProxyData data[] = (ProxyData[]) proxies.toArray(new ProxyData[0]);
> 		ProxySelector.setProxyData(provider, data);
> 	}
>+	
>+	public void performDefaults() {
>+		String provider = getEditableProvider();
>+		Iterator it = proxyEntries.iterator();
>+		while (it.hasNext()) {
>+			ProxyData data = (ProxyData) it.next();
>+			if (data.getSource().equals(provider)) {
>+				data.setHost(""); //$NON-NLS-1$
>+				data.setPort(-1);
>+				data.setUserid(null);
>+				data.setPassword(null);
>+			}
>+		}
>+		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.19
>diff -u -r1.19 ProxyPreferencePage.java
>--- src/org/eclipse/ui/internal/net/ProxyPreferencePage.java	10 Feb 2010 14:15:08 -0000	1.19
>+++ src/org/eclipse/ui/internal/net/ProxyPreferencePage.java	16 Sep 2010 16:26:50 -0000
>@@ -109,6 +109,8 @@
> 			index = 2;
> 		}
> 		providerCombo.select(index);
>+		proxyEntriesComposite.performDefaults();
>+		nonProxyHostsComposite.performDefaults();
> 		setProvider(ProxySelector.unlocalizeProvider(providerCombo.getItem(index)));
> 	}
>

Actions: View

Attachments on bug 283036: 177437 | 179048 | 181080