diff options
Diffstat (limited to 'bundles/org.eclipse.ui.net')
15 files changed, 162 insertions, 150 deletions
diff --git a/bundles/org.eclipse.ui.net/.project b/bundles/org.eclipse.ui.net/.project index 3269c643e..e93f2213f 100644 --- a/bundles/org.eclipse.ui.net/.project +++ b/bundles/org.eclipse.ui.net/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.net.ui</name> + <name>org.eclipse.ui.net</name> <comment></comment> <projects> </projects> diff --git a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF index 13aa27687..e816d05c0 100644 --- a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF @@ -1,14 +1,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.net.ui; singleton:=true +Bundle-SymbolicName: org.eclipse.ui.net; singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.eclipse.net.internal.ui.Activator +Bundle-Activator: org.eclipse.ui.internal.net.Activator Bundle-Vendor: %PLUGIN_PROVIDER Bundle-Localization: plugin Require-Bundle: org.eclipse.ui;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", - org.eclipse.net.core;bundle-version="[1.0.0,2.0.0)" + org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.4, CDC-1.0/Foundation-1.0, diff --git a/bundles/org.eclipse.ui.net/plugin.xml b/bundles/org.eclipse.ui.net/plugin.xml index df8edd818..41881f288 100644 --- a/bundles/org.eclipse.ui.net/plugin.xml +++ b/bundles/org.eclipse.ui.net/plugin.xml @@ -6,9 +6,15 @@ <extension point="org.eclipse.ui.preferencePages"> <page id = "org.eclipse.net.ui.NetPreferences" - class = "org.eclipse.net.internal.ui.ProxyPreferencePage" + class = "org.eclipse.ui.internal.net.ProxyPreferencePage" category = "org.eclipse.ui.preferencePages.Workbench" name = "%PLUGIN_INTERNET_PREFERENCE_TITLE"/> </extension> + <extension + point="org.eclipse.core.net.authenticator"> + <authenticator + class="org.eclipse.ui.internal.net.auth.NetAuthenticator"> + </authenticator> + </extension> </plugin> diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NetUIMessages.java b/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NetUIMessages.java deleted file mode 100644 index b23bc4c45..000000000 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NetUIMessages.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2007 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. - *******************************************************************************/ -package org.eclipse.net.internal.ui; - -import org.eclipse.osgi.util.NLS; - -public final class NetUIMessages extends NLS { - - private static final String BUNDLE_NAME = "org.eclipse.net.internal.ui.messages";//$NON-NLS-1$ - - private NetUIMessages() { - // Do not instantiate - } - - public static String BUTTON_PREFERENCE_ADD; - public static String BUTTON_PREFERENCE_EDIT; - public static String BUTTON_PREFERENCE_REMOVE; - public static String InternetCategoryPage_0; - public static String InternetCategoryPage_1; -public static String ProxyPreferencePage_0; -public static String ProxyPreferencePage_1; - public static String ProxyPreferencePage_2; - public static String ProxyPreferencePage_22; -public static String ProxyPreferencePage_23; -public static String ProxyPreferencePage_24; -public static String ProxyPreferencePage_25; -public static String ProxyPreferencePage_26; -public static String ProxyPreferencePage_27; - public static String ProxyPreferencePage_3; -public static String ProxyPreferencePage_37; -public static String ProxyPreferencePage_38; -public static String ProxyPreferencePage_39; - public static String ProxyPreferencePage_4; - public static String ProxyPreferencePage_5; - public static String ProxyPreferencePage_6; - public static String ProxyPreferencePage_7; - public static String ProxyPreferencePage_8; - public static String ProxyPreferencePage_9; - public static String TITLE_PREFERENCE_HOSTS_DIALOG; - public static String LABEL_PREFERENCE_HOSTS_DIALOG; -public static String UserValidationDialog_0; -public static String UserValidationDialog_1; -public static String UserValidationDialog_2; -public static String UserValidationDialog_3; - - static { - NLS.initializeMessages(BUNDLE_NAME, NetUIMessages.class); - } -} diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/ui/NetUI.java b/bundles/org.eclipse.ui.net/src/org/eclipse/net/ui/NetUI.java deleted file mode 100644 index 575528524..000000000 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/ui/NetUI.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.net.ui; - -import java.net.Authenticator; - -import org.eclipse.net.core.*; -import org.eclipse.net.internal.ui.auth.NetAuthenticator; - -/** - * Provides access to the UI functionality associated with networking. - * <p> - * This class is not intended to be subclasses or instantiated by clients. - * @since 1.0 - */ -public final class NetUI { - - private NetUI() { - super(); - } - - /** - * Method to be called by the application to ensure that the Java system - * properties related to proxies are set along with the default {@link Authenticator}. - */ - public static void initialize() { - // Prime the core to set the system properties - NetCore.getProxyManager(); - // Set the authenticator - Authenticator.setDefault(new NetAuthenticator()); - } - -} diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/Activator.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java index 3ee6620ac..a1e4d2999 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/Activator.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java @@ -11,24 +11,26 @@ * -------- -------- ----------------------------------------------------------- * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. *******************************************************************************/ -package org.eclipse.net.internal.ui; +package org.eclipse.ui.internal.net; -import org.eclipse.net.ui.NetUI; +import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; /** * The activator class controls the plug-in life cycle */ -public class Activator extends AbstractUIPlugin -{ +public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.net.ui"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.ui.net"; //$NON-NLS-1$ // The shared instance private static Activator plugin; - + + private ServiceTracker tracker; + /** * The constructor */ @@ -36,31 +38,35 @@ public class Activator extends AbstractUIPlugin plugin = this; } - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Return the {@link IProxyService} or <code>null</code> if the service is + * not available. + * + * @return the {@link IProxyService} or <code>null</code> */ + public IProxyService getProxyService() { + return (IProxyService) tracker.getService(); + } + public void start(BundleContext context) throws Exception { super.start(context); - // TODO: Temporarily make this plug-in self initializing - NetUI.initialize(); + tracker = new ServiceTracker(getBundle().getBundleContext(), + IProxyService.class.getName(), null); + tracker.open(); } - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; + tracker.close(); } } diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java new file mode 100644 index 000000000..d768a1f7e --- /dev/null +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2000, 2007 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + * yyyymmdd bug Email and other contact information + * -------- -------- ----------------------------------------------------------- + * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. + *******************************************************************************/ +package org.eclipse.ui.internal.net; + +import org.eclipse.osgi.util.NLS; + +public final class NetUIMessages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.ui.internal.net.messages";//$NON-NLS-1$ + + private NetUIMessages() { + // Do not instantiate + } + + public static String BUTTON_PREFERENCE_ADD; + + public static String BUTTON_PREFERENCE_EDIT; + + public static String BUTTON_PREFERENCE_REMOVE; + + public static String InternetCategoryPage_0; + + public static String InternetCategoryPage_1; + + public static String ProxyPreferencePage_0; + + public static String ProxyPreferencePage_1; + + public static String ProxyPreferencePage_2; + + public static String ProxyPreferencePage_22; + + public static String ProxyPreferencePage_23; + + public static String ProxyPreferencePage_24; + + public static String ProxyPreferencePage_25; + + public static String ProxyPreferencePage_26; + + public static String ProxyPreferencePage_27; + + public static String ProxyPreferencePage_3; + + public static String ProxyPreferencePage_37; + + public static String ProxyPreferencePage_38; + + public static String ProxyPreferencePage_39; + + public static String ProxyPreferencePage_4; + + public static String ProxyPreferencePage_40; + + public static String ProxyPreferencePage_5; + + public static String ProxyPreferencePage_6; + + public static String ProxyPreferencePage_7; + + public static String ProxyPreferencePage_8; + + public static String ProxyPreferencePage_9; + + public static String TITLE_PREFERENCE_HOSTS_DIALOG; + + public static String LABEL_PREFERENCE_HOSTS_DIALOG; + + public static String UserValidationDialog_0; + + public static String UserValidationDialog_1; + + public static String UserValidationDialog_2; + + public static String UserValidationDialog_3; + + static { + NLS.initializeMessages(BUNDLE_NAME, NetUIMessages.class); + } +} diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsComposite.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java index 7d113b85d..948012e64 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsComposite.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java @@ -13,7 +13,7 @@ * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. *******************************************************************************/ -package org.eclipse.net.internal.ui; +package org.eclipse.ui.internal.net; import java.util.Arrays; import java.util.Iterator; diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsContentProvider.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsContentProvider.java index fa0691564..c0167b179 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsContentProvider.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsContentProvider.java @@ -12,7 +12,7 @@ * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. *******************************************************************************/ -package org.eclipse.net.internal.ui; +package org.eclipse.ui.internal.net; import java.util.Collection; diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsLabelProvider.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java index 5001dfb7f..8aeeae266 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/NonProxyHostsLabelProvider.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsLabelProvider.java @@ -12,7 +12,7 @@ * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. *******************************************************************************/ -package org.eclipse.net.internal.ui; +package org.eclipse.ui.internal.net; import org.eclipse.jface.viewers.ILabelProviderListener; diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/ProxyPreferencePage.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java index fb7c94427..544323aed 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/ProxyPreferencePage.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java @@ -13,18 +13,15 @@ * 20070201 154100 pmoogk@ca.ibm.com - Peter Moogk, Port internet code from WTP to Eclipse base. * 20070219 174674 pmoogk@ca.ibm.com - Peter Moogk *******************************************************************************/ -package org.eclipse.net.internal.ui; +package org.eclipse.ui.internal.net; +import org.eclipse.core.net.proxy.IProxyData; +import org.eclipse.core.net.proxy.IProxyService; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.net.core.IProxyData; -import org.eclipse.net.core.NetCore; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; @@ -57,6 +54,8 @@ public class ProxyPreferencePage extends PreferencePage implements Text password; + private IProxyService proxyService; + public ProxyPreferencePage() { super(NetUIMessages.ProxyPreferencePage_2); setPreferenceStore(Activator.getDefault().getPreferenceStore()); @@ -68,7 +67,13 @@ public class ProxyPreferencePage extends PreferencePage implements protected Control createContents(Composite parent) { - proxyData = NetCore.getProxyManager().getProxyData(); + proxyService = Activator.getDefault().getProxyService(); + if (proxyService == null) { + Label l = new Label(parent, SWT.NONE); + l.setText(NetUIMessages.ProxyPreferencePage_40); + return l; + } + proxyData = proxyService.getProxyData(); entryList = new Entry[proxyData.length]; Composite composite = new Composite(parent, SWT.NONE); @@ -203,13 +208,15 @@ public class ProxyPreferencePage extends PreferencePage implements entryList[0].hostname.addModifyListener( modifyListener ); entryList[0].port.addModifyListener( modifyListener ); - restoreState(NetCore.getProxyManager().isProxiesEnabled()); + restoreState(proxyService.isProxiesEnabled()); applyDialogFont(composite); return composite; } protected void performApply() { + if (proxyService == null) + return; boolean proxiesEnabled = manualProxyConfigurationButton.getSelection(); // Save the contents of the text fields to the proxy data. @@ -217,11 +224,11 @@ public class ProxyPreferencePage extends PreferencePage implements entryList[index].applyValues(); } - NetCore.getProxyManager().setProxiesEnabled(proxiesEnabled); + proxyService.setProxiesEnabled(proxiesEnabled); if (proxiesEnabled) { try { - NetCore.getProxyManager().setProxyData(proxyData); - NetCore.getProxyManager().setNonProxiedHosts( + proxyService.setProxyData(proxyData); + proxyService.setNonProxiedHosts( nonHostComposite.getList()); } catch (CoreException e) { ErrorDialog.openError(getShell(), null, null, e.getStatus()); @@ -267,7 +274,9 @@ public class ProxyPreferencePage extends PreferencePage implements directConnectionToButton.setSelection(!proxiesEnabled); manualProxyConfigurationButton.setSelection(proxiesEnabled); - String[] nonHostLists = NetCore.getProxyManager().getNonProxiedHosts(); + String[] nonHostLists = null; + if (proxyService != null) + nonHostLists = proxyService.getNonProxiedHosts(); this.nonHostComposite.setList(nonHostLists == null ? new String[] { "localhost", "127.0.0.1" } : nonHostLists); //$NON-NLS-1$ //$NON-NLS-2$ if (!proxiesEnabled) { diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/Authentication.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/Authentication.java index 0ad270e9b..c7d8a0bbb 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/Authentication.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/Authentication.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.net.internal.ui.auth; +package org.eclipse.ui.internal.net.auth; /** * Keeps user and password strings. diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/NetAuthenticator.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java index e32fc0f75..4f5dade17 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/NetAuthenticator.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.net.internal.ui.auth; +package org.eclipse.ui.internal.net.auth; import java.net.*; diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/UserValidationDialog.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java index 1c6eb5272..1328fdd73 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/auth/UserValidationDialog.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java @@ -8,17 +8,17 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.net.internal.ui.auth; +package org.eclipse.ui.internal.net.auth; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.net.internal.ui.NetUIMessages; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.net.NetUIMessages; /** * User authentication dialog diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/messages.properties b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties index e25fae0d8..dec3244ef 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/net/internal/ui/messages.properties +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties @@ -40,6 +40,7 @@ ProxyPreferencePage_27=Specifies the basic authentication password ProxyPreferencePage_37=&HTTP proxy: ProxyPreferencePage_38=&SSL proxy: ProxyPreferencePage_39=S&OCKS proxy: +ProxyPreferencePage_40=The proxy service is not available UserValidationDialog_0=Password Required UserValidationDialog_1=Connect to: {0} UserValidationDialog_2=&Password: |