From 19fdbcabaceafa91d49c625aa6ddc856e289040c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 4 Jun 2008 21:36:31 +0000 Subject: [PATCH] [235626] Convert terminals.ui to MessageBundle format --- .../rse/internal/terminals/ui/Activator.java | 54 +++---------------- .../terminals/ui/TerminalUIResources.java | 30 +++++++++++ .../ui/TerminalUIResources.properties | 17 +++--- .../ui/actions/RemoveTerminalAction.java | 5 +- .../ui/actions/ShowInTerminalViewAction.java | 9 ++-- .../terminals/ui/views/TerminalsUI.java | 6 +-- 6 files changed, 55 insertions(+), 66 deletions(-) create mode 100644 rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/Activator.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/Activator.java index 37fd05c99c2..afa9a05f4f8 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/Activator.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/Activator.java @@ -1,18 +1,16 @@ /******************************************************************************** - * Copyright (c) 2008 MontaVista Software, Inc. + * Copyright (c) 2008 MontaVista Software, Inc. and others. * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Yu-Fen Kuo (MontaVista) - initial API and implementation + * Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format ********************************************************************************/ package org.eclipse.rse.internal.terminals.ui; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - import org.eclipse.rse.ui.SystemBasePlugin; import org.osgi.framework.BundleContext; @@ -27,8 +25,6 @@ public class Activator extends SystemBasePlugin { // The shared instance private static Activator plugin; - private ResourceBundle resourceBundle; - public static String ICON_ID_LAUNCH_TERMINAL = "icon_id_launch_terminal"; //$NON-NLS-1$ public static String ICON_ID_TERMINAL_SUBSYSTEM = "icon_id_terminal_subsystem"; //$NON-NLS-1$ public static String ICON_ID_TERMINAL_SUBSYSTEM_LIVE = "icon_id_terminal_subsystem_live"; //$NON-NLS-1$ @@ -42,7 +38,7 @@ public class Activator extends SystemBasePlugin { /* * (non-Javadoc) - * + * * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ public void start(BundleContext context) throws Exception { @@ -52,59 +48,23 @@ public class Activator extends SystemBasePlugin { /* * (non-Javadoc) - * + * * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { plugin = null; - resourceBundle = null; super.stop(context); } /** * Returns the shared instance - * + * * @return the shared instance */ public static Activator getDefault() { return plugin; } - /** - * Returns the string from the plugin's resource bundle, or 'key' if not - * found. - * - * @see java.util.ResourceBundle#getString(String) - * - * @param key - * the key for the desired string - * @return the string for the given key - */ - public static String getResourceString(String key) { - ResourceBundle bundle = Activator.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Return the plugin's Resource bundle. - * - * @return the Resource bundle - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle - .getBundle("org.eclipse.rse.internal.terminals.ui.TerminalUIResources"); //$NON-NLS-1$ - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - /** * Initialize the image registry by declaring all of the required graphics. */ 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 new file mode 100644 index 00000000000..c4fd4479419 --- /dev/null +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/TerminalUIResources.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2008 Wind River Systems, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Martin Oberhuber (Wind River) - [235626] initial API and implementation + *******************************************************************************/ + +package org.eclipse.rse.internal.terminals.ui; + +import org.eclipse.osgi.util.NLS; + +public class TerminalUIResources extends NLS { + private static String BUNDLE_NAME = "org.eclipse.rse.internal.terminals.ui.TerminalUIResources"; //$NON-NLS-1$ + + public static String RemoveTerminalAction_label; + public static String RemoveTerminalAction_tooltip; + public static String ShowInTerminalViewAction_label; + public static String ShowInTerminalViewAction_tooltip; + + public static String TerminalsUI_cannotOpenView_error; + + 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 61d607ea647..4fb25c3d6db 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 @@ -1,22 +1,21 @@ ################################################################################ -# Copyright (c) 2008 MontaVista Software, Inc. +# Copyright (c) 2008 MontaVista Software, Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: -# 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 ################################################################################ # NLS_MESSAGEFORMAT_VAR # NLS_ENCODING=UTF-8 -LaunchTerminalAction.title=Launch Terminal -LaunchTerminalAction.tooltip=Launch Terminal view -TerminalsUI.cannotOpenView.error=Can not open remote terminals view +RemoveTerminalAction_label=Remove Terminal +RemoveTerminalAction_tooltip=Remove current terminal from terminals view +ShowInTerminalViewAction_label=Show In Terminals View +ShowInTerminalViewAction_tooltip=Show current terminal in Terminals view -RemoveTerminalAction.label=Remove Terminal -RemoveTerminalAction.tooltip=Remove current terminal from terminals view -ShowInTerminalViewAction.label=Show In Terminals View -ShowInTerminalViewAction.tooltip=Show current terminal in Terminals view \ No newline at end of file +TerminalsUI_cannotOpenView_error=Can not open remote terminals view diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/RemoveTerminalAction.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/RemoveTerminalAction.java index f690d263c07..e19c5190ee5 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/RemoveTerminalAction.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/RemoveTerminalAction.java @@ -15,11 +15,13 @@ * David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work * Anna Dushistova (MontaVista) - Adapted from SystemShowInShellViewAction * Anna Dushistova (MontaVista) - Adapted from ShowInTerminalViewAction + * Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format *******************************************************************************/ package org.eclipse.rse.internal.terminals.ui.actions; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.internal.terminals.ui.Activator; +import org.eclipse.rse.internal.terminals.ui.TerminalUIResources; import org.eclipse.rse.internal.terminals.ui.views.TerminalViewer; import org.eclipse.rse.internal.terminals.ui.views.TerminalsUI; import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement; @@ -27,8 +29,7 @@ import org.eclipse.swt.widgets.Shell; public class RemoveTerminalAction extends TerminalElementBaseAction { public RemoveTerminalAction(Shell parent) { - this(Activator.getResourceString("RemoveTerminalAction.label"), //$NON-NLS-1$ - Activator.getResourceString("RemoveTerminalAction.tooltip"), //$NON-NLS-1$ + this(TerminalUIResources.RemoveTerminalAction_label, TerminalUIResources.RemoveTerminalAction_tooltip, Activator.getDefault().getImageDescriptor( Activator.ICON_ID_REMOVE_TERMINAL), parent); } diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/ShowInTerminalViewAction.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/ShowInTerminalViewAction.java index bd45ed986df..5bde847fad3 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/ShowInTerminalViewAction.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/actions/ShowInTerminalViewAction.java @@ -14,11 +14,13 @@ * Contributors: * David McKnight (IBM) - [165680] "Show in Remote Shell View" does not work * Anna Dushistova (MontaVista) - Adapted from SystemShowInShellViewAction + * Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format *******************************************************************************/ package org.eclipse.rse.internal.terminals.ui.actions; import org.eclipse.rse.internal.terminals.ui.Activator; +import org.eclipse.rse.internal.terminals.ui.TerminalUIResources; import org.eclipse.rse.internal.terminals.ui.views.TerminalViewer; import org.eclipse.rse.internal.terminals.ui.views.TerminalsUI; import org.eclipse.rse.subsystems.terminals.core.elements.TerminalElement; @@ -27,11 +29,8 @@ import org.eclipse.swt.widgets.Shell; public class ShowInTerminalViewAction extends TerminalElementBaseAction { public ShowInTerminalViewAction(Shell parent) { - super( - Activator.getResourceString("ShowInTerminalViewAction.label"), //$NON-NLS-1$ - Activator.getResourceString("ShowInTerminalViewAction.tooltip"), //$NON-NLS-1$ - Activator.getDefault().getImageDescriptor( - Activator.ICON_ID_LAUNCH_TERMINAL), parent); + super(TerminalUIResources.ShowInTerminalViewAction_label, TerminalUIResources.ShowInTerminalViewAction_tooltip, + Activator.getDefault().getImageDescriptor(Activator.ICON_ID_LAUNCH_TERMINAL), parent); allowOnMultipleSelection(false); } diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalsUI.java b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalsUI.java index ec1f17c01ed..8563074d2ff 100644 --- a/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalsUI.java +++ b/rse/plugins/org.eclipse.rse.terminals.ui/src/org/eclipse/rse/internal/terminals/ui/views/TerminalsUI.java @@ -14,11 +14,12 @@ * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin * Yu-Fen Kuo (MontaVista) - Adapted from SystemCommandsUI * Anna Dushistova (MontaVista) - [228577] [rseterminal] Clean up RSE Terminal impl + * Martin Oberhuber (Wind River) - [235626] Convert terminals.ui to MessageBundle format ********************************************************************************/ package org.eclipse.rse.internal.terminals.ui.views; -import org.eclipse.rse.internal.terminals.ui.Activator; +import org.eclipse.rse.internal.terminals.ui.TerminalUIResources; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; @@ -57,8 +58,7 @@ public class TerminalsUI { viewer = (TerminalViewer) page.showView(TerminalViewer.VIEW_ID); page.bringToTop(viewer); } catch (PartInitException e) { - SystemBasePlugin.logError(Activator - .getResourceString("TerminalsUI.cannotOpenView.error"), e); //$NON-NLS-1$ + SystemBasePlugin.logError(TerminalUIResources.TerminalsUI_cannotOpenView_error, e); } return viewer;