diff options
author | Lars Vogel | 2020-02-11 20:20:57 +0000 |
---|---|---|
committer | Lars Vogel | 2020-02-12 08:44:43 +0000 |
commit | 7abf5fb4f16dbb3c24db468695b6a6a7ca1b27b1 (patch) | |
tree | a7dcb6a51563e7244ce24b7c939278d64f3a9c7e | |
parent | 93870379455f10be3a675d77025d41f4fd6223c0 (diff) | |
download | eclipse.platform.team-7abf5fb4f16dbb3c24db468695b6a6a7ca1b27b1.tar.gz eclipse.platform.team-7abf5fb4f16dbb3c24db468695b6a6a7ca1b27b1.tar.xz eclipse.platform.team-7abf5fb4f16dbb3c24db468695b6a6a7ca1b27b1.zip |
Bug 560040 - Remove unnecessary activator in org.eclipse.ui.netI20200212-0910
Change-Id: Iee5fcd8ce6922862a99b2d95aaf903c190aebaa9
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
3 files changed, 15 insertions, 68 deletions
diff --git a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF index 0c51e106f..cccca64c2 100644 --- a/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %PLUGIN_NAME Bundle-SymbolicName: org.eclipse.ui.net; singleton:=true Bundle-Version: 1.3.700.qualifier -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)", 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 deleted file mode 100644 index f0e9709f0..000000000 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/Activator.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2017 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * 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.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.ui.net"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - plugin = this; - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - -} diff --git a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java index b897488cd..9542e4b6d 100644 --- a/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java +++ b/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/ProxyEntryDialog.java @@ -45,6 +45,8 @@ public class ProxyEntryDialog extends StatusDialog { private Label passwordLabel; private Text passwordText; + private static final String PLUGIN_ID = "org.eclipse.ui.net"; //$NON-NLS-1$ + public ProxyEntryDialog(Shell parent, ProxyData data, String[] addedArray, String title) { super(parent); @@ -184,12 +186,14 @@ public class ProxyEntryDialog extends StatusDialog { URI uri = new URI(hostText.getText()); scheme = uri.getScheme(); } catch (URISyntaxException e) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_10, null)); return false; } if (scheme != null) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_13, null)); return false; } @@ -221,7 +225,8 @@ public class ProxyEntryDialog extends StatusDialog { String type = typeText.getText(); for (String addedType : addedTypes) { if (addedType.equalsIgnoreCase(type)) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_9, null)); return; } @@ -230,25 +235,28 @@ public class ProxyEntryDialog extends StatusDialog { return; } if (hostText.getText().length() == 0) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_10, null)); return; } try { int port = Integer.parseInt(portText.getText()); if (port < 0) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_11, null)); return; } } catch (NumberFormatException e) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, + PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_11, null)); return; } if (requiresAuthentificationButton.getSelection()) { if (userIdText.getText().length() == 0) { - updateStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + updateStatus(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, NetUIMessages.ProxyEntryDialog_12, null)); return; } |