diff options
author | Andrey Loskutov | 2016-10-29 09:44:31 +0000 |
---|---|---|
committer | Andrey Loskutov | 2016-11-04 20:18:25 +0000 |
commit | a114e221df58ed0106dc903ce3ff1aeb28da617f (patch) | |
tree | 39b5d2f9229ece8e09cb5e6565f5aa90fc8ac3bf | |
parent | 8ccd7fa0fae6e89d9a4d5df1c7165ba0112d4d59 (diff) | |
download | eclipse.platform.team-a114e221df58ed0106dc903ce3ff1aeb28da617f.tar.gz eclipse.platform.team-a114e221df58ed0106dc903ce3ff1aeb28da617f.tar.xz eclipse.platform.team-a114e221df58ed0106dc903ce3ff1aeb28da617f.zip |
Bug 506732 - cleanup trailing spaces in *.net plugins
Change-Id: I1c73f095df443cd039ae944d85ab03bc14cb392b
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
31 files changed, 269 insertions, 269 deletions
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/AbstractProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/AbstractProxyProvider.java index c9cbf0513..a3a002c09 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/AbstractProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/AbstractProxyProvider.java @@ -23,7 +23,7 @@ public abstract class AbstractProxyProvider { /** * Returns proxies to use with the given URI. Returns empty array * when there is no appropriate proxy. - * + * * @param uri * the URI that a connection is required to * @return an array of proxies for the given URI diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java index 4b692f444..1a5980987 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Activator.java @@ -54,11 +54,11 @@ public class Activator implements BundleActivator { private BundleContext bundleContext; private ServiceTracker instanceLocationTracker; - + private ServiceRegistration debugRegistration; private ServiceRegistration proxyService; - + private PreferenceManager preferenceManger; /** @@ -71,7 +71,7 @@ public class Activator implements BundleActivator { /** * Returns the instance of this plugin. - * + * * @return the singleton instance of this plug-in class */ static public Activator getInstance() { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Policy.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Policy.java index e73c1a99a..244a8b5c7 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Policy.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/Policy.java @@ -16,7 +16,7 @@ import org.eclipse.osgi.service.debug.DebugOptions; import org.eclipse.osgi.service.debug.DebugOptionsListener; public class Policy { - + // general debug flag public static boolean DEBUG = false; @@ -32,7 +32,7 @@ public class Policy { /** * Print a debug message to the console. Pre-pend the message with the * current date and the name of the current thread. - * + * * @param message */ public static void debug(String message) { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java index 10d720514..a47dd5085 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceInitializer.java @@ -18,7 +18,7 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; public class PreferenceInitializer extends AbstractPreferenceInitializer { - + private static final int DEFAULT_PREF_PROXY_PORT = -1; private static final boolean DEFAULT_PREF_PROXY_HAS_AUTH = false; private static final boolean DEFAULT_PREF_ENABLED = true; @@ -33,19 +33,19 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { node.put(ProxyManager.PREF_NON_PROXIED_HOSTS, DEFAULT_PREF_NON_PROXIED_HOSTS); node.putBoolean(ProxyManager.PREF_ENABLED, DEFAULT_PREF_ENABLED); node.putBoolean(ProxyManager.PREF_OS, DEFAULT_PREF_OS); - + Preferences type = node.node(ProxyType.PREF_PROXY_DATA_NODE).node(IProxyData.HTTP_PROXY_TYPE); type.putInt(ProxyType.PREF_PROXY_PORT, DEFAULT_PREF_PROXY_PORT); type.putBoolean(ProxyType.PREF_PROXY_HAS_AUTH, DEFAULT_PREF_PROXY_HAS_AUTH); - + type = node.node(ProxyType.PREF_PROXY_DATA_NODE).node(IProxyData.HTTPS_PROXY_TYPE); - type.putInt(ProxyType.PREF_PROXY_PORT, DEFAULT_PREF_PROXY_PORT); + type.putInt(ProxyType.PREF_PROXY_PORT, DEFAULT_PREF_PROXY_PORT); type.putBoolean(ProxyType.PREF_PROXY_HAS_AUTH, DEFAULT_PREF_PROXY_HAS_AUTH); - + type = node.node(ProxyType.PREF_PROXY_DATA_NODE).node(IProxyData.SOCKS_PROXY_TYPE); - type.putInt(ProxyType.PREF_PROXY_PORT, DEFAULT_PREF_PROXY_PORT); + type.putInt(ProxyType.PREF_PROXY_PORT, DEFAULT_PREF_PROXY_PORT); type.putBoolean(ProxyType.PREF_PROXY_HAS_AUTH, DEFAULT_PREF_PROXY_HAS_AUTH); - + try { node.flush(); } catch (BackingStoreException e) { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java index 2e154969e..77ea395ac 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceManager.java @@ -24,9 +24,9 @@ import org.osgi.service.prefs.Preferences; * Provides set of methods to operate on preferences */ public class PreferenceManager { - + public static final String ROOT = ""; //$NON-NLS-1$ - + private static final String PREF_HAS_MIGRATED = "org.eclipse.core.net.hasMigrated"; //$NON-NLS-1$ /** @@ -35,7 +35,7 @@ public class PreferenceManager { private static String HTTP_PROXY_HOST = "org.eclipse.update.core.proxy.host"; //$NON-NLS-1$ private static String HTTP_PROXY_PORT = "org.eclipse.update.core.proxy.port"; //$NON-NLS-1$ private static String HTTP_PROXY_ENABLE = "org.eclipse.update.core.proxy.enable"; //$NON-NLS-1$ - + private static final int DEFAULT_INT = -1; private static final String DEFAULT_STRING = null; private static final boolean DEFAULT_BOOLEAN = false; @@ -48,11 +48,11 @@ public class PreferenceManager { private PreferenceManager(String id) { this.defaultScope = DefaultScope.INSTANCE.getNode(id); } - + /** * Creates the preferences manager for the node defined by id * in configuration scope. - * @param id node name for which node should be created in configuration scope + * @param id node name for which node should be created in configuration scope * @return {@link PreferenceManager} */ public static PreferenceManager createConfigurationManager(String id) { @@ -60,7 +60,7 @@ public class PreferenceManager { manager.currentScope = ConfigurationScope.INSTANCE.getNode(id); return manager; } - + /** * Checks if preference migration was already performed. * @return <code>boolean</code> @@ -68,11 +68,11 @@ public class PreferenceManager { public boolean isMigrated() { return migrated; } - + /** - * Returns the <code>boolean</code> value associated with the specified <code>key</code> - * for specified <code>node</code> in current scope. - * + * Returns the <code>boolean</code> value associated with the specified <code>key</code> + * for specified <code>node</code> in current scope. + * * <p> * Returns the value specified in the default scope if there is no value associated with the * <code>key</code> in the current scope, the backing store is inaccessible, or if the associated @@ -91,9 +91,9 @@ public class PreferenceManager { } /** - * Returns the <code>int</code> value associated with the specified <code>key</code> - * for specified <code>node</code> in current scope. - * + * Returns the <code>int</code> value associated with the specified <code>key</code> + * for specified <code>node</code> in current scope. + * * <p> * Returns the value specified in the default scope if there is no value associated with the * <code>key</code> in the current scope, the backing store is inaccessible, or if the associated @@ -112,9 +112,9 @@ public class PreferenceManager { } /** - * Returns the <code>String</code> value associated with the specified <code>key</code> - * for specified <code>node</code> in current scope. - * + * Returns the <code>String</code> value associated with the specified <code>key</code> + * for specified <code>node</code> in current scope. + * * <p> * Returns the value specified in the default scope if there is no value associated with the * <code>key</code> in the current scope, the backing store is inaccessible, or if the associated @@ -131,12 +131,12 @@ public class PreferenceManager { public String getString(String node, String key) { return currentScope.node(node).get(key, defaultScope.node(node).get(key, DEFAULT_STRING)); } - + /** - * Associates the specified <code>int</code> value with the specified key + * Associates the specified <code>int</code> value with the specified key * for specified <code>node</code> in current scope. - * - * @param node node + * + * @param node node * @param key <code>key</code> with which the string form of value is to be associated. * @param value <code>value</code> to be associated with <code>key</code>. * @see #getInt(String, String) @@ -148,8 +148,8 @@ public class PreferenceManager { /** * Associates the specified <code>boolean</code> value with the specified key * for specified <code>node</code> in current scope. - * - * @param node node + * + * @param node node * @param key <code>key</code> with which the string form of value is to be associated. * @param value <code>value</code> to be associated with <code>key</code>. * @see #getBoolean(String, String) @@ -161,8 +161,8 @@ public class PreferenceManager { /** * Associates the specified <code>String</code> value with the specified key * for specified <code>node</code> in current scope. - * - * @param node node + * + * @param node node * @param key <code>key</code> with which the string form of value is to be associated. * @param value <code>value</code> to be associated with <code>key</code>. * @see #getString(String, String) @@ -170,12 +170,12 @@ public class PreferenceManager { public void putString(String node, String key, String value) { currentScope.node(node).put(key, value); } - + /** * Register the given listener for notification of preference changes. * Calling this method multiple times with the same listener has no effect. The * given listener argument must not be <code>null</code>. - * + * * @param node node * @param listener the preference change listener to register * @see #removePreferenceChangeListener(String, IEclipsePreferences.IPreferenceChangeListener) @@ -197,12 +197,12 @@ public class PreferenceManager { public void removePreferenceChangeListener(String node, IPreferenceChangeListener listener) { ((IEclipsePreferences)currentScope.node(node)).removePreferenceChangeListener(listener); } - + /** * Register the given listener for changes to this node. * Calling this method multiple times with the same listener has no effect. The * given listener argument must not be <code>null</code>. - * + * * @param node node * @param listener the preference change listener to register * @see #removeNodeChangeListener(String, IEclipsePreferences.INodeChangeListener) @@ -224,12 +224,12 @@ public class PreferenceManager { public void removeNodeChangeListener(String node, INodeChangeListener listener) { ((IEclipsePreferences)currentScope.node(node)).removeNodeChangeListener(listener); } - + /** - * Removes this node and all of its descendants, - * invalidating any properties contained in the removed nodes. + * Removes this node and all of its descendants, + * invalidating any properties contained in the removed nodes. * @param node name of a node which should be removed - * @throws BackingStoreException - if this operation cannot be completed + * @throws BackingStoreException - if this operation cannot be completed * due to a failure in the backing store, or inability to communicate with it. */ public void removeNode(String node) throws BackingStoreException { @@ -238,7 +238,7 @@ public class PreferenceManager { /** * Forces any changes in the contents of current scope - * and its descendants to the persistent store. + * and its descendants to the persistent store. * @throws BackingStoreException - if this operation cannot be completed * due to a failure in the backing store, or inability to communicate with it. */ @@ -269,14 +269,14 @@ public class PreferenceManager { if (instanceEnabled != null) configuration.put(ProxyManager.PREF_ENABLED, instanceEnabled); } - + // migrate enabled status if (configuration.get(ProxyManager.PREF_OS, null) == null) { String instanceEnabled = instanceScope.get(ProxyManager.PREF_OS, null); if (instanceEnabled != null) configuration.put(ProxyManager.PREF_OS, instanceEnabled); } - + // migrate non proxied hosts if not already set if (configuration.get(ProxyManager.PREF_NON_PROXIED_HOSTS, null) == null) { String instanceNonProxiedHosts = instanceScope.get(ProxyManager.PREF_NON_PROXIED_HOSTS, null); @@ -284,7 +284,7 @@ public class PreferenceManager { configuration.put(ProxyManager.PREF_NON_PROXIED_HOSTS, instanceNonProxiedHosts); } } - + // migrate proxy data PreferenceManager instanceManager = PreferenceManager.createInstanceManager(instanceScope); for (int i = 0; i < proxies.length; i++) { @@ -297,7 +297,7 @@ public class PreferenceManager { type.setProxyData(instanceData); } } - + // if this an import we should remove the old node if (!isInitialize) { try { @@ -305,9 +305,9 @@ public class PreferenceManager { } catch (BackingStoreException e) { // ignore } - } + } } - + private void migrateUpdateHttpProxy(Preferences instanceScope, ProxyType[] proxies, boolean isInitialize) { if (!instanceScope.getBoolean(PREF_HAS_MIGRATED, false)) { // Only set the migration bit when initializing @@ -332,7 +332,7 @@ public class PreferenceManager { } } } - + private String getHostToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { String httpProxyHost = updatePrefs.get(HTTP_PROXY_HOST, ""); //$NON-NLS-1$ if (checkSystemProperties && "".equals(httpProxyHost)) { //$NON-NLS-1$ @@ -343,7 +343,7 @@ public class PreferenceManager { updatePrefs.remove(HTTP_PROXY_HOST); return httpProxyHost; } - + private int getPortToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { String httpProxyPort = updatePrefs.get(HTTP_PROXY_PORT, ""); //$NON-NLS-1$ if (checkSystemProperties && "".equals(httpProxyPort)) { //$NON-NLS-1$ @@ -359,7 +359,7 @@ public class PreferenceManager { } return port; } - + private boolean getEnablementToMigrate(Preferences updatePrefs, boolean checkSystemProperties) { boolean httpProxyEnable = false; if (checkSystemProperties && updatePrefs.get(HTTP_PROXY_ENABLE, null) == null) { @@ -370,7 +370,7 @@ public class PreferenceManager { } return httpProxyEnable; } - + private static PreferenceManager createInstanceManager(Preferences instance) { PreferenceManager manager = new PreferenceManager(Activator.ID); manager.currentScope = (IEclipsePreferences) instance; diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceModifyListener.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceModifyListener.java index 57f9d3b4a..76c9a4fa1 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceModifyListener.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/PreferenceModifyListener.java @@ -22,7 +22,7 @@ public class PreferenceModifyListener extends public PreferenceModifyListener() { // Nothing to do } - + public IEclipsePreferences preApply(IEclipsePreferences node) { // the node does not need to be the root of the hierarchy Preferences root = node.node("/"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyData.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyData.java index db37e0f14..91d91fd14 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyData.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyData.java @@ -55,7 +55,7 @@ public class ProxyData implements IProxyData { public String getUserId() { return user; } - + public void setType(String type) { this.type = type; } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java index 34a5f8c69..35111a766 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyManager.java @@ -38,17 +38,17 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; public class ProxyManager implements IProxyService, IPreferenceChangeListener { - + static final String PREF_NON_PROXIED_HOSTS = "nonProxiedHosts"; //$NON-NLS-1$ static final String PREF_ENABLED = "proxiesEnabled"; //$NON-NLS-1$ static final String PREF_OS = "systemProxiesEnabled"; //$NON-NLS-1$ - + private static IProxyService proxyManager; - + private AbstractProxyProvider nativeProxyProvider; - + private PreferenceManager preferenceManager; - + ListenerList listeners = new ListenerList(ListenerList.IDENTITY); private String[] nonProxiedHosts; private final ProxyType[] proxies = new ProxyType[] { @@ -78,21 +78,21 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { proxyManager = new ProxyManager(); return proxyManager; } - + /* (non-Javadoc) * @see org.eclipse.core.net.IProxyManager#addProxyChangeListener(org.eclipse.core.net.IProxyChangeListener) */ public void addProxyChangeListener(IProxyChangeListener listener) { listeners.add(listener); } - + /* (non-Javadoc) * @see org.eclipse.core.net.IProxyManager#removeProxyChangeListener(org.eclipse.core.net.IProxyChangeListener) */ public void removeProxyChangeListener(IProxyChangeListener listener) { listeners.remove(listener); } - + private void fireChange(final IProxyChangeEvent event) { Object[] l = listeners.getListeners(); for (int i = 0; i < l.length; i++) { @@ -160,7 +160,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { fireChange(event); } - + public IProxyData[] getProxyData() { checkMigrated(); IProxyData[] result = new IProxyData[proxies.length]; @@ -182,7 +182,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { checkMigrated(); doSetProxyData(proxies); } - + private void doSetProxyData(IProxyData[] proxyDatas) { IProxyData[] oldData = getProxyData(); String[] hosts = getNonProxiedHosts(); @@ -355,7 +355,7 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } catch (URISyntaxException e) { return null; } - + IProxyData[] data = getProxyDataForHost(host); for (int i = 0; i < data.length; i++) { IProxyData proxyData = data[i]; @@ -365,14 +365,14 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { } return null; } - + private void registerAuthenticator() { Authenticator a = getPluggedInAuthenticator(); if (a != null) { Authenticator.setDefault(a); } } - + private Authenticator getPluggedInAuthenticator() { IExtension[] extensions = RegistryFactory.getRegistry().getExtensionPoint(Activator.ID, Activator.PT_AUTHENTICATOR).getExtensions(); if (extensions.length == 0) @@ -380,25 +380,25 @@ public class ProxyManager implements IProxyService, IPreferenceChangeListener { IExtension extension = extensions[0]; IConfigurationElement[] configs = extension.getConfigurationElements(); if (configs.length == 0) { - Activator.log(IStatus.ERROR, NLS.bind("Authenticator {0} is missing required fields", (new Object[] {extension.getUniqueIdentifier()})), null);//$NON-NLS-1$ + Activator.log(IStatus.ERROR, NLS.bind("Authenticator {0} is missing required fields", (new Object[] {extension.getUniqueIdentifier()})), null);//$NON-NLS-1$ return null; } try { IConfigurationElement config = configs[0]; - return (Authenticator) config.createExecutableExtension("class");//$NON-NLS-1$ + return (Authenticator) config.createExecutableExtension("class");//$NON-NLS-1$ } catch (CoreException ex) { - Activator.log(IStatus.ERROR, NLS.bind("Unable to instantiate authenticator {0}", (new Object[] {extension.getUniqueIdentifier()})), ex);//$NON-NLS-1$ + Activator.log(IStatus.ERROR, NLS.bind("Unable to instantiate authenticator {0}", (new Object[] {extension.getUniqueIdentifier()})), ex);//$NON-NLS-1$ return null; } } - + private synchronized void checkMigrated() { if (preferenceManager.isMigrated() || !Activator.getInstance().instanceLocationAvailable()) { return; } preferenceManager.migrate(proxies); } - + void migrateInstanceScopePreferences(Preferences instance, Preferences configuration, boolean isInitialize) { preferenceManager.migrateInstanceScopePreferences(instance, diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java index ff1a3de9d..98394aec4 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxySelector.java @@ -111,7 +111,7 @@ public class ProxySelector { } } else { throw new IllegalArgumentException( - "Provider does not support setting proxy data"); //$NON-NLS-1$ + "Provider does not support setting proxy data"); //$NON-NLS-1$ } } @@ -131,7 +131,7 @@ public class ProxySelector { } else if (provider.equals(NATIVE_PROVIDER)) { return manager.getNativeNonProxiedHosts(); } - throw new IllegalArgumentException("Provider not supported"); //$NON-NLS-1$ + throw new IllegalArgumentException("Provider not supported"); //$NON-NLS-1$ } public static void setBypassHosts(String provider, String hosts[]) { @@ -146,7 +146,7 @@ public class ProxySelector { } } else { throw new IllegalArgumentException( - "Provider does not support setting bypass hosts"); //$NON-NLS-1$ + "Provider does not support setting bypass hosts"); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java index 7416867d4..a0a701fe1 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/ProxyType.java @@ -44,7 +44,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener public static final int DO_NOT_VERIFY = 1; public static final int VERIFY_EMPTY = 2; public static final int VERIFY_EQUAL = 4; - + /** * Constants that control the setting of the SOCKS system properties */ @@ -53,7 +53,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener public static final int ALWAYS_SET = 1; public static final int NEVER_SET = 2; public static int socksSystemPropertySetting; - + /** * Absolute path to the node for the cached proxy information */ @@ -61,8 +61,8 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener /* * Fields used to cache authentication information in the keyring */ - private static final String INFO_PROXY_USER = "user"; //$NON-NLS-1$ - private static final String INFO_PROXY_PASS = "pass"; //$NON-NLS-1$ + private static final String INFO_PROXY_USER = "user"; //$NON-NLS-1$ + private static final String INFO_PROXY_PASS = "pass"; //$NON-NLS-1$ static { String value = System.getProperty(PROP_SOCKS_SYSTEM_PROPERTY_HANDLING); if (value == null) { @@ -75,7 +75,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener socksSystemPropertySetting = ONLY_SET_FOR_1_5_OR_LATER; } } - + private String name; private boolean updatingPreferences; private PreferenceManager preferenceManager; @@ -112,8 +112,8 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener public ProxyType(String name) { this.name = name; this.preferenceManager = Activator.getInstance().getPreferenceManager(); - } - + } + public ProxyType(String name, PreferenceManager manager) { this.name = name; this.preferenceManager = manager; @@ -140,7 +140,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener // We are initializing so verify that the system properties are empty verifySystemPropertiesEmpty(type); } else if (verifyFlag == VERIFY_EQUAL) { - // Verify that the data in the preferences matches the system properties + // Verify that the data in the preferences matches the system properties verifyDataMatchesSystemProperties(proxyData); } return proxyData; @@ -165,13 +165,13 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener private void updatePreferences(IProxyData proxyData) { updatePreferences(getPreferenceNode(), proxyData); } - + /*package*/ void updatePreferencesIfMissing(IProxyData proxyData) { String node = getPreferenceNode(); if (preferenceManager.getString(node, PREF_PROXY_HOST) == null) updatePreferences(node, proxyData); } - + private void updatePreferences(String node, IProxyData proxyData) { if (!hasPreferencesChanged(node, proxyData)) { return; @@ -212,7 +212,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener } return true; } - + /* package */void updateSystemProperties(IProxyData proxyData) { try { if (proxyData.getType().equals(IProxyData.HTTP_PROXY_TYPE)) { @@ -226,7 +226,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener Activator.logError("A security exception occurred while trying to put the proxy data into the system properties", e); //$NON-NLS-1$ } } - + private boolean verifyDataMatchesSystemProperties(ProxyData proxyData) { try { boolean proxiesEnabled = ProxyManager.getProxyManager().isProxiesEnabled(); @@ -237,7 +237,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener } else if (proxyData.getType().equals(IProxyData.SOCKS_PROXY_TYPE)) { return verifyDataMatchesSocksSystemProperties(proxyData, proxiesEnabled); } - + } catch (SecurityException e) { // Just ignore this here since it will be surfaced elsewhere } @@ -300,7 +300,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener } return verifySocksSystemPropertiesEmpty(); } - + private boolean shouldSetSocksSystemProperties() { if (socksSystemPropertySetting == ALWAYS_SET) return true; @@ -435,7 +435,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener .getDefaultProvider()); for (int i = 0; i < data.length; i++) { if (data[i].getType().equalsIgnoreCase(type)) { - return data[i]; + return data[i]; } } return new ProxyData(type, null, -1, false, null); @@ -484,7 +484,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener } } } - + private void updateSocksSystemProperties() { IProxyData data = getProxyData(IProxyData.SOCKS_PROXY_TYPE); boolean proxiesEnabled = isProxyEnabled(); @@ -518,7 +518,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener preferenceManager.addNodeChangeListener(PREF_PROXY_DATA_NODE, this); preferenceManager.addPreferenceChangeListener(getPreferenceNode(), this); } - + private ISecurePreferences getNode() { ISecurePreferences root = SecurePreferencesFactory.getDefault(); if (root == null) @@ -593,7 +593,7 @@ public class ProxyType implements INodeChangeListener, IPreferenceChangeListener if (updatingPreferences) return; updateSystemProperties(getProxyData(DO_NOT_VERIFY)); - + } } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java index c3dbe288b..88b3b5eb8 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringMatcher.java @@ -28,10 +28,10 @@ public class StringMatcher { /* boundary value beyond which we don't need to search in the text */ protected int fBound = 0; - + protected static final char fSingleWildCard = '\u0000'; - + public static class Position { int start; //inclusive int end; //exclusive @@ -47,13 +47,13 @@ public class StringMatcher { } } /** - * Find the first occurrence of the pattern between <code>start</code)(inclusive) - * and <code>end</code>(exclusive). - * @param text the String object to search in + * Find the first occurrence of the pattern between <code>start</code)(inclusive) + * and <code>end</code>(exclusive). + * @param text the String object to search in * @param start the starting index of the search range, inclusive * @param end the ending index of the search range, exclusive - * @return an <code>StringMatcher.Position</code> object that keeps the starting - * (inclusive) and ending positions (exclusive) of the first occurrence of the + * @return an <code>StringMatcher.Position</code> object that keeps the starting + * (inclusive) and ending positions (exclusive) of the first occurrence of the * pattern in the specified range of the text; return null if not found or subtext * is empty (start==end). A pair of zeros is returned if pattern is empty string * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc" @@ -63,7 +63,7 @@ public class StringMatcher { public StringMatcher.Position find(String text, int start, int end) { if (fPattern == null|| text == null) throw new IllegalArgumentException(); - + int tlen = text.length(); if (start < 0) start = 0; @@ -83,10 +83,10 @@ public class StringMatcher { int segCount = fSegments.length; if (segCount == 0)//pattern contains only '*'(s) return new Position (start, end); - + int curPos = start; - int matchStart = -1; - int i; + int matchStart = -1; + int i; for (i = 0; i < segCount && curPos < end; ++i) { String current = fSegments[i]; int nextMatch = regExpPosIn(text, curPos, end, current); @@ -101,14 +101,14 @@ public class StringMatcher { return new Position(matchStart, curPos); } /** - * StringMatcher constructor takes in a String object that is a simple + * StringMatcher constructor takes in a String object that is a simple * pattern which may contain '*' for 0 and many characters and - * '?' for exactly one character. + * '?' for exactly one character. * - * Literal '*' and '?' characters must be escaped in the pattern + * Literal '*' and '?' characters must be escaped in the pattern * e.g., "\*" means literal "*", etc. * - * Escaping any other character (including the escape character itself), + * Escaping any other character (including the escape character itself), * just results in that character in the pattern. * e.g., "\a" means "a" and "\\" means "\" * @@ -131,7 +131,7 @@ public class StringMatcher { } else { fPattern = aPattern; } - + if (fIgnoreWildCards) { parseNoWildCards(); } else { @@ -139,12 +139,12 @@ public class StringMatcher { } } /** - * Given the starting (inclusive) and the ending (exclusive) poisitions in the - * <code>text</code>, determine if the given substring matches with aPattern + * Given the starting (inclusive) and the ending (exclusive) poisitions in the + * <code>text</code>, determine if the given substring matches with aPattern * @return true if the specified portion of the text matches the pattern - * @param text a String object that contains the substring to match + * @param text a String object that contains the substring to match * @param start marks the starting position (inclusive) of the substring - * @param end marks the ending index (exclusive) of the substring + * @param end marks the ending index (exclusive) of the substring */ public boolean match(String text, int start, int end) { if (null == text) @@ -215,9 +215,9 @@ public class StringMatcher { return i == segCount ; } /** - * match the given <code>text</code> with the pattern + * match the given <code>text</code> with the pattern * @return true if matched eitherwise false - * @param text a String object + * @param text a String object */ public boolean match(String text) { return match(text, 0, text.length()); @@ -289,43 +289,43 @@ public class StringMatcher { temp.addElement(buf.toString()); fBound += buf.length(); } - + fSegments = new String[temp.size()]; temp.copyInto(fSegments); } - /** + /** * @param text a string which contains no wildcard * @param start the starting index in the text for search, inclusive * @param end the stopping point of search, exclusive - * @return the starting index in the text of the pattern , or -1 if not found + * @return the starting index in the text of the pattern , or -1 if not found */ protected int posIn(String text, int start, int end) {//no wild card in pattern int max = end - fLength; - + if (!fIgnoreCase) { int i = text.indexOf(fPattern, start); if (i == -1 || i > max) return -1; return i; } - + for (int i = start; i <= max; ++i) { if (text.regionMatches(true, i, fPattern, 0, fLength)) return i; } - + return -1; } - /** + /** * @param text a simple regular expression that may only contain '?'(s) * @param start the starting index in the text for search, inclusive * @param end the stopping point of search, exclusive * @param p a simple regular expression that may contains '?' - * @return the starting index in the text of the pattern , or -1 if not found + * @return the starting index in the text of the pattern , or -1 if not found */ protected int regExpPosIn(String text, int start, int end, String p) { int plen = p.length(); - + int max = end - plen; for (int i = start; i <= max; ++i) { if (regExpRegionMatches(text, i, p, 0, plen)) @@ -335,7 +335,7 @@ public class StringMatcher { } /** - * + * * @param text the text * @param tStart the start * @param p the pattern @@ -366,30 +366,30 @@ public class StringMatcher { } return true; } - /** + /** * @param text the string to match * @param start the starting index in the text for search, inclusive * @param end the stopping point of search, exclusive * @param p a string that has no wildcard - * @return the starting index in the text of the pattern , or -1 if not found + * @return the starting index in the text of the pattern , or -1 if not found */ - protected int textPosIn(String text, int start, int end, String p) { - + protected int textPosIn(String text, int start, int end, String p) { + int plen = p.length(); int max = end - plen; - + if (!fIgnoreCase) { int i = text.indexOf(p, start); if (i == -1 || i > max) return -1; return i; } - + for (int i = start; i <= max; ++i) { if (text.regionMatches(true, i, p, 0, plen)) return i; } - + return -1; } } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringUtil.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringUtil.java index 71a2d3d50..903f6ceed 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringUtil.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/StringUtil.java @@ -16,7 +16,7 @@ public class StringUtil { /** * Splits a string into substrings using a delimiter array. - * + * * @param value * string to be tokenized * @param delimiters @@ -53,7 +53,7 @@ public class StringUtil { /** * Tests equality of the given strings. - * + * * @param sequence1 * candidate 1, may be null * @param sequence2 @@ -75,7 +75,7 @@ public class StringUtil { * with <code>to</code>.<br> * <b>Note:</b> This has the same behavior as the * <code>String.replace()</code> method within JDK 1.5. - * + * * @param source * @param from * @param to diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java index 20d8f8c33..1462d15dc 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/WindowsProxyProvider.java @@ -43,7 +43,7 @@ public class WindowsProxyProvider extends AbstractProxyProvider { winHttpProxyProvider = null; } } - + public IProxyData[] select(URI uri) { IProxyData[] proxies = new IProxyData[0]; if (jWinHttpLoaded) { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java index 9faffce49..1dd90b730 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java @@ -49,7 +49,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { public UnixProxyProvider() { // Nothing to initialize } - + public IProxyData[] select(URI uri) { String[] nonProxyHosts = getNonProxiedHosts(); if (nonProxyHosts != null) { @@ -95,7 +95,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { public String[] getNonProxiedHosts() { String[] npHosts; - + if (Policy.DEBUG_SYSTEM_PROVIDERS) Policy.debug("Getting no_proxy"); //$NON-NLS-1$ @@ -136,7 +136,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { protected ProxyData getSystemProxyInfo(String protocol) { ProxyData pd = null; String envName = null; - + if (Policy.DEBUG_SYSTEM_PROVIDERS) Policy.debug("Getting proxies for: " + protocol); //$NON-NLS-1$ @@ -268,7 +268,7 @@ public class UnixProxyProvider extends AbstractProxyProvider { for (int i = 0; i < strs.length; i++) System.out.println(i + ": " + strs[i]); //$NON-NLS-1$ } - + protected static native void gconfInit(); protected static native ProxyData getGConfProxyInfo(String protocol); diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/AutoProxyHolder.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/AutoProxyHolder.java index ef63b3196..3c774c496 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/AutoProxyHolder.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/AutoProxyHolder.java @@ -25,7 +25,7 @@ public class AutoProxyHolder { /** * Set the auto detect flags. - * + * * @param autoDetectFlags */ public void setAutoDetectFlags(int autoDetectFlags) { @@ -34,7 +34,7 @@ public class AutoProxyHolder { /** * Get the auto config url. - * + * * @return the auto config url (pac file) */ public String getAutoConfigUrl() { diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java index 1a960d8e8..446078371 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyBypass.java @@ -18,7 +18,7 @@ import org.eclipse.core.internal.net.StringUtil; /** * Encapsulates the windows specific proxy bypass list. It transforms the native * API proxy bypass list into queryable java object. - * + * * @see "http://msdn2.microsoft.com/en-us/library/aa383912(VS.85).aspx" */ public class ProxyBypass { @@ -31,7 +31,7 @@ public class ProxyBypass { /** * Create a ProxyBypass instance from the proxy bypass list string. - * + * * @param proxyBypass */ public ProxyBypass(String proxyBypass) { @@ -47,7 +47,7 @@ public class ProxyBypass { /** * Check whether the given uri should bypass the proxy. - * + * * @param uri * @return true if the the uri should bypass the proxy; otherwise false */ diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java index 17e711d52..f13dc5cc3 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/ProxyProviderUtil.java @@ -48,7 +48,7 @@ public final class ProxyProviderUtil { * <code><pre> * ([<scheme>=][<scheme> "://" ]<server>[ ":" <port>]) * </pre></code> - * + * * @param proxyList * the proxy list as a string * @param universalProxies @@ -146,7 +146,7 @@ public final class ProxyProviderUtil { // if (protocol.equalsIgnoreCase("socks") || protocol.equalsIgnoreCase("socket")) //$NON-NLS-1$ //$NON-NLS-2$ // return IProxyData.SOCKS_PROXY_TYPE; - // if (protocol.equalsIgnoreCase("https")) //$NON-NLS-1$ + // if (protocol.equalsIgnoreCase("https")) //$NON-NLS-1$ // return IProxyData.HTTPS_PROXY_TYPE; // return IProxyData.HTTP_PROXY_TYPE; } diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java index ce000dcda..b1e139f91 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/StaticProxyConfig.java @@ -47,7 +47,7 @@ public class StaticProxyConfig { * Select the static proxies for the given uri and add it to the given list * of proxies.<br> * This respects also the proxy bypass definition. - * + * * @param uri * @param proxies */ diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttp.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttp.java index 89da96a92..c920d819c 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttp.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttp.java @@ -30,7 +30,7 @@ public final class WinHttp { /** * WinHttpOpen - see Microsoft SDK Documentation - * + * * @param userAgent * @param accessType * @param proxyName @@ -42,7 +42,7 @@ public final class WinHttp { /** * WinHttpCloseHandle - see Microsoft SDK Documentation - * + * * @param hInternet * @return true on success */ @@ -50,7 +50,7 @@ public final class WinHttp { /** * WinHttpGetIEProxyConfigForCurrentUser - see Microsoft SDK Documentation - * + * * @param proxyConfig * @return true on success */ @@ -58,7 +58,7 @@ public final class WinHttp { /** * WinHttpGetProxyForUrl - see Microsoft SDK Documentation - * + * * @param hSession * @param url * @param autoProxyOptions @@ -69,7 +69,7 @@ public final class WinHttp { /** * WinHttpDetectAutoProxyConfigUrl - see Microsoft SDK Documentation - * + * * @param autoProxyHolder * @return true on success */ @@ -77,14 +77,14 @@ public final class WinHttp { /** * GetLastError - see Microsoft SDK Documentation - * + * * @return the last error code (win32) */ public static native int getLastError(); /** * GetLastErrorMessage - formats the last error - * + * * @return the readable last error code */ public static native String getLastErrorMessage(); diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpAutoProxyOptions.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpAutoProxyOptions.java index 501dc92e5..34bb59f67 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpAutoProxyOptions.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpAutoProxyOptions.java @@ -27,7 +27,7 @@ public class WinHttpAutoProxyOptions { public static final int WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY= 0x00020000; - // Flags for WINHTTP_AUTOPROXY_OPTIONS::dwAutoDetectFlags + // Flags for WINHTTP_AUTOPROXY_OPTIONS::dwAutoDetectFlags public static final int WINHTTP_AUTO_DETECT_TYPE_DHCP= 0x00000001; public static final int WINHTTP_AUTO_DETECT_TYPE_DNS_A= 0x00000002; diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpCurrentUserIEProxyConfig.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpCurrentUserIEProxyConfig.java index 70a77a153..1f088825f 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpCurrentUserIEProxyConfig.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpCurrentUserIEProxyConfig.java @@ -49,7 +49,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * I auto detection requested? - * + * * @return the isAutoDetect */ public boolean isAutoDetect() { @@ -58,7 +58,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * Is a auto config url reqested? - * + * * @return true if there is a auto config url */ public boolean isAutoConfigUrl() { @@ -67,7 +67,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * Are static proxies defined? - * + * * @return the isStaticProxy */ public boolean isStaticProxy() { @@ -76,7 +76,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * Did the auto-detect change? - * + * * @param proxyConfig * the proxy config; maybe null * @return true if changed @@ -89,7 +89,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * Did the auto-config url change? - * + * * @param proxyConfig * the proxy config; maybe null * @return true if changed @@ -104,7 +104,7 @@ public class WinHttpCurrentUserIEProxyConfig { /** * Did the static proxy information change? - * + * * @param proxyConfig * the proxy config; maybe null * @return true if changed diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java index 05a284d42..fd263d417 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/win32/winhttp/WinHttpProxyProvider.java @@ -24,7 +24,7 @@ import org.eclipse.core.net.proxy.IProxyData; * The <code>WinHttpProxyProvivider</code> gets its settings from the * "internet options >> connection settings". For this it uses the Windows * WinHttp API. - * + * * @see "http://msdn2.microsoft.com/en-us/library/aa382925(VS.85).aspx" */ public class WinHttpProxyProvider { @@ -34,7 +34,7 @@ public class WinHttpProxyProvider { private String wpadAutoConfigUrl; private boolean tryWpadGetUrl; private boolean tryPac; - + // Buffered delayed logging to avoid deadlocks. Logging itself might trigger // through listeners/appenders other threads to do some communication which in // turn uses this proxy provider. @@ -47,9 +47,9 @@ public class WinHttpProxyProvider { /** * Retrieve the proxies that are suitable for the given uri. An empty array * of proxies indicates that no proxy should be used (direct connection). - * This method considers already the ´no proxy for´ definition of the + * This method considers already the �no proxy for� definition of the * internet options dialog. - * + * * @param uri * @return an array of proxies */ @@ -85,7 +85,7 @@ public class WinHttpProxyProvider { // Explicit proxies defined? if (newProxyConfig.isStaticProxy()) { - // Yes, let´s see if we are still up-to-date + // Yes, let�s see if we are still up-to-date if (newProxyConfig.staticProxyChanged(proxyConfig)) staticProxyConfig = new StaticProxyConfig(newProxyConfig .getProxy(), newProxyConfig.getProxyBypass()); @@ -93,14 +93,14 @@ public class WinHttpProxyProvider { return staticProxyConfig.getProxyData(); } - // Let´s find out if auto detect has changed. + // Let�s find out if auto detect has changed. if (newProxyConfig.autoDetectChanged(proxyConfig)) { tryWpadGetUrl = newProxyConfig.isAutoDetect(); if (!tryWpadGetUrl) wpadAutoConfigUrl = null; } - // Let´s find out if pac file url has changed. + // Let�s find out if pac file url has changed. if (newProxyConfig.autoConfigUrlChanged(proxyConfig)) tryPac = newProxyConfig.isAutoConfigUrl(); @@ -110,7 +110,7 @@ public class WinHttpProxyProvider { ProxyData data = new ProxyData(IProxyData.HTTP_PROXY_TYPE, "", -1, //$NON-NLS-1$ false, "WINDOWS_IE"); //$NON-NLS-1$ data.setDynamic(true); - return new IProxyData[] { data }; + return new IProxyData[] { data }; } public String[] getNonProxiedHosts() { @@ -132,7 +132,7 @@ public class WinHttpProxyProvider { return new String[0]; } if (newProxyConfig.isStaticProxy()) { - // Yes, let´s see if we are still up-to-date + // Yes, let�s see if we are still up-to-date if (newProxyConfig.staticProxyChanged(proxyConfig)) staticProxyConfig = new StaticProxyConfig(newProxyConfig .getProxy(), newProxyConfig.getProxyBypass()); @@ -144,7 +144,7 @@ public class WinHttpProxyProvider { /** * This method is the not synchronized counterpart of * <code>getProxyData</code>. - * + * * @param uri * @return an array of proxies */ @@ -158,20 +158,20 @@ public class WinHttpProxyProvider { List proxies = new ArrayList(); - // Let´s find out if auto detect has changed. + // Let�s find out if auto detect has changed. if (newProxyConfig.autoDetectChanged(proxyConfig)) { tryWpadGetUrl = newProxyConfig.isAutoDetect(); if (!tryWpadGetUrl) wpadAutoConfigUrl = null; } - // Let´s find out if pac file url has changed. + // Let�s find out if pac file url has changed. if (newProxyConfig.autoConfigUrlChanged(proxyConfig)) tryPac = newProxyConfig.isAutoConfigUrl(); // Explicit proxies defined? if (newProxyConfig.isStaticProxy()) { - // Yes, let´s see if we are still up-to-date + // Yes, let�s see if we are still up-to-date if (newProxyConfig.staticProxyChanged(proxyConfig)) staticProxyConfig = new StaticProxyConfig(newProxyConfig .getProxy(), newProxyConfig.getProxyBypass()); @@ -241,14 +241,14 @@ public class WinHttpProxyProvider { /** * Retrieve the proxies from the specified pac file url. - * + * * @param hHttpSession * @param configUrl * @param uri * @return a list of proxies (IProxyData) or null in case of an error. */ protected List pacSelect(int hHttpSession, String configUrl, URI uri) { - // Don´t ask for anything else than http or https since that is not + // Don�t ask for anything else than http or https since that is not // supported by WinHttp pac file support: // ERROR_WINHTTP_UNRECOGNIZED_SCHEME if (!IProxyData.HTTP_PROXY_TYPE.equalsIgnoreCase(uri.getScheme()) diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyChangeEvent.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyChangeEvent.java index e8b7ff4a4..4cdffa111 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyChangeEvent.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyChangeEvent.java @@ -20,13 +20,13 @@ package org.eclipse.core.net.proxy; * @since 1.0 */ public interface IProxyChangeEvent { - + /** * Type constant that indicates that the list of non-proxied hosts has changed.\ * @see #getChangeType() */ public static final int NONPROXIED_HOSTS_CHANGED = 1; - + /** * Type constant that indicates that the data for one or more proxies has changed * @see #getChangeType() @@ -34,14 +34,14 @@ public interface IProxyChangeEvent { public static final int PROXY_DATA_CHANGED = 2; /** - * Type constant that indicates that the enablement of the proxy + * Type constant that indicates that the enablement of the proxy * service has changed. Client should consult the service to determine * the current enablement * @see #getChangeType() * @see IProxyService#isProxiesEnabled() */ public static final int PROXY_SERVICE_ENABLEMENT_CHANGE = 3; - + /** * Return the type of change this event represents. Clients * should ignore types they do not recognize. @@ -50,31 +50,31 @@ public interface IProxyChangeEvent { * @see #PROXY_DATA_CHANGED */ public int getChangeType(); - + /** * For a change type of {@link #NONPROXIED_HOSTS_CHANGED}, this method will * return the list of non-proxied hosts before the change occurred. * @return the list of non-proxied hosts before the change occurred */ public String[] getOldNonProxiedHosts(); - + /** * For a change type of {@link #NONPROXIED_HOSTS_CHANGED}, this method will * return the list of non-proxied hosts after the change occurred. * @return the list of non-proxied hosts after the change occurred */ public String[] getNonProxiedHosts(); - + /** * For a change type of {@link #PROXY_DATA_CHANGED}, this method returns * the state of all known proxies before the change occurred. * @return the state of all known proxies before the change occurred */ public IProxyData[] getOldProxyData(); - + /** * For a change type of {@link #PROXY_DATA_CHANGED}, this method returns - * the state of the changed known proxies after the change occurred. Clients + * the state of the changed known proxies after the change occurred. Clients * should check the {@link IProxyService#isProxiesEnabled()} method to see * if the proxy data change was the result of proxies being disabled. * @return the state of the changed known proxies after the change occurred diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyData.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyData.java index f9ca16235..d58f13045 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyData.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyData.java @@ -13,30 +13,30 @@ package org.eclipse.core.net.proxy; /** * An {@link IProxyData} contains the information that is required to connect to * a particular proxy server. - * + * * @noimplement This interface is not intended to be implemented by clients. * @since 1.0 */ public interface IProxyData { - + /** * Type constant (value "HTTP") which identifies an HTTP proxy. * @see #getType() */ public static final String HTTP_PROXY_TYPE = "HTTP"; //$NON-NLS-1$ - + /** * Type constant (value "HTTPS") which identifies an HTTPS proxy. * @see #getType() */ public static final String HTTPS_PROXY_TYPE = "HTTPS"; //$NON-NLS-1$ - + /** * Type constant (value "SOCKS") which identifies an SOCKS proxy. * @see #getType() */ public static final String SOCKS_PROXY_TYPE = "SOCKS"; //$NON-NLS-1$ - + /** * Return the type of this proxy. Additional proxy types may be * added in the future so clients should accommodate this. @@ -46,14 +46,14 @@ public interface IProxyData { * @see #SOCKS_PROXY_TYPE */ String getType(); - + /** * Return the host name for the proxy server or <code>null</code> * if a proxy server of this type is not available. * @return the host name for the proxy server or <code>null</code> */ String getHost(); - + /** * Set the host name for the proxy server of this type. * If no proxy server of this type is available, the host name should @@ -65,16 +65,16 @@ public interface IProxyData { * @param host the host name for the proxy server or <code>null</code> */ void setHost(String host); - + /** * Return the port that should be used when connecting to the host or -1 * if the default port for the proxy protocol should be used. * @return the port that should be used when connecting to the host */ int getPort(); - + /** - * Set the port that should be used when connecting to the host. Setting the port + * Set the port that should be used when connecting to the host. Setting the port * to a value of -1 will indicate that the default port number for * the proxy type should be used. * <p> @@ -85,51 +85,51 @@ public interface IProxyData { * or -1 if the default port is to be used */ void setPort(int port); - + /** - * Return the id of the user that should be used when authenticating + * Return the id of the user that should be used when authenticating * for the proxy. A <code>null</code> is returned if there is no * authentication information. - * @return the id of the user that should be used when authenticating + * @return the id of the user that should be used when authenticating * for the proxy or <code>null</code> */ String getUserId(); - + /** - * Set the id of the user that should be used when authenticating + * Set the id of the user that should be used when authenticating * for the proxy. A <code>null</code> should be used if there is no * authentication information. * <p> * Setting this value will not affect the data returned from {@link IProxyService#getProxyData()}. * Clients can change the global settings by changing the proxy data instances and then * by calling {@link IProxyService#setProxyData(IProxyData[])} with the adjusted data. - * @param userid the id of the user that should be used when authenticating + * @param userid the id of the user that should be used when authenticating * for the proxy or <code>null</code> */ void setUserid(String userid); - + /** - * Return the password that should be used when authenticating + * Return the password that should be used when authenticating * for the proxy. A <code>null</code> is returned if there is no * password or the password is not known. - * @return the password that should be used when authenticating + * @return the password that should be used when authenticating * for the proxy or <code>null</code> */ String getPassword(); - + /** - * Set the password that should be used when authenticating + * Set the password that should be used when authenticating * for the proxy. A <code>null</code> should be passed if there is no * password or the password is not known. * <p> * Setting this value will not affect the data returned from {@link IProxyService#getProxyData()}. * Clients can change the global settings by changing the proxy data instances and then * by calling {@link IProxyService#setProxyData(IProxyData[])} with the adjusted data. - * @param password the password that should be used when authenticating + * @param password the password that should be used when authenticating * for the proxy or <code>null</code> */ void setPassword(String password); - + /** * Returns whether the proxy requires authentication. If the proxy * requires authentication but the user name and password fields of diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyService.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyService.java index d3d1cfa42..f2ee93b1a 100644 --- a/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyService.java +++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/net/proxy/IProxyService.java @@ -18,18 +18,18 @@ import org.eclipse.core.runtime.CoreException; * Manages the proxy data and related information. The proxy service is * registered as an OSGi service. Clients can obtain an instance of the service * from their bundle context or from a service tracker. - * + * * <p> * Clients that wish to make a connection and need to determine whether to use a * proxy or not should call either {@link #getProxyDataForHost(String)} or * {@link #getProxyDataForHost(String, String)}. * </p> - * + * * @since 1.0 * @noimplement This interface is not intended to be implemented by clients. */ public interface IProxyService { - + /** * Sets whether proxy support should be enabled. The current proxy settings * are still kept so clients should check the enablement using @@ -38,68 +38,68 @@ public interface IProxyService { * {@link #getProxyDataForHost(String)} and * {@link #getProxyDataForHost(String, String)} method will check the * enablement and only return data if the service is enabled. - * + * * @param enabled * whether proxy support should be enabled */ void setProxiesEnabled(boolean enabled); - + /** * Returns whether proxy support should be enabled. When disabled, all * connections will be direct. - * + * * <p> * Returns <code>false</code>, when the system proxies support is * enabled but {@link #hasSystemProxies()} returns <code>false</code>. * </p> - * + * * @return whether proxy support should be enabled */ boolean isProxiesEnabled(); - + /** * Returns whether system proxy support is available. - * + * * @return whether system proxy support is available * @since 1.1 */ boolean hasSystemProxies(); - + /** * Sets whether system proxies should be used, when the proxy support is * enabled. - * + * * @param enabled * @since 1.1 */ void setSystemProxiesEnabled(boolean enabled); - - + + /** * Returns whether system proxy should be used when the proxy support is * enabled. - * + * * @return whether system proxy is used when the proxy support is enabled * @since 1.1 */ boolean isSystemProxiesEnabled(); - + /** * Returns the list of know proxy types and their settings. Some of the * returned proxy types may not be enabled (i.e, their hosts may be * <code>null</code>. - * + * * <p> * Clients that wish to make a connection and need to determine whether to * use a proxy or not should call either * {@link #getProxyDataForHost(String)} or * {@link #getProxyDataForHost(String, String)}. * </p> - * + * * <p> * This method returns the proxies set via {@link #setProxyData(IProxyData[])} * </p> - * + * * @return the list of know proxy types and their settings */ IProxyData[] getProxyData(); @@ -114,7 +114,7 @@ public interface IProxyService { * the URI for which proxies are returned * @return list of all applicable proxy data, if no proxy is applicable then * an empty array is returned - * + * * @since 1.2 */ IProxyData[] select(URI uri); @@ -125,35 +125,35 @@ public interface IProxyService { * or if the host matches any entries in the non-proxied * hosts lists or if a matching proxy type has no data, then * an empty array is returned. - * + * * <p> * Clients that wish to make a connection and need to determine whether to * use a proxy should use this method. * </p> * @deprecated This method is deprecated because of its ambiguity. Use * {@link #select(URI)} instead. - * + * * @param host the host for which a connection is desired * @return the list of known proxy types and their settings for the * given host */ IProxyData[] getProxyDataForHost(String host); - + /** * Returns the proxy data for the proxy of the given type or * <code>null</code> if the proxy type is not known by this service. - * + * * <p> * Clients that wish to make a connection and need to determine whether to * use a proxy or not should call either * {@link #getProxyDataForHost(String)} or * {@link #getProxyDataForHost(String, String)}. * </p> - * + * * <p> * This method returns the proxies set via {@link #setProxyData(IProxyData[])} * </p> - * + * * @param type * the proxy type * @return the proxy data for the proxy of the given type or @@ -163,20 +163,20 @@ public interface IProxyService { * @see IProxyData#SOCKS_PROXY_TYPE */ IProxyData getProxyData(String type); - + /** * Returns the proxy data for the proxy of the given type or * <code>null</code> if the proxy type is not known by this service, the * proxy data is empty for that type or the host is in the non-proxied host * list. - * + * * <p> * Clients that wish to make a connection and need to determine whether to * use a proxy should use this method. * </p> * @deprecated This method is deprecated because of its ambiguity. Use * {@link #select(URI)} instead. - * + * * @param host * the host for which a connection is desired * @param type @@ -188,64 +188,64 @@ public interface IProxyService { * @see IProxyData#SOCKS_PROXY_TYPE */ IProxyData getProxyDataForHost(String host, String type); - + /** * Sets the information associated with known proxy types. If an unknown * type is provided, it will be ignored. Any known types that are not * present in the list of the provided proxy data will be unaffected. - * + * * <p> * This method affects only proxies defined in Eclipse by user and doesn't * affect settings of the system proxies (being used when the system support * is enabled). * </p> - * + * * @param proxies * the proxy data whose information is to be set. * @throws CoreException * if the proxy could not be set */ void setProxyData(IProxyData[] proxies) throws CoreException; - + /** * Returns the list of hosts for which non proxy should be used. The values * returned from this method should only be used for displaying the * non-proxed hosts list. - * + * * <p> * Clients that wish to make a connection and need to determine whether to * use a proxy or not should call either * {@link #getProxyDataForHost(String)} or * {@link #getProxyDataForHost(String, String)}. * </p> - * + * * <p> * This method returns the hosts set via * {@link #setNonProxiedHosts(String[])} * </p> - * + * * @return the list of hosts for which non proxy should be used. * @see #getProxyDataForHost(String) * @see #getProxyDataForHost(String, String) */ String[] getNonProxiedHosts(); - + /** * Sets the list of hosts for which non proxy should be used. - * + * * <p> * This method affects only non-proxied hosts defined in Eclipse by user and * doesn't affect settings of the system proxies (being used when the system * support is enabled). * </p> - * + * * @param hosts * the list of hosts for which non proxy should be used * @throws CoreException * if the non-proxied host list could not be set */ void setNonProxiedHosts(String[] hosts) throws CoreException; - + /** * Registers a listener that will be notified when proxy related * information changes. Adding a listener that is already registered @@ -253,7 +253,7 @@ public interface IProxyService { * @param listener a change listener */ void addProxyChangeListener(IProxyChangeListener listener); - + /** * Removes a listener. Removing a listener that is not registered * has no effect. diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java index 718174e32..581c6818f 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java @@ -36,7 +36,7 @@ public class Activator extends AbstractUIPlugin { /** * Returns the shared instance - * + * * @return the shared instance */ public static Activator getDefault() { diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java index e406d20e5..b9b5ea7e5 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NonProxyHostsComposite.java @@ -327,7 +327,7 @@ public class NonProxyHostsComposite extends Composite { if (!data.getSource().equals(provider)) { natives.add(data); } - } + } bypassHosts.removeAll(natives); String providers[] = ProxySelector.getProviders(); for (int i = 0; i < providers.length; i++) { @@ -338,7 +338,7 @@ public class NonProxyHostsComposite extends Composite { hostsViewer.refresh(); setProvider(currentProvider); } - + private List getProxyBypassData(String provider) { List bypassProxyData = new ArrayList(); String[] hosts = ProxySelector.getBypassHosts(provider); diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java index 4aa5e29c8..9e0b2f163 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntriesComposite.java @@ -298,7 +298,7 @@ public class ProxyEntriesComposite extends Composite { } public void refresh() { - String provider = getEditableProvider(); + String provider = getEditableProvider(); Iterator it = proxyEntries.iterator(); ArrayList natives = new ArrayList(); while (it.hasNext()) { @@ -317,7 +317,7 @@ public class ProxyEntriesComposite extends Composite { entriesViewer.refresh(); setProvider(currentProvider); } - + private List getProxyData(String provider) { List proxyDatas = new ArrayList(); ProxyData[] entries = ProxySelector.getProxyData(provider); diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java index cafdaea6e..e0b532b4f 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyPreferencePage.java @@ -134,7 +134,7 @@ public class ProxyPreferencePage extends PreferencePage implements nonProxyHostsComposite.setProvider(name); refresh(); } - + private void refresh() { proxyEntriesComposite.refresh(); nonProxyHostsComposite.refresh(); diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java index 4f5dade17..e1e9a9c52 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/NetAuthenticator.java @@ -13,7 +13,7 @@ package org.eclipse.ui.internal.net.auth; import java.net.*; public class NetAuthenticator extends Authenticator { - + /* * @see Authenticator#getPasswordAuthentication() */ diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java index 05a967bae..622168ba8 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/auth/UserValidationDialog.java @@ -34,7 +34,7 @@ public class UserValidationDialog extends Dialog { * Gets user and password from a user. May be called from any thread * @param host the host name * @param message the message to be displayed when prompting - * + * * @return UserAuthentication that contains the userid and the password or * <code>null</code> if the dialog has been cancelled */ @@ -58,19 +58,19 @@ public class UserValidationDialog extends Dialog { } /** * Gets user and password from a user Must be called from UI thread - * + * * @return UserAuthentication that contains the userid and the password or * <code>null</code> if the dialog has been cancelled */ protected static Authentication askForAuthentication(String host, String message) { - UserValidationDialog ui = new UserValidationDialog(null, host, message); + UserValidationDialog ui = new UserValidationDialog(null, host, message); ui.open(); return ui.getAuthentication(); } /** * Creates a new UserValidationDialog. - * + * * @param parentShell * parent Shell or null */ @@ -85,7 +85,7 @@ public class UserValidationDialog extends Dialog { */ protected void configureShell(Shell newShell) { super.configureShell(newShell); - newShell.setText(NetUIMessages.UserValidationDialog_0); + newShell.setText(NetUIMessages.UserValidationDialog_0); } /** */ @@ -105,8 +105,8 @@ public class UserValidationDialog extends Dialog { main.setLayoutData(new GridData(GridData.FILL_BOTH)); Label label = new Label(main, SWT.WRAP); - String text = NLS.bind(NetUIMessages.UserValidationDialog_1, host); - text += "\n\n" + message; //$NON-NLS-1$ + String text = NLS.bind(NetUIMessages.UserValidationDialog_1, host); + text += "\n\n" + message; //$NON-NLS-1$ label.setText(text); GridData data = new GridData(GridData.FILL_HORIZONTAL); data.horizontalSpan = 3; @@ -122,7 +122,7 @@ public class UserValidationDialog extends Dialog { * Creates the three widgets that represent the user name entry area. */ protected void createPasswordFields(Composite parent) { - new Label(parent, SWT.NONE).setText(NetUIMessages.UserValidationDialog_2); + new Label(parent, SWT.NONE).setText(NetUIMessages.UserValidationDialog_2); passwordField = new Text(parent, SWT.BORDER | SWT.PASSWORD); GridData data = new GridData(GridData.FILL_HORIZONTAL); @@ -135,7 +135,7 @@ public class UserValidationDialog extends Dialog { * Creates the three widgets that represent the user name entry area. */ protected void createUsernameFields(Composite parent) { - new Label(parent, SWT.NONE).setText(NetUIMessages.UserValidationDialog_3); + new Label(parent, SWT.NONE).setText(NetUIMessages.UserValidationDialog_3); usernameField = new Text(parent, SWT.BORDER); GridData data = new GridData(GridData.FILL_HORIZONTAL); |