1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 12:35:22 +02:00

[282256] applied patch from Zhou Renjian.

This commit is contained in:
Anna Dushistova 2009-07-03 07:49:25 +00:00
parent 80b88bd05c
commit 51636359e5
3 changed files with 12 additions and 5 deletions

View file

@ -8,6 +8,7 @@
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [235626] initial API and implementation * Martin Oberhuber (Wind River) - [235626] initial API and implementation
* Anna Dushistova (MontaVista) - [238257] Request a help text when no tab is open in "Remote Shell", "Remote Monitor" and "Terminals" views * Anna Dushistova (MontaVista) - [238257] Request a help text when no tab is open in "Remote Shell", "Remote Monitor" and "Terminals" views
* Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.terminals.ui; package org.eclipse.rse.internal.terminals.ui;
@ -25,6 +26,8 @@ public class TerminalUIResources extends NLS {
public static String TerminalsUI_cannotOpenView_error; public static String TerminalsUI_cannotOpenView_error;
public static String TerminalViewer_text; public static String TerminalViewer_text;
public static String TerminalViewElementAdapter_type;
static { static {
NLS.initializeMessages(BUNDLE_NAME, TerminalUIResources.class); NLS.initializeMessages(BUNDLE_NAME, TerminalUIResources.class);

View file

@ -9,6 +9,7 @@
# Yu-Fen Kuo (MontaVista) - initial API and implementation # Yu-Fen Kuo (MontaVista) - initial API and implementation
# Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format # Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format
# Anna Dushistova (MontaVista) - [238257] Request a help text when no tab is open in "Remote Shell", "Remote Monitor" and "Terminals" views # Anna Dushistova (MontaVista) - [238257] Request a help text when no tab is open in "Remote Shell", "Remote Monitor" and "Terminals" views
# Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal
################################################################################ ################################################################################
# NLS_MESSAGEFORMAT_VAR # NLS_MESSAGEFORMAT_VAR
@ -21,3 +22,5 @@ ShowInTerminalViewAction_tooltip=Show current terminal in Terminals view
TerminalsUI_cannotOpenView_error=Can not open remote terminals view TerminalsUI_cannotOpenView_error=Can not open remote terminals view
TerminalViewer_text=To open a terminal, right-click the Terminal subsystem under the target. Then select 'Launch Terminal' from the context menu. TerminalViewer_text=To open a terminal, right-click the Terminal subsystem under the target. Then select 'Launch Terminal' from the context menu.
TerminalViewElementAdapter_type=Terminal

View file

@ -25,9 +25,10 @@
* David McKnight (IBM) - [189873] Improve remote shell editor open action with background jobs * David McKnight (IBM) - [189873] Improve remote shell editor open action with background jobs
* David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible * David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
* Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI * Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI
* Yu-Fen Kuo (MontaVista) - Adopted from SystemViewRemoteOutputAdapter * Yu-Fen Kuo (MontaVista) - Adopted from SystemViewRemoteOutputAdapter
* Anna Dushistova (MontaVista) - Adopted from SystemViewRemoteOutputAdapter * Anna Dushistova (MontaVista) - Adopted from SystemViewRemoteOutputAdapter
* Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits * Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits
* Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.terminals.ui.views; package org.eclipse.rse.internal.terminals.ui.views;
@ -39,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.internal.terminals.ui.Activator; import org.eclipse.rse.internal.terminals.ui.Activator;
import org.eclipse.rse.internal.terminals.ui.TerminalUIResources;
import org.eclipse.rse.internal.terminals.ui.actions.RemoveTerminalAction; import org.eclipse.rse.internal.terminals.ui.actions.RemoveTerminalAction;
import org.eclipse.rse.internal.terminals.ui.actions.ShowInTerminalViewAction; import org.eclipse.rse.internal.terminals.ui.actions.ShowInTerminalViewAction;
import org.eclipse.rse.services.terminals.ITerminalShell; import org.eclipse.rse.services.terminals.ITerminalShell;
@ -121,8 +123,7 @@ public class TerminalViewElementAdapter extends AbstractSystemViewAdapter
} }
public String getType(Object element) { public String getType(Object element) {
// TODO Auto-generated method stub return TerminalUIResources.TerminalViewElementAdapter_type;
return null;
} }
public boolean hasChildren(IAdaptable element) { public boolean hasChildren(IAdaptable element) {