mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Fix warnings in o.e.tm.terminal.control bundle

Browse source 
Change-Id: Ief69751ba4affc13240cfdb4b79e190b3356bbd9
This commit is contained in:
Jonah Graham 2020-03-29 13:58:28 -04:00 • committed by Alexander Fedorov
parent 4a4c5fca4d
commit adb7247d5c
7 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
terminal/plugins/org.eclipse.tm.terminal.control/plugin.properties
View file

@ -42,3 +42,5 @@ terminal.command.quickaccess.name=Quick Access
terminal.preferences.name = Terminal
terminal.font.description = The font for the terminal console.
terminal.font.label = Terminal Console Font
terminal.connectors.name = Terminal Connector Extensions

2
terminal/plugins/org.eclipse.tm.terminal.control/plugin.xml
View file

@ -19,7 +19,7 @@
# Martin Oberhuber (Wind River) - [434939] Fix Keybinding conflicts with JEE Luna package
-->
<plugin>
<extension-point id="connectors" name="Terminal Connector Extensions" schema="schema/connectors.exsd"/>
<extension-point id="connectors" name="%terminal.connectors.name" schema="schema/connectors.exsd"/>
<extension point="org.eclipse.ui.contexts">
<context

8
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionCopy.java
View file

@ -60,10 +60,10 @@ public class TerminalActionCopy extends AbstractTerminalAction {
@Override
public void updateAction(boolean aboutToShow) {
ITerminalViewControl target = getTarget();
boolean bEnabled = target != null;
if (aboutToShow && bEnabled) {
bEnabled = target.getSelection().length() > 0;
if (aboutToShow && target != null) {
setEnabled(!target.getSelection().isEmpty());
} else {
setEnabled(false);
}
setEnabled(bEnabled);
}
}

14
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java
View file

@ -58,10 +58,16 @@ public class TerminalActionPaste extends AbstractTerminalAction {
@Override
public void updateAction(boolean aboutToShow) {
ITerminalViewControl target = getTarget();
boolean bEnabled = target != null && target.getClipboard() != null && !target.getClipboard().isDisposed();
if (bEnabled) {
String strText = (String) target.getClipboard().getContents(TextTransfer.getInstance());
bEnabled = ((strText != null) && (!strText.equals("")) && (target.getState() == TerminalState.CONNECTED));//$NON-NLS-1$
boolean bEnabled = false;
if (target != null) {
if (target.getState() == TerminalState.CONNECTED) {
if (target.getClipboard() != null && !target.getClipboard().isDisposed()) {
String strText = (String) target.getClipboard().getContents(TextTransfer.getInstance());
if (strText != null && !strText.isEmpty()) {
bEnabled = true;
}
}
}
}
setEnabled(bEnabled);
}

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/EditActionAccelerators.java
View file

@ -24,7 +24,7 @@ class EditActionAccelerators {
private static final String COPY_COMMAND_ID = "org.eclipse.tm.terminal.copy"; //$NON-NLS-1$
private static final String PASTE_COMMAND_ID = "org.eclipse.tm.terminal.paste"; //$NON-NLS-1$
private final Map commandIdsByAccelerator = new HashMap();
private final Map<Integer, String> commandIdsByAccelerator = new HashMap<Integer, String>();
private void load() {
addAccelerator(COPY_COMMAND_ID);

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java
View file

@ -31,7 +31,7 @@ public abstract class AbstractSettingsPage implements ISettingsPage, IMessagePro
private int messageType = IMessageProvider.NONE;
// Reference to the listener
private final ListenerList listeners = new ListenerList();
private final ListenerList<Listener> listeners = new ListenerList<>();
// Flag to control the control decorations
private boolean hasDecoration = false;

2
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
View file

@ -49,7 +49,7 @@ public class TerminalConnectorExtension {
}
String hidden = config.getAttribute("hidden"); //$NON-NLS-1$
boolean isHidden = hidden != null ? Boolean.parseBoolean(hidden) : false;
TerminalConnector.Factory factory = () -> (TerminalConnectorImpl) config.createExecutableExtension("class");
TerminalConnector.Factory factory = () -> (TerminalConnectorImpl) config.createExecutableExtension("class"); //$NON-NLS-1$
return new TerminalConnector(factory, id, name, isHidden);
}