Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 28875 Details for
Bug 109445
New Eclipse Resources Bundles Should Be Used
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
Migrated common.ui.action to new plug-in message bundles
Bugzilla_109445_common_ui_action.txt (text/plain), 38.22 KB, created by
Eliza Tworkowska
on 2005-10-27 14:54:46 EDT
(
hide
)
Description:
Migrated common.ui.action to new plug-in message bundles
Filename:
MIME Type:
Creator:
Eliza Tworkowska
Created:
2005-10-27 14:54:46 EDT
Size:
38.22 KB
patch
obsolete
>Index: src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalPrintAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java 27 Oct 2005 16:11:43 -0000 >@@ -18,6 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -65,7 +66,7 @@ > setId(getWorkbenchActionConstant()); > > /* set the label */ >- setText(ResourceManager.getI18NString("GlobalPrintAction.label")); //$NON-NLS-1$ >+ setText(CommonUiActionMessages.GlobalPrintAction_label); > > /* change the image in case someone tries this from a context menu, > * not needed from the file menu */ >Index: src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java,v >retrieving revision 1.2 >diff -u -r1.2 RevertGlobalActionHandler.java >--- src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java 12 Sep 2005 21:25:30 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/common/ui/action/global/providers/RevertGlobalActionHandler.java 27 Oct 2005 16:11:43 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.ui.PlatformUI; > > import org.eclipse.gmf.runtime.common.core.command.ICommand; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.editors.IRevertiblePart; > import org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler; > import org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext; >@@ -31,15 +31,6 @@ > public class RevertGlobalActionHandler > extends AbstractGlobalActionHandler { > >- private final static String CONFIRMATION_DIALOG_TITLE = ResourceManager >- .getI18NString("RevertGlobalActionHandler.messageBox.title"); //$NON-NLS-1$ >- >- private final static String CONFIRMATION_DIALOG_MESSAGE = ResourceManager >- .getI18NString("RevertGlobalActionHandler.messageBox.message"); //$NON-NLS-1$ >- >- private final static String CONFIRMATION_DIALOG_PROMPT = ResourceManager >- .getI18NString("RevertGlobalActionHandler.messageBox.prompt"); //$NON-NLS-1$ >- > /* > * (non-Javadoc) > * >@@ -88,13 +79,13 @@ > > if (window != null) { > >- String message = CONFIRMATION_DIALOG_MESSAGE >- + "\n\n" + CONFIRMATION_DIALOG_PROMPT; //$NON-NLS-1$ >+ String message = CommonUiActionMessages.RevertGlobalActionHandler_messageBox_message >+ + "\n\n" + CommonUiActionMessages.RevertGlobalActionHandler_messageBox_prompt; //$NON-NLS-1$ > > MessageBox messageBox = new MessageBox(window.getShell(), SWT.YES > | SWT.NO | SWT.CANCEL | SWT.ICON_QUESTION); > >- messageBox.setText(CONFIRMATION_DIALOG_TITLE); >+ messageBox.setText(CommonUiActionMessages.RevertGlobalActionHandler_messageBox_title); > messageBox.setMessage(message); > > if (messageBox.open() == SWT.YES) { >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalCloseAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCloseAction.java 27 Oct 2005 16:11:44 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global Close Action >@@ -54,7 +54,7 @@ > : getActionId()); > > // Set the label >- setText(ResourceManager.getI18NString("GlobalCloseAction.label")); //$NON-NLS-1$ >+ setText(CommonUiActionMessages.GlobalCloseAction_label); > > // Do not define image descriptors. The "Close" action does not have one. > >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalCopyAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCopyAction.java 27 Oct 2005 16:11:44 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -30,10 +31,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalCopyAction extends GlobalAction { >- /** >- * Label definition of the copy action. >- */ >- private static final String COPY_TEXT = ResourceManager.getI18NString("CopyAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the copy action. >@@ -82,7 +79,7 @@ > : COPY); > > /* set the label */ >- setText(COPY_TEXT); >+ setText(CommonUiActionMessages.CopyAction_label); > > /* set the image */ > setImageDescriptor(COPY_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalCutAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalCutAction.java 27 Oct 2005 16:11:44 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -30,10 +31,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalCutAction extends GlobalAction { >- /** >- * Label definition of the cut action. >- */ >- private static final String CUT_TEXT = ResourceManager.getI18NString("GlobalCutAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the cut action. >@@ -80,7 +77,7 @@ > : CUT); > > /* set the label */ >- setText(CUT_TEXT); >+ setText(CommonUiActionMessages.GlobalCutAction_label); > > /* set the image */ > setImageDescriptor(CUT_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalDeleteAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalDeleteAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,10 +28,6 @@ > * @author vramaswa > */ > public final class GlobalDeleteAction extends GlobalAction { >- /** >- * Label definition of the delete action. >- */ >- private static final String DELETE_TEXT = ResourceManager.getI18NString("GlobalDeleteAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the delete action. >@@ -77,7 +74,7 @@ > : DELETE); > > /* Set the label */ >- setText(DELETE_TEXT); >+ setText(CommonUiActionMessages.GlobalDeleteAction_label); > > /* Set the image */ > setImageDescriptor(DELETE_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalFindAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalFindAction.java 27 Oct 2005 16:11:44 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global Find Action >@@ -26,10 +26,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalFindAction extends GlobalAction { >- /** >- * Label definition of the find action. >- */ >- private static final String FIND_TEXT = ResourceManager.getI18NString("GlobalFindAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the find action. >@@ -61,7 +57,7 @@ > : FIND); > > /* set the label */ >- setText(FIND_TEXT); >+ setText(CommonUiActionMessages.GlobalFindAction_label); > > /* set the context sensitive help */ > PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalMoveAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalMoveAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,10 +28,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalMoveAction extends GlobalAction { >- /** >- * Label definition of the move action. >- */ >- private static final String MOVE_TEXT = ResourceManager.getI18NString("GlobalMoveAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the move action. >@@ -77,7 +74,7 @@ > : MOVE); > > /* set the label */ >- setText(MOVE_TEXT); >+ setText(CommonUiActionMessages.GlobalMoveAction_label); > > /* set the image */ > setImageDescriptor(MOVE_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalOpenAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalOpenAction.java 27 Oct 2005 16:11:44 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global Open Action - this action provides a global "open" type of action. >@@ -60,7 +60,7 @@ > : getActionId()); > > /* Set the label */ >- setText(ResourceManager.getI18NString("GlobalOpenAction.label")); //$NON-NLS-1$ >+ setText(CommonUiActionMessages.GlobalOpenAction_label); > > /* Do not define image dewscriptors. The "Open" command does not have them. */ > >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalPasteAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPasteAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,10 +28,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalPasteAction extends GlobalAction { >- /** >- * Label definition of the paste action. >- */ >- private static final String PASTE_TEXT = ResourceManager.getI18NString("GlobalPasteAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the paste action. >@@ -77,7 +74,7 @@ > : PASTE); > > /* set the label */ >- setText(PASTE_TEXT); >+ setText(CommonUiActionMessages.GlobalPasteAction_label); > > /* set the image */ > setImageDescriptor(PASTE_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalPropertiesAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalPropertiesAction.java 27 Oct 2005 16:11:44 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global Properties Action >@@ -26,10 +26,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalPropertiesAction extends GlobalAction { >- /** >- * Label definition of the properties action. >- */ >- private static final String PROPERTIES_TEXT = ResourceManager.getI18NString("GlobalPropertiesAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the properties action. >@@ -62,7 +58,7 @@ > : PROPERTIES); > > /* set the label */ >- setText(PROPERTIES_TEXT); >+ setText(CommonUiActionMessages.GlobalPropertiesAction_label); > > /* set the context sensitive help */ > PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRedoAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRedoAction.java,v >retrieving revision 1.4 >diff -u -r1.4 GlobalRedoAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRedoAction.java 6 Oct 2005 20:26:08 -0000 1.4 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRedoAction.java 27 Oct 2005 16:11:44 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -32,18 +33,6 @@ > */ > public final class GlobalRedoAction extends GlobalAction { > >- /** >- * The stand-alone Redo label. >- */ >- private static final String REDO_LABEL = ResourceManager >- .getI18NString("GlobalRedoAction.label"); //$NON-NLS-1$ >- >- /** >- * The Redo label to be used with a command label. >- */ >- private static final String REDO_LABEL_FORMATTED = ResourceManager >- .getI18NString("GlobalRedoAction.formattedLabel"); //$NON-NLS-1$ >- > /** > * Action definition id of the redo action. > */ >@@ -89,7 +78,7 @@ > : REDO); > > /* Set the label */ >- setText(REDO_LABEL); >+ setText(CommonUiActionMessages.GlobalRedoAction_label); > > /* Set the image */ > setImageDescriptor(REDO_IMAGE); >@@ -127,10 +116,10 @@ > */ > public void refresh() { > setEnabled(getCommandManager().canRedo()); >- String label = REDO_LABEL; >+ String label = CommonUiActionMessages.GlobalRedoAction_label; > String commandLabel = getCommandManager().getRedoLabel(); > if (commandLabel != null) { >- label = MessageFormat.format(REDO_LABEL_FORMATTED, >+ label = MessageFormat.format(CommonUiActionMessages.GlobalRedoAction_formattedLabel, > new Object[] {removeMnemonics(commandLabel)}); > } > setText(label); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalRefreshAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRefreshAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,10 +28,6 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalRefreshAction extends GlobalAction { >- /** >- * Label definition of the REFRESH action. >- */ >- private static final String REFRESH_TEXT = ResourceManager.getI18NString("GlobalRefreshAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the REFRESH action. >@@ -78,7 +75,7 @@ > : REFRESH); > > /* set the label */ >- setText(REFRESH_TEXT); >+ setText(CommonUiActionMessages.GlobalRefreshAction_label); > > /* set the image */ > setImageDescriptor(REFRESH_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalRenameAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRenameAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,11 +28,7 @@ > * @author Vishy Ramaswamy > */ > public final class GlobalRenameAction extends GlobalAction { >- /** >- * Label definition of the rename action. >- */ >- private static final String RENAME_TEXT = ResourceManager.getI18NString("GlobalRenameAction.label"); //$NON-NLS-1$ >- >+ > /** > * Action definition id of the rename action. > */ >@@ -77,7 +74,7 @@ > : RENAME); > > /* set the label */ >- setText(RENAME_TEXT); >+ setText(CommonUiActionMessages.GlobalRenameAction_label); > > /* set the image */ > setImageDescriptor(RENAME_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java,v >retrieving revision 1.2 >diff -u -r1.2 GlobalRevertAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java 12 Sep 2005 21:25:30 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalRevertAction.java 27 Oct 2005 16:11:44 -0000 >@@ -17,7 +17,7 @@ > > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global action for the retargetable "REVERT" action. >@@ -28,12 +28,6 @@ > extends GlobalAction { > > /** >- * Label definition of the REVERT action. >- */ >- private static final String REVERT_TEXT = ResourceManager >- .getI18NString("GlobalRevertAction.label"); //$NON-NLS-1$ >- >- /** > * Action definition id of the REVERT action. > */ > private static final String REVERT = "org.eclipse.gmf.runtime.common.ui.actions.global.revert"; //$NON-NLS-1$ >@@ -79,7 +73,7 @@ > : REVERT); > > // Set the label >- setText(REVERT_TEXT); >+ setText(CommonUiActionMessages.GlobalRevertAction_label); > > super.init(); > } >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java,v >retrieving revision 1.3 >diff -u -r1.3 GlobalSaveAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java 6 Oct 2005 20:26:08 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSaveAction.java 27 Oct 2005 16:11:44 -0000 >@@ -19,6 +19,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -27,10 +28,6 @@ > * @author vramaswa > */ > public final class GlobalSaveAction extends GlobalAction { >- /** >- * Label definition of the save action. >- */ >- private static final String SAVE_TEXT = ResourceManager.getI18NString("GlobalSaveAction.label"); //$NON-NLS-1$ > > /** > * Action definition id of the save action. >@@ -78,7 +75,7 @@ > : SAVE); > > /* Set the label */ >- setText(SAVE_TEXT); >+ setText(CommonUiActionMessages.GlobalSaveAction_label); > > /* Set the image */ > setImageDescriptor(SAVE_IMAGE); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java,v >retrieving revision 1.4 >diff -u -r1.4 GlobalSelectAllAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java 6 Oct 2005 20:26:08 -0000 1.4 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalSelectAllAction.java 27 Oct 2005 16:11:44 -0000 >@@ -18,7 +18,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >-import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > > /** > * Global SelectAll Action >@@ -26,11 +26,7 @@ > * @author vramaswa > */ > public final class GlobalSelectAllAction extends GlobalAction { >- /** >- * Label definition of the select all action. >- */ >- private static final String SELECT_ALL_TEXT = ResourceManager.getI18NString("SelectAllAction.label"); //$NON-NLS-1$ >- >+ > /** > * Action definition id of the select all action. > */ >@@ -63,7 +59,7 @@ > : SELECT_ALL); > > /* Set the label */ >- setText(SELECT_ALL_TEXT); >+ setText(CommonUiActionMessages.SelectAllAction_label); > > /* Set the context sensitive help */ > PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.PX_U_DEFAULT_CS_HELP); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalUndoAction.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalUndoAction.java,v >retrieving revision 1.4 >diff -u -r1.4 GlobalUndoAction.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalUndoAction.java 6 Oct 2005 20:26:08 -0000 1.4 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/actions/global/GlobalUndoAction.java 27 Oct 2005 16:11:44 -0000 >@@ -22,6 +22,7 @@ > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalAction; > import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId; > import org.eclipse.gmf.runtime.common.ui.action.internal.IHelpContextIds; >+import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages; > import org.eclipse.gmf.runtime.common.ui.action.internal.l10n.ResourceManager; > > /** >@@ -32,18 +33,6 @@ > */ > public final class GlobalUndoAction extends GlobalAction { > >- /** >- * The stand-alone undo label. >- */ >- private static final String UNDO_LABEL = ResourceManager >- .getI18NString("GlobalUndoAction.label"); //$NON-NLS-1$ >- >- /** >- * The Undo label to be used with a command label. >- */ >- private static final String UNDO_LABEL_FORMATTED = ResourceManager >- .getI18NString("GlobalUndoAction.formattedLabel"); //$NON-NLS-1$ >- > /** > * Action definition id of the undo action. > */ >@@ -90,7 +79,7 @@ > : UNDO); > > /* Set the label */ >- setText(UNDO_LABEL); >+ setText(CommonUiActionMessages.GlobalUndoAction_label); > > /* Set the image */ > setImageDescriptor(UNDO_IMAGE); >@@ -129,10 +118,10 @@ > public void refresh() { > setEnabled(getCommandManager().canUndo()); > >- String label = UNDO_LABEL; >+ String label = CommonUiActionMessages.GlobalUndoAction_label; > String commandLabel = getCommandManager().getUndoLabel(); > if (commandLabel != null) { >- label = MessageFormat.format(UNDO_LABEL_FORMATTED, >+ label = MessageFormat.format(CommonUiActionMessages.GlobalUndoAction_formattedLabel, > new Object[] {removeMnemonics(commandLabel)}); > } > setText(label); >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/ResourceManager.java >=================================================================== >RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/ResourceManager.java,v >retrieving revision 1.2 >diff -u -r1.2 ResourceManager.java >--- src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/ResourceManager.java 12 Sep 2005 21:25:30 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/ResourceManager.java 27 Oct 2005 16:11:44 -0000 >@@ -47,17 +47,6 @@ > } > > /** >- * Retrieves a localized string for the specified key. >- * >- * @return A localized string value, or a key if the bundle does not >- * contain this entry. >- * @param key The resource bundle key. >- */ >- public static String getI18NString(String key) { >- return getInstance().getString(key); >- } >- >- /** > * Initializes this resource manager's resources. > * > * @see org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager#initializeResources() >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.java >=================================================================== >RCS file: src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.java >diff -N src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,49 @@ >+/******************************************************************************* >+ * Copyright (c) 2000, 2005 IBM Corporation 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: >+ * IBM Corporation - initial API and implementation >+ *******************************************************************************/ >+package org.eclipse.gmf.runtime.common.ui.action.internal.l10n; >+ >+import org.eclipse.osgi.util.NLS; >+ >+public final class CommonUiActionMessages extends NLS { >+ >+ private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.action.internal.l10n.CommonUiActionMessages";//$NON-NLS-1$ >+ >+ private CommonUiActionMessages() { >+ // Do not instantiate >+ } >+ >+ public static String GlobalCloseAction_label; >+ public static String CopyAction_label; >+ public static String GlobalCutAction_label; >+ public static String GlobalDeleteAction_label; >+ public static String GlobalRedoAction_label; >+ public static String GlobalUndoAction_label; >+ public static String GlobalRedoAction_formattedLabel; >+ public static String GlobalUndoAction_formattedLabel; >+ public static String GlobalFindAction_label; >+ public static String GlobalMoveAction_label; >+ public static String GlobalOpenAction_label; >+ public static String GlobalPasteAction_label; >+ public static String GlobalPrintAction_label; >+ public static String GlobalPropertiesAction_label; >+ public static String GlobalRefreshAction_label; >+ public static String GlobalRevertAction_label; >+ public static String GlobalRenameAction_label; >+ public static String GlobalSaveAction_label; >+ public static String SelectAllAction_label; >+ public static String RevertGlobalActionHandler_messageBox_title; >+ public static String RevertGlobalActionHandler_messageBox_message; >+ public static String RevertGlobalActionHandler_messageBox_prompt; >+ >+ static { >+ NLS.initializeMessages(BUNDLE_NAME, CommonUiActionMessages.class); >+ } >+} >Index: src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.properties >=================================================================== >RCS file: src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.properties >diff -N src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUiActionMessages.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,43 @@ >+# ============================================================================== >+#*+------------------------------------------------------------------------+ >+#*| Copyright (c) 2005 IBM Corporation 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: | >+#*| IBM Corporation - initial API and implementation | >+#*+------------------------------------------------------------------------+ >+# ============================================================================== >+ >+# ============================================================================== >+# Global Action Labels - Translation Instruction: section to be translated >+# ============================================================================== >+GlobalCloseAction_label=&Close >+CopyAction_label=Copy >+GlobalCutAction_label=Cut >+GlobalDeleteAction_label=&Delete >+GlobalRedoAction_label=&Redo >+GlobalUndoAction_label=&Undo >+GlobalRedoAction_formattedLabel=&Redo {0} >+GlobalUndoAction_formattedLabel=&Undo {0} >+GlobalFindAction_label=Find/Repla&ce... >+GlobalMoveAction_label=Mo&ve... >+GlobalOpenAction_label=&Open >+GlobalPasteAction_label=Paste >+GlobalPrintAction_label=&Print... >+GlobalPropertiesAction_label=P&roperties >+GlobalRefreshAction_label=Refresh >+GlobalRevertAction_label=Rever&t >+GlobalRenameAction_label=Rena&me... >+GlobalSaveAction_label=&Save >+SelectAllAction_label=Select All >+ >+# The string for the prompt dialog shown when reverting to the last saved version of a >+# saveable workbench part >+# ================================ BEGIN ================================================== >+RevertGlobalActionHandler_messageBox_title=Revert >+RevertGlobalActionHandler_messageBox_message=Unsaved changes will be lost. >+RevertGlobalActionHandler_messageBox_prompt=Are you sure that you want to revert to the last saved version? >+# ==================================== END =================================================
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 109445
:
28872
|
28873
|
28874
| 28875 |
28876
|
28877
|
28878
|
28879
|
28892
|
28921
|
29644
|
29646
|
29647
|
29648
|
29974
|
30335