diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF index 9749bdb5ca7..e90ac72087a 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.tm.terminal.view.ui;bundle-version="4.5.0";resolution:=optional, org.eclipse.tm.terminal.control;bundle-version="4.5.0", org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.eclipse.tm.terminal.connector.telnet.activator;x-internal:=true, diff --git a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java index 80d6a7512cd..5a16fc23415 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/launcher/TelnetLauncherDelegate.java @@ -41,25 +41,16 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { // The Telnet terminal connection memento handler private final IMementoHandler mementoHandler = new TelnetMementoHandler(); - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#needsUserConfiguration() - */ @Override public boolean needsUserConfiguration() { return true; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getPanel(org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer) - */ @Override public IConfigurationPanel getPanel(IConfigurationPanelContainer container) { return new TelnetWizardConfigurationPanel(container); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#execute(java.util.Map, org.eclipse.tm.terminal.view.core.interfaces.ITerminalService.Done) - */ @Override public void execute(Map properties, ITerminalService.Done done) { Assert.isNotNull(properties); @@ -109,20 +100,14 @@ public class TelnetLauncherDelegate extends AbstractLauncherDelegate { return Messages.TelnetLauncherDelegate_terminalTitle_default; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class) - */ @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (IMementoHandler.class.equals(adapter)) { - return mementoHandler; + return adapter.cast(mementoHandler); } return super.getAdapter(adapter); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#createTerminalConnector(java.util.Map) - */ @Override public ITerminalConnector createTerminalConnector(Map properties) { Assert.isNotNull(properties); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF index c8a815edefe..c4d10df2254 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.terminal.view.core.activator.CoreBundleActivato Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.core.runtime;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.eclipse.tm.terminal.view.core, diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java index 83e6ee59d14..595046ffdb8 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/TerminalServiceFactory.java @@ -34,7 +34,7 @@ public final class TerminalServiceFactory { if (bundle != null && bundle.getState() != Bundle.UNINSTALLED && bundle.getState() != Bundle.STOPPING) { try { Class clazz = bundle.loadClass("org.eclipse.tm.terminal.view.ui.services.TerminalService"); //$NON-NLS-1$ - instance = (ITerminalService) clazz.newInstance(); + instance = (ITerminalService) clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { if (Platform.inDebugMode()) { Platform.getLog(bundle).log(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java index 8a604c3e4ad..b660a387c73 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.core/src/org/eclipse/tm/terminal/view/core/preferences/ScopedEclipsePreferences.java @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChange import org.eclipse.core.runtime.preferences.IPreferenceFilter; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.core.runtime.preferences.PreferenceFilterEntry; import org.osgi.service.prefs.BackingStoreException; /** @@ -58,7 +59,7 @@ public class ScopedEclipsePreferences { /** * The registered preference change listeners. */ - private final ListenerList listeners = new ListenerList(); + private final ListenerList listeners = new ListenerList<>(); /** * Constructor. @@ -108,19 +109,13 @@ public class ScopedEclipsePreferences { Assert.isNotNull(stream); try { IPreferenceFilter filter = new IPreferenceFilter() { - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.IPreferenceFilter#getScopes() - */ @Override public String[] getScopes() { return new String[] { InstanceScope.SCOPE }; } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.preferences.IPreferenceFilter#getMapping(java.lang.String) - */ @Override - public Map getMapping(String scope) { + public Map getMapping(String scope) { return null; } }; @@ -437,12 +432,9 @@ public class ScopedEclipsePreferences { if (listeners.isEmpty()) return; - // Get the list or currently registered listeners - Object[] l = listeners.getListeners(); // Create the preference change event final PreferenceChangeEvent event = new PreferenceChangeEvent(node, key, oldValue, newValue); - for (int i = 0; i < l.length; i++) { - final IPreferenceChangeListener listener = (IPreferenceChangeListener) l[i]; + for (IPreferenceChangeListener listener : listeners) { ISafeRunnable job = new ISafeRunnable() { @Override public void handleException(Throwable exception) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF index 3739c11e820..9b63f42bf59 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", org.eclipse.tm.terminal.view.core;bundle-version="4.5.0", org.eclipse.tm.terminal.control;bundle-version="4.5.0", org.eclipse.ui;bundle-version="3.8.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.eclipse.tm.terminal.view.ui.actions, diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java index 5c259d51cec..4b69253c10f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/ExternalExecutablesState.java @@ -37,8 +37,8 @@ public class ExternalExecutablesState extends AbstractSourceProvider { } @Override - public Map getCurrentState() { - Map map = new HashMap(1); + public Map getCurrentState() { + Map map = new HashMap<>(1); map.put(CONFIGURED_STATE, Boolean.valueOf(enabled).toString().toUpperCase()); return map; } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java index 17365291f83..a1e608e5cee 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/launcher/AbstractLauncherDelegate.java @@ -40,9 +40,6 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements // The hidden attribute private boolean hidden; - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object) - */ @Override public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException { @@ -94,41 +91,26 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements NLS.bind(Messages.Extension_error_missingRequiredAttribute, attributeName, extensionId), null)); } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getId() - */ @Override public String getId() { return id; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getLabel() - */ @Override public String getLabel() { return label != null ? label.trim() : ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#getEnablement() - */ @Override public Expression getEnablement() { return expression; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.ILauncherDelegate#isHidden() - */ @Override public boolean isHidden() { return hidden; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (obj instanceof AbstractLauncherDelegate) { @@ -137,9 +119,6 @@ public abstract class AbstractLauncherDelegate extends PlatformObject implements return super.equals(obj); } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return id.hashCode(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java index dacfa4e4306..df320d17055 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/local/showin/DynamicContributionItems.java @@ -43,9 +43,6 @@ public class DynamicContributionItems extends CompoundContributionItem implement // Reference to the local terminal launcher delegate /* default */ ILauncherDelegate delegate; - /* (non-Javadoc) - * @see org.eclipse.ui.menus.IWorkbenchContribution#initialize(org.eclipse.ui.services.IServiceLocator) - */ @Override public void initialize(IServiceLocator serviceLocator) { this.serviceLocator = serviceLocator; @@ -55,12 +52,9 @@ public class DynamicContributionItems extends CompoundContributionItem implement .getLauncherDelegate("org.eclipse.tm.terminal.connector.local.launcher.local", false); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() - */ @Override protected IContributionItem[] getContributionItems() { - List items = new ArrayList(); + List items = new ArrayList<>(); if (delegate != null) { List> l = ExternalExecutablesManager.load(); @@ -118,7 +112,7 @@ public class DynamicContributionItems extends CompoundContributionItem implement if (selection != null && selection.isEmpty()) selection = null; - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID, delegate.getId()); if (selection != null) properties.put(ITerminalsConnectorConstants.PROP_SELECTION, selection); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java index 7fb05f2ac42..0e619ff1c38 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractConfigurationPanel.java @@ -46,25 +46,16 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel this.container = container; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getContainer() - */ @Override public IConfigurationPanelContainer getContainer() { return container; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessage() - */ @Override public final String getMessage() { return message; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType() - */ @Override public final int getMessageType() { return messageType; @@ -81,9 +72,6 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel this.messageType = messageType; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#dispose() - */ @Override public void dispose() { } @@ -97,40 +85,25 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel this.topControl = topControl; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getControl() - */ @Override public Composite getControl() { return topControl; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setSelection(org.eclipse.jface.viewers.ISelection) - */ @Override public void setSelection(ISelection selection) { this.selection = selection; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#getSelection() - */ @Override public ISelection getSelection() { return selection; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { } @@ -150,9 +123,6 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel return settingsSlotId; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setEnabled(boolean) - */ @Override public void setEnabled(boolean enabled) { this.enabled = enabled; @@ -165,39 +135,24 @@ public abstract class AbstractConfigurationPanel implements IConfigurationPanel return enabled; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#isValid() - */ @Override public boolean isValid() { setMessage(null, NONE); return true; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#activate() - */ @Override public void activate() { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#extractData(java.util.Map) - */ @Override public void extractData(Map data) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#setupData(java.util.Map) - */ @Override public void setupData(Map data) { } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanel#updateData(java.util.Map) - */ @Override public void updateData(Map data) { } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java index cbbd9243b55..3daa8e5710f 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/panels/AbstractExtendedConfigurationPanel.java @@ -46,10 +46,10 @@ import org.eclipse.tm.terminal.view.core.TerminalContextPropertiesProviderFactor import org.eclipse.tm.terminal.view.core.interfaces.ITerminalContextPropertiesProvider; import org.eclipse.tm.terminal.view.core.interfaces.constants.IContextPropertiesConstants; import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants; -import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer; import org.eclipse.tm.terminal.view.ui.nls.Messages; import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.WorkbenchEncoding; import org.osgi.framework.Bundle; @@ -69,10 +69,10 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu // The last selected encoding /* default */ String lastSelectedEncoding; // The last entered custom encodings - /* default */ final List encodingHistory = new ArrayList(); + /* default */ final List encodingHistory = new ArrayList<>(); // A map containing the settings per host - protected final Map> hostSettingsMap = new HashMap>(); + protected final Map> hostSettingsMap = new HashMap<>(); /** * Constructor. @@ -124,9 +124,6 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu return null; } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doRestoreWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doRestoreWidgetValues(IDialogSettings settings, String idPrefix) { Assert.isNotNull(settings); @@ -202,7 +199,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu */ private HashMap deSerialize(String hostString) { Assert.isNotNull(hostString); - HashMap attr = new HashMap(); + HashMap attr = new HashMap<>(); if (hostString.length() != 0) { String[] hostAttrs = hostString.split("\\:");//$NON-NLS-1$ @@ -237,9 +234,6 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu } } - /* (non-Javadoc) - * @see org.eclipse.tm.terminal.view.ui.panels.AbstractConfigurationPanel#doSaveWidgetValues(org.eclipse.jface.dialogs.IDialogSettings, java.lang.String) - */ @Override public void doSaveWidgetValues(IDialogSettings settings, String idPrefix) { Iterator nextHost = hostSettingsMap.keySet().iterator(); @@ -314,7 +308,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu * @return The list of host names. */ private List getHostList() { - List hostList = new ArrayList(); + List hostList = new ArrayList<>(); hostList.addAll(hostSettingsMap.keySet()); return hostList; } @@ -402,7 +396,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu deleteHostButton = new Button(comboComposite, SWT.NONE); // deleteHostButton.setText(Messages.AbstractConfigurationPanel_delete); - ISharedImages workbenchImages = UIPlugin.getDefault().getWorkbench().getSharedImages(); + ISharedImages workbenchImages = PlatformUI.getWorkbench().getSharedImages(); deleteHostButton.setImage(workbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE).createImage()); deleteHostButton.setToolTipText(Messages.AbstractConfigurationPanel_deleteButtonTooltip); @@ -521,7 +515,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu */ protected void fillEncodingCombo() { if (encodingCombo != null) { - List encodings = new ArrayList(); + List encodings = new ArrayList<>(); // Default encoding encodings.add("Default (ISO-8859-1)"); //$NON-NLS-1$ @@ -551,7 +545,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu * Add given encoding names to the list. Duplicates are filtered out by comparing aliases. */ private void addEncodings(List encodings, String... toadd) { - Set aliases = new HashSet(); + Set aliases = new HashSet<>(); for (String name : toadd) { if (name == null) continue; diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java index 29ce5f356ac..5541551f06e 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/preferences/PreferencePage.java @@ -34,18 +34,14 @@ import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; 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.graphics.GC; @@ -93,14 +89,11 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage private Button commandBrowseButton; private Text arguments; - /* default */ final List> executables = new ArrayList>(); - /* default */ final Map images = new HashMap(); + /* default */ final List> executables = new ArrayList<>(); + /* default */ final Map images = new HashMap<>(); /* default */ static final Object[] NO_ELEMENTS = new Object[0]; - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ @Override public void init(IWorkbench workbench) { Bundle bundle = Platform.getBundle("org.eclipse.debug.ui"); //$NON-NLS-1$ @@ -109,9 +102,6 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage } } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ @Override protected Control createContents(final Composite parent) { final GC gc = new GC(parent); @@ -134,23 +124,20 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage command = new Text(group, SWT.SINGLE | SWT.BORDER); command.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - command.addModifyListener(new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - boolean valid = true; - String message = null; + command.addModifyListener(e -> { + boolean valid = true; + String message = null; - String text = command.getText(); - if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$ - IPath p = new Path(text.trim()); - valid = p.toFile().isFile() && p.toFile().canRead() && p.toFile().canExecute(); - if (!valid) - message = Messages.PreferencePage_command_invalid; - } - - setValid(valid); - setErrorMessage(message); + String text = command.getText(); + if (text != null && !"".equals(text.trim())) { //$NON-NLS-1$ + IPath p = new Path(text.trim()); + valid = p.toFile().isFile() && p.toFile().canRead() && p.toFile().canExecute(); + if (!valid) + message = Messages.PreferencePage_command_invalid; } + + setValid(valid); + setErrorMessage(message); }); commandBrowseButton = new Button(group, SWT.PUSH); @@ -231,35 +218,32 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage } workingDir.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); workingDir.select(0); - workingDir.addModifyListener(new ModifyListener() { - @Override - public void modifyText(ModifyEvent e) { - boolean valid = true; - String message = null; + workingDir.addModifyListener(e -> { + boolean valid = true; + String message = null; - String text = workingDir.getText(); - if (text != null && !"".equals(text.trim()) //$NON-NLS-1$ - && !Messages.PreferencePage_workingDir_userhome_label.equals(text) - && !Messages.PreferencePage_workingDir_eclipsehome_label.equals(text) - && !Messages.PreferencePage_workingDir_eclipsews_label.equals(text)) { - try { - // Resolve possible dynamic variables - IStringVariableManager vm = VariablesPlugin.getDefault().getStringVariableManager(); - String resolved = vm.performStringSubstitution(text.trim()); + String text = workingDir.getText(); + if (text != null && !"".equals(text.trim()) //$NON-NLS-1$ + && !Messages.PreferencePage_workingDir_userhome_label.equals(text) + && !Messages.PreferencePage_workingDir_eclipsehome_label.equals(text) + && !Messages.PreferencePage_workingDir_eclipsews_label.equals(text)) { + try { + // Resolve possible dynamic variables + IStringVariableManager vm = VariablesPlugin.getDefault().getStringVariableManager(); + String resolved = vm.performStringSubstitution(text.trim()); - IPath p = new Path(resolved); - valid = p.toFile().canRead() && p.toFile().isDirectory(); - if (!valid) - message = Messages.PreferencePage_workingDir_invalid; - } catch (CoreException ex) { - valid = false; - message = ex.getLocalizedMessage(); - } + IPath p = new Path(resolved); + valid = p.toFile().canRead() && p.toFile().isDirectory(); + if (!valid) + message = Messages.PreferencePage_workingDir_invalid; + } catch (CoreException ex) { + valid = false; + message = ex.getLocalizedMessage(); } - - setValid(valid); - setErrorMessage(message); } + + setValid(valid); + setErrorMessage(message); }); browseButton = new Button(group, SWT.PUSH); @@ -583,12 +567,7 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage viewer.setInput(executables); - viewer.addPostSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - updateButtons(); - } - }); + viewer.addPostSelectionChangedListener(event -> updateButtons()); updateButtons(); @@ -618,9 +597,6 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage } } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ @Override protected void performDefaults() { if (!Platform.OS_WIN32.equals(Platform.getOS())) { @@ -652,9 +628,6 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage super.performDefaults(); } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performOk() - */ @Override public boolean performOk() { if (!Platform.OS_WIN32.equals(Platform.getOS())) { @@ -698,9 +671,6 @@ public class PreferencePage extends org.eclipse.jface.preference.PreferencePage return super.performOk(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.DialogPage#dispose() - */ @Override public void dispose() { for (Image i : images.values()) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java index 4b65ceadb35..1772f5d24ea 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/streams/OutputStreamMonitor.java @@ -58,10 +58,10 @@ public class OutputStreamMonitor implements IDisposable { private boolean disposed; // A list of object to dispose if this monitor is disposed - private final List disposables = new ArrayList(); + private final List disposables = new ArrayList<>(); // The list of registered listener - private final ListenerList listeners; + private final ListenerList listeners; /** * Constructor. @@ -80,7 +80,7 @@ public class OutputStreamMonitor implements IDisposable { this.lineSeparator = lineSeparator; - this.listeners = new ListenerList(); + this.listeners = new ListenerList<>(); } /** @@ -126,9 +126,6 @@ public class OutputStreamMonitor implements IDisposable { disposables.remove(disposable); } - /* (non-Javadoc) - * @see org.eclipse.ui.services.IDisposable#dispose() - */ @Override public void dispose() { // If already disposed --> return immediately @@ -160,12 +157,7 @@ public class OutputStreamMonitor implements IDisposable { return; // Create a new runnable which is constantly reading from the stream - Runnable runnable = new Runnable() { - @Override - public void run() { - readStream(); - } - }; + Runnable runnable = () -> readStream(); // Create the reader thread thread = new Thread(runnable, "Terminal Output Stream Monitor Thread"); //$NON-NLS-1$ @@ -319,11 +311,8 @@ public class OutputStreamMonitor implements IDisposable { // If listeners are registered, invoke the listeners now. if (listeners.size() > 0) { - for (Object candidate : listeners.getListeners()) { - if (!(candidate instanceof ITerminalServiceOutputStreamMonitorListener)) - continue; - ((ITerminalServiceOutputStreamMonitorListener) candidate).onContentReadFromStream(byteBuffer, - bytesRead); + for (ITerminalServiceOutputStreamMonitorListener candidate : listeners) { + candidate.onContentReadFromStream(byteBuffer, bytesRead); } } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java index eee419d35d1..11ced231239 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java @@ -49,16 +49,13 @@ public class TabFolderToolbarHandler extends PlatformObject { // Reference to the selection listener private ToolbarSelectionChangedListener selectionChangedListener; // The list of actions available within the toolbar - private final List toolbarActions = new ArrayList(); + private final List toolbarActions = new ArrayList<>(); /** * Default selection listener implementation. */ protected class ToolbarSelectionChangedListener implements ISelectionChangedListener { - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ @Override public void selectionChanged(SelectionChangedEvent event) { boolean enable = event != null; @@ -100,9 +97,8 @@ public class TabFolderToolbarHandler extends PlatformObject { * * @return The tab folder or null. */ - @SuppressWarnings("cast") protected final CTabFolder getTabFolder() { - return (CTabFolder) getParentView().getAdapter(CTabFolder.class); + return getParentView().getAdapter(CTabFolder.class); } /** @@ -110,12 +106,11 @@ public class TabFolderToolbarHandler extends PlatformObject { * * @return The currently active terminal control or null. */ - @SuppressWarnings("cast") public ITerminalViewControl getActiveTerminalViewControl() { ITerminalViewControl terminal = null; // Get the active tab item from the tab folder manager - TabFolderManager manager = (TabFolderManager) getParentView().getAdapter(TabFolderManager.class); + TabFolderManager manager = getParentView().getAdapter(TabFolderManager.class); if (manager != null) { // If we have the active tab item, we can get the active terminal control CTabItem activeTabItem = manager.getActiveTabItem(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java index 526cd10e4ce..a72bf9b458c 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java @@ -54,8 +54,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; import org.eclipse.tm.terminal.view.ui.activator.UIPlugin; import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView; import org.eclipse.tm.terminal.view.ui.nls.Messages; @@ -167,32 +165,20 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa return draggedTabFolderManager; } - /* (non-Javadoc) - * @see org.eclipse.swt.dnd.Transfer#getTypeIds() - */ @Override protected int[] getTypeIds() { return new int[] { TYPEID }; } - /* (non-Javadoc) - * @see org.eclipse.swt.dnd.Transfer#getTypeNames() - */ @Override protected String[] getTypeNames() { return new String[] { TYPE_NAME }; } - /* (non-Javadoc) - * @see org.eclipse.swt.dnd.ByteArrayTransfer#javaToNative(java.lang.Object, org.eclipse.swt.dnd.TransferData) - */ @Override public void javaToNative(Object data, TransferData transferData) { } - /* (non-Javadoc) - * @see org.eclipse.swt.dnd.ByteArrayTransfer#nativeToJava(org.eclipse.swt.dnd.TransferData) - */ @Override public Object nativeToJava(TransferData transferData) { return null; @@ -211,60 +197,54 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa */ private void addDragSupport() { // The event listener is registered as filter. It will receive events from all widgets. - PlatformUI.getWorkbench().getDisplay().addFilter(SWT.DragDetect, new Listener() { - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ - @Override - public void handleEvent(Event event) { - // Only handle events where a CTabFolder is the source - if (!(event.widget instanceof CTabFolder)) - return; - // TabFolderManager must be created - if (tabFolderManager == null) - return; + PlatformUI.getWorkbench().getDisplay().addFilter(SWT.DragDetect, event -> { + // Only handle events where a CTabFolder is the source + if (!(event.widget instanceof CTabFolder)) + return; + // TabFolderManager must be created + if (tabFolderManager == null) + return; - // only for own tab folders - if (event.widget != tabFolderControl) - return; + // only for own tab folders + if (event.widget != tabFolderControl) + return; - // Skip drag if DnD is still ongoing (bug 443787) - if (tabFolderControl.getData(DND.DRAG_SOURCE_KEY) != null) - return; + // Skip drag if DnD is still ongoing (bug 443787) + if (tabFolderControl.getData(DND.DRAG_SOURCE_KEY) != null) + return; - final CTabFolder draggedFolder = (CTabFolder) event.widget; + final CTabFolder draggedFolder = (CTabFolder) event.widget; - int operations = DND.DROP_MOVE | DND.DROP_DEFAULT; - final DragSource dragSource = new DragSource(draggedFolder, operations); + int operations = DND.DROP_MOVE | DND.DROP_DEFAULT; + final DragSource dragSource = new DragSource(draggedFolder, operations); - // Initialize the terminal transfer type data - TerminalTransfer.getInstance().setDraggedFolderItem(tabFolderManager.getActiveTabItem()); - TerminalTransfer.getInstance().setTabFolderManager(tabFolderManager); + // Initialize the terminal transfer type data + TerminalTransfer.getInstance().setDraggedFolderItem(tabFolderManager.getActiveTabItem()); + TerminalTransfer.getInstance().setTabFolderManager(tabFolderManager); - Transfer[] transferTypes = new Transfer[] { TerminalTransfer.getInstance() }; - dragSource.setTransfer(transferTypes); + Transfer[] transferTypes = new Transfer[] { TerminalTransfer.getInstance() }; + dragSource.setTransfer(transferTypes); - // Add a drag source listener to cleanup after the drag operation finished - dragSource.addDragListener(new DragSourceListener() { - @Override - public void dragStart(DragSourceEvent event) { - } + // Add a drag source listener to cleanup after the drag operation finished + dragSource.addDragListener(new DragSourceListener() { + @Override + public void dragStart(DragSourceEvent event) { + } - @Override - public void dragSetData(DragSourceEvent event) { - } + @Override + public void dragSetData(DragSourceEvent event) { + } - @Override - public void dragFinished(DragSourceEvent event) { - // dispose this drag-source-listener by disposing its drag-source - dragSource.dispose(); + @Override + public void dragFinished(DragSourceEvent event) { + // dispose this drag-source-listener by disposing its drag-source + dragSource.dispose(); - // Inhibit the action of CTabFolder's default DragDetect-listeners, - // fire a mouse-click event on the widget that was dragged. - draggedFolder.notifyListeners(SWT.MouseUp, null); - } - }); - } + // Inhibit the action of CTabFolder's default DragDetect-listeners, + // fire a mouse-click event on the widget that was dragged. + draggedFolder.notifyListeners(SWT.MouseUp, null); + } + }); }); } @@ -332,9 +312,6 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa }); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#dispose() - */ @Override public void dispose() { // Dispose the tab folder manager @@ -356,18 +333,12 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa super.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.ViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento) - */ @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); restoreState(memento); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createPartControl(Composite parent) { // Create the page book control @@ -666,10 +637,6 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa mementoHandler.restoreState(this, memento); } - /* (non-Javadoc) - * @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext) - */ - @SuppressWarnings("cast") @Override public boolean show(ShowInContext context) { if (context != null) { @@ -696,7 +663,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa boolean isValid = true; // Build a new structured selection with the adapted elements - List elements = new ArrayList(); + List elements = new ArrayList<>(); Iterator iterator = ((IStructuredSelection) selection).iterator(); while (iterator.hasNext() && isValid) { @@ -781,8 +748,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa // If the selection is valid, fire the command to open the local terminal if (isValid) { selection = new StructuredSelection(elements); - ICommandService service = (ICommandService) PlatformUI.getWorkbench() - .getService(ICommandService.class); + ICommandService service = PlatformUI.getWorkbench().getService(ICommandService.class); Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.connector.local.command.launch") //$NON-NLS-1$ : null; @@ -790,8 +756,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa try { ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null); Assert.isNotNull(pCmd); - IHandlerService handlerSvc = (IHandlerService) PlatformUI.getWorkbench() - .getService(IHandlerService.class); + IHandlerService handlerSvc = PlatformUI.getWorkbench().getService(IHandlerService.class); Assert.isNotNull(handlerSvc); IEvaluationContext ctx = handlerSvc.getCurrentState(); ctx = new EvaluationContext(ctx, selection);