diff --git a/terminal/features/org.eclipse.tm.terminal.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.feature/feature.xml index 882e7d5ebcf..2c69251458e 100644 --- a/terminal/features/org.eclipse.tm.terminal.feature/feature.xml +++ b/terminal/features/org.eclipse.tm.terminal.feature/feature.xml @@ -8,11 +8,10 @@ SPDX-License-Identifier: EPL-2.0 --> - org.eclipse.tm.terminal.feature + 4.5.200-SNAPSHOT eclipse-feature diff --git a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml index 6e5319669fc..2c4ec8b696b 100644 --- a/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml +++ b/terminal/features/org.eclipse.tm.terminal.view.feature/feature.xml @@ -8,11 +8,10 @@ SPDX-License-Identifier: EPL-2.0 --> - org.eclipse.tm.terminal.view.feature + 4.5.200-SNAPSHOT eclipse-feature 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 a01bdb1d20d..610381a5c45 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.view.ui;singleton:=true -Bundle-Version: 4.5.102.qualifier +Bundle-Version: 4.5.200.qualifier Bundle-Activator: org.eclipse.tm.terminal.view.ui.activator.UIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.400", diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml index 2607a72e0a7..b23790d92b0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/pom.xml @@ -22,6 +22,6 @@ org.eclipse.tm.terminal.view.ui - 4.5.102-SNAPSHOT + 4.5.200-SNAPSHOT eclipse-plugin diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java index 118f5cd51c6..d5941ccae69 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/ConfigurationPanelControl.java @@ -237,8 +237,8 @@ public class ConfigurationPanelControl implements IConfigurationPanelContainer, Assert.isNotNull(parent); if (configurationPanelKeys != null) { - for (int i = 0; i < configurationPanelKeys.length; i++) { - IConfigurationPanel configPanel = getConfigurationPanel(configurationPanelKeys[i]); + for (String configurationPanelKey : configurationPanelKeys) { + IConfigurationPanel configPanel = getConfigurationPanel(configurationPanelKey); Assert.isNotNull(configPanel); configPanel.setupPanel(parent); } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java index 16a05b280af..efaf2fcfa82 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/controls/NoteCompositeHelper.java @@ -47,9 +47,7 @@ public class NoteCompositeHelper { @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); - Control[] childs = getChildren(); - for (int iChild = 0; iChild < childs.length; iChild++) { - Control child = childs[iChild]; + for (Control child : getChildren()) { child.setEnabled(enabled); } } diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java index 4b89123c69a..f81cb25dca0 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/manager/ConsoleManager.java @@ -234,11 +234,7 @@ public class ConsoleManager { private IViewPart getTerminalsViewWithSecondaryId(String id, String secondaryId, boolean restore) { Assert.isNotNull(id); - IWorkbenchPage page = getActiveWorkbenchPage(); - - IViewReference[] refs = page.getViewReferences(); - for (int i = 0; i < refs.length; i++) { - IViewReference ref = refs[i]; + for (IViewReference ref : getActiveWorkbenchPage().getViewReferences()) { if (ref.getId().equals(id)) { if (ANY_SECONDARY_ID.equals(secondaryId) || secondaryId == null && ref.getSecondaryId() == null @@ -289,13 +285,10 @@ public class ConsoleManager { public String getNextTerminalSecondaryId(String id) { Assert.isNotNull(id); - IWorkbenchPage page = getActiveWorkbenchPage(); Map terminalViews = new HashMap(); int maxNumber = 0; - IViewReference[] refs = page.getViewReferences(); - for (int i = 0; i < refs.length; i++) { - IViewReference ref = refs[i]; + for (IViewReference ref : getActiveWorkbenchPage().getViewReferences()) { if (ref.getId().equals(id)) { if (ref.getSecondaryId() != null) { terminalViews.put(ref.getSecondaryId(), ref); @@ -533,9 +526,7 @@ public class ConsoleManager { IWorkbenchPage page = getActiveWorkbenchPage(); if (page != null) { - IViewReference[] refs = page.getViewReferences(); - for (int i = 0; i < refs.length; i++) { - IViewReference ref = refs[i]; + for (IViewReference ref : page.getViewReferences()) { IViewPart part = ref != null ? ref.getView(false) : null; if (part instanceof ITerminalsView) { CTabFolder tabFolder = (CTabFolder) part.getAdapter(CTabFolder.class); @@ -576,8 +567,7 @@ public class ConsoleManager { IWorkbenchPage page = getActiveWorkbenchPage(); if (page != null) { IViewReference[] refs = page.getViewReferences(); - for (int i = 0; i < refs.length; i++) { - IViewReference ref = refs[i]; + for (IViewReference ref : refs) { if (ref.getId().equals(id)) { IViewPart part = ref.getView(true); if (part instanceof ITerminalsView) { 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 c5be47d6bee..e58140f5444 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 @@ -132,8 +132,7 @@ public abstract class AbstractExtendedConfigurationPanel extends AbstractConfigu String[] hosts = settings.getArray(HOSTS_TAG); if (hosts != null) { - for (int i = 0; i < hosts.length; i++) { - String hostEntry = hosts[i]; + for (String hostEntry : hosts) { String[] hostString = hostEntry.split("\\|");//$NON-NLS-1$ String hostName = hostString[0]; if (hostString.length == 2) { diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java index bf59b86d476..fcb6aa1c914 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java +++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/services/TerminalService.java @@ -42,7 +42,7 @@ public class TerminalService implements ITerminalService { /** * The registered terminal tab dispose listeners. */ - private final ListenerList terminalTabListeners = new ListenerList(); + private final ListenerList terminalTabListeners = new ListenerList(); // Flag to remember if the terminal view has been restored or not. private boolean fRestoringView; @@ -120,10 +120,8 @@ public class TerminalService implements ITerminalService { if (terminalTabListeners.isEmpty()) return; // Get the list or currently registered listeners - Object[] l = terminalTabListeners.getListeners(); // Loop the registered terminal tab listeners and invoke the proper method - for (int i = 0; i < l.length; i++) { - final ITerminalTabListener listener = (ITerminalTabListener) l[i]; + for (final ITerminalTabListener listener : terminalTabListeners) { ISafeRunnable job = new ISafeRunnable() { @Override public void handleException(Throwable exception) {