diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java index c8c2ab6f020..7b05acea870 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.java @@ -89,10 +89,9 @@ public class ShellResources extends NLS // universal commands public static String MSG_UCMD_INVOCATION_EMPTY; - - public static String MSG_OPERATION_RUNNING; - public static String MSG_OPERATION_FINISHED; + + public static String ACTION_CONTENT_ASSIST; static { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties index 3e875823d4d..b451f625fc5 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/ShellResources.properties @@ -95,4 +95,7 @@ MSG_UCMD_INVOCATION_EMPTY = The invocation may not be blank MSG_OPERATION_RUNNING = {0} - Running MSG_OPERATION_FINISHED = {0} - Finished +ACTION_CONTENT_ASSIST=Content Assist@Ctrl+SPACE + + diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java index 727a8dc3c8c..119da142ba9 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/view/CommandsViewPage.java @@ -42,6 +42,7 @@ import org.eclipse.rse.internal.shells.ui.ShellResources; import org.eclipse.rse.internal.ui.SystemResources; import org.eclipse.rse.internal.ui.view.SystemTableViewProvider; import org.eclipse.rse.services.clientserver.PathUtility; +import org.eclipse.rse.services.clientserver.messages.CommonMessages; import org.eclipse.rse.shells.ui.view.CommandEntryViewerConfiguration; import org.eclipse.rse.shells.ui.view.SystemCommandEditor; import org.eclipse.rse.shells.ui.view.SystemCommandsView; @@ -303,7 +304,7 @@ FocusListener Label label = new Label(_inputContainer, SWT.NONE); label.setText(ShellResources.RESID_COMMANDSVIEW_COMMAND_LABEL); - _inputEntry = new SystemCommandEditor(_viewPart.getViewSite(), _inputContainer, SWT.SINGLE | SWT.BORDER, 50, _entryViewerConfiguration, "", SystemResources.ACTION_CONTENT_ASSIST); //$NON-NLS-1$ + _inputEntry = new SystemCommandEditor(_viewPart.getViewSite(), _inputContainer, SWT.SINGLE | SWT.BORDER, 50, _entryViewerConfiguration, "", ShellResources.ACTION_CONTENT_ASSIST); //$NON-NLS-1$ _inputEntry.getTextWidget().setToolTipText(ShellResources.RESID_COMMANDSVIEW_COMMAND_TOOLTIP); @@ -496,11 +497,11 @@ FocusListener String msgTxt = null; if (!command.isActive()) { - msgTxt = NLS.bind(ShellResources.MSG_OPERATION_FINISHED, title); + msgTxt = NLS.bind(CommonMessages.MSG_OPERATION_FINISHED, title); } else { - msgTxt = NLS.bind(ShellResources.MSG_OPERATION_RUNNING, title); + msgTxt = NLS.bind(CommonMessages.MSG_OPERATION_RUNNING, title); } _title = msgTxt; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java index c9694cbf385..e8e1e2ff0f3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.java @@ -1041,8 +1041,7 @@ public class SystemResources extends NLS public static String ACTION_HISTORY_MOVEBACKWARD_LABEL; public static String ACTION_HISTORY_MOVEBACKWARD_TOOLTIP; - - public static String ACTION_CONTENT_ASSIST; + public static String ACTION_SHOW_TOOLTIP_INFORMATION; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties index 2f1b048a8bb..6ee769fcd9d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/SystemResources.properties @@ -1119,7 +1119,6 @@ RESID_DUPLICATE_PREFIX_TOOLTIP=Create copy of selected item ############################################################## # Content Assist action ############################################################## -ACTION_CONTENT_ASSIST=Content Assist@Ctrl+SPACE ACTION_SHOW_TOOLTIP_INFORMATION=Show Tooltip Description@F2 ##############################################################