diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java index 6e1f99173c9..d208b603bc8 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java @@ -8,6 +8,7 @@ * Contributors: * 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 + * Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal *******************************************************************************/ 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 TerminalViewer_text; + + public static String TerminalViewElementAdapter_type; static { NLS.initializeMessages(BUNDLE_NAME, TerminalUIResources.class); diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.properties b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.properties index 377e8699a42..68ad213665d 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.properties +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.properties @@ -9,6 +9,7 @@ # Yu-Fen Kuo (MontaVista) - initial API and implementation # 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 +# Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal ################################################################################ # NLS_MESSAGEFORMAT_VAR @@ -21,3 +22,5 @@ ShowInTerminalViewAction_tooltip=Show current terminal in 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. + +TerminalViewElementAdapter_type=Terminal diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewElementAdapter.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewElementAdapter.java index cde0765658e..be36435d9c7 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewElementAdapter.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalViewElementAdapter.java @@ -25,9 +25,10 @@ * 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 * Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI - * Yu-Fen Kuo (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) - 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 + * Zhou Renjian (Kortide) - [282256] "null:..." status message for launched terminal *******************************************************************************/ 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.viewers.IStructuredSelection; 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.ShowInTerminalViewAction; import org.eclipse.rse.services.terminals.ITerminalShell; @@ -121,8 +123,7 @@ public class TerminalViewElementAdapter extends AbstractSystemViewAdapter } public String getType(Object element) { - // TODO Auto-generated method stub - return null; + return TerminalUIResources.TerminalViewElementAdapter_type; } public boolean hasChildren(IAdaptable element) {