Attachment 35242 Details for Bug 128855 – Patch to fix bug

[patch] Patch to fix bug

bug128855.patch (text/plain), 11.30 KB, created by Christian Damus

on 2006-02-23 12:01:15 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Damus

Created: 2006-02-23 12:01:15 EST

Size: 11.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.examples.runtime.emf
>Index: src/org/eclipse/gmf/examples/runtime/emf/actions/CreateResourceDelegate.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.emf/src/org/eclipse/gmf/examples/runtime/emf/actions/CreateResourceDelegate.java,v
>retrieving revision 1.5
>diff -u -r1.5 CreateResourceDelegate.java
>--- src/org/eclipse/gmf/examples/runtime/emf/actions/CreateResourceDelegate.java	26 Jan 2006 15:37:29 -0000	1.5
>+++ src/org/eclipse/gmf/examples/runtime/emf/actions/CreateResourceDelegate.java	23 Feb 2006 17:01:40 -0000
>@@ -22,7 +22,6 @@
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.edit.domain.EditingDomain;
>-import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
> import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
> import org.eclipse.gmf.examples.runtime.emf.editor.MSLLibraryEditor;
> import org.eclipse.gmf.examples.runtime.emf.internal.l10n.MSLExampleMessages;
>@@ -142,8 +141,7 @@
> 
> 			Label resourceURILabel = new Label(composite, SWT.LEFT);
> 			{
>-				resourceURILabel.setText(EMFEditUIPlugin.INSTANCE
>-					.getString("_UI_ResourceURI_label")); //$NON-NLS-1$
>+				resourceURILabel.setText(MSLExampleMessages.ResourceURI_label);
> 				FormData data = new FormData();
> 				data.top = new FormAttachment(buttonComposite, CONTROL_OFFSET,
> 					SWT.CENTER);
>@@ -162,8 +160,7 @@
> 
> 			Button resourceURIBrowseFileSystemButton = new Button(
> 				buttonComposite, SWT.PUSH);
>-			resourceURIBrowseFileSystemButton.setText(EMFEditUIPlugin.INSTANCE
>-				.getString("_UI_BrowseFileSystem_label")); //$NON-NLS-1$
>+			resourceURIBrowseFileSystemButton.setText(MSLExampleMessages.BrowseFileSystem_label);
> 			resourceURIBrowseFileSystemButton
> 				.addSelectionListener(new SelectionAdapter() {
> 
>@@ -193,16 +190,14 @@
> 					resourceURIBrowseFileSystemButton.setLayoutData(data);
> 				}
> 				resourceURIBrowseWorkspaceButton
>-					.setText(EMFEditUIPlugin.INSTANCE
>-						.getString("_UI_BrowseWorkspace_label")); //$NON-NLS-1$
>+					.setText(MSLExampleMessages.BrowseWorkspace_label);
> 				resourceURIBrowseWorkspaceButton
> 					.addSelectionListener(new SelectionAdapter() {
> 
> 						public void widgetSelected(SelectionEvent event) {
> 							ContainerSelectionDialog containerSelectionDialog = new ContainerSelectionDialog(
> 								getShell(), ResourcesPlugin.getWorkspace()
>-									.getRoot(), false, EMFEditUIPlugin.INSTANCE
>-									.getString("_UI_SelectTheResource_label")); //$NON-NLS-1$
>+									.getRoot(), false, MSLExampleMessages.SelectContainer_label);
> 
> 							containerSelectionDialog.open();
> 							Object[] result = containerSelectionDialog
>Index: src/org/eclipse/gmf/examples/runtime/emf/actions/MSLLibraryActionBarContributor.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.emf/src/org/eclipse/gmf/examples/runtime/emf/actions/MSLLibraryActionBarContributor.java,v
>retrieving revision 1.6
>diff -u -r1.6 MSLLibraryActionBarContributor.java
>--- src/org/eclipse/gmf/examples/runtime/emf/actions/MSLLibraryActionBarContributor.java	23 Dec 2005 20:19:01 -0000	1.6
>+++ src/org/eclipse/gmf/examples/runtime/emf/actions/MSLLibraryActionBarContributor.java	23 Feb 2006 17:01:41 -0000
>@@ -27,7 +27,6 @@
> import org.eclipse.emf.ecore.EReference;
> import org.eclipse.emf.ecore.resource.Resource;
> import org.eclipse.emf.edit.domain.IEditingDomainProvider;
>-import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
> import org.eclipse.emf.edit.ui.action.CopyAction;
> import org.eclipse.emf.edit.ui.action.CutAction;
> import org.eclipse.emf.edit.ui.action.DeleteAction;
>@@ -370,10 +369,10 @@
> 		public void update() {
> 			if (pointer > -1) {
> 				MUndoInterval interval = (MUndoInterval)undoIntervals.get(pointer);
>-				setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Undo_menu_item", new Object [] { interval.getLabel() })); //$NON-NLS-1$
>+				setText(NLS.bind(MSLExampleMessages.Undo_menu_item_label, new Object [] { interval.getLabel() }));
> 				setEnabled(interval.canUndo());
> 			} else {
>-				setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Undo_menu_item", new Object [] { "" })); //$NON-NLS-1$ //$NON-NLS-2$
>+				setText(NLS.bind(MSLExampleMessages.Redo_menu_item_label, new Object [] { "" })); //$NON-NLS-1$
> 				setEnabled(false);
> 			}
> 		}
>@@ -396,10 +395,10 @@
> 		public void update() {
> 			if (pointer >= -1 && undoIntervals.size() > pointer+1) {
> 				MUndoInterval interval = (MUndoInterval)undoIntervals.get(pointer+1);
>-				setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Redo_menu_item", new Object [] { interval.getLabel() })); //$NON-NLS-1$
>+				setText(NLS.bind(MSLExampleMessages.Redo_menu_item_label, new Object [] { interval.getLabel() }));
> 				setEnabled(interval.canRedo());
> 			} else {
>-				setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Redo_menu_item", new Object [] { "" }));  //$NON-NLS-1$//$NON-NLS-2$
>+				setText(NLS.bind(MSLExampleMessages.Redo_menu_item_label, new Object [] { "" }));  //$NON-NLS-1$
> 				setEnabled(false);
> 			}
> 		}
>Index: src/org/eclipse/gmf/examples/runtime/emf/actions/SetPathmapDelegate.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.emf/src/org/eclipse/gmf/examples/runtime/emf/actions/SetPathmapDelegate.java,v
>retrieving revision 1.4
>diff -u -r1.4 SetPathmapDelegate.java
>--- src/org/eclipse/gmf/examples/runtime/emf/actions/SetPathmapDelegate.java	26 Jan 2006 15:37:29 -0000	1.4
>+++ src/org/eclipse/gmf/examples/runtime/emf/actions/SetPathmapDelegate.java	23 Feb 2006 17:01:41 -0000
>@@ -21,7 +21,6 @@
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.edit.domain.EditingDomain;
> import org.eclipse.emf.edit.domain.IEditingDomainProvider;
>-import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
> import org.eclipse.gmf.examples.runtime.emf.internal.l10n.MSLExampleMessages;
> import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
> import org.eclipse.jface.action.IAction;
>@@ -68,7 +67,7 @@
> 		this.domain = domain;
> 	}
> 
>-	public static class LoadResourceDialog
>+	public static class SetPathmapDialog
> 		extends Dialog {
> 
> 		public static int CONTROL_OFFSET = 10;
>@@ -81,11 +80,11 @@
> 
> 		protected String resourceURIs;
> 
>-		public LoadResourceDialog(Shell parent) {
>+		public SetPathmapDialog(Shell parent) {
> 			this(parent, null);
> 		}
> 
>-		public LoadResourceDialog(Shell parent, EditingDomain domain) {
>+		public SetPathmapDialog(Shell parent, EditingDomain domain) {
> 			super(parent);
> 			setShellStyle(getShellStyle() | SWT.MAX | SWT.RESIZE);
> 			this.domain = domain;
>@@ -93,8 +92,7 @@
> 
> 		protected void configureShell(Shell shell) {
> 			super.configureShell(shell);
>-			shell.setText(EMFEditUIPlugin.INSTANCE
>-				.getString("_UI_LoadResourceDialog_title")); //$NON-NLS-1$
>+			shell.setText(MSLExampleMessages.SetPathmapDialog_title);
> 		}
> 
> 		protected Control createDialogArea(Composite parent) {
>@@ -130,8 +128,7 @@
> 
> 			Label resourceURILabel = new Label(composite, SWT.LEFT);
> 			{
>-				resourceURILabel.setText(EMFEditUIPlugin.INSTANCE
>-					.getString("_UI_ResourceURI_label")); //$NON-NLS-1$
>+				resourceURILabel.setText(MSLExampleMessages.ContainerURI_label);
> 				FormData data = new FormData();
> 				data.top = new FormAttachment(buttonComposite, CONTROL_OFFSET,
> 					SWT.CENTER);
>@@ -169,8 +166,7 @@
> 
> 			Button resourceURIBrowseFileSystemButton = new Button(
> 				buttonComposite, SWT.PUSH);
>-			resourceURIBrowseFileSystemButton.setText(EMFEditUIPlugin.INSTANCE
>-				.getString("_UI_BrowseFileSystem_label")); //$NON-NLS-1$
>+			resourceURIBrowseFileSystemButton.setText(MSLExampleMessages.BrowseFileSystem_label);
> 			resourceURIBrowseFileSystemButton
> 				.addSelectionListener(new SelectionAdapter() {
> 
>@@ -201,16 +197,15 @@
> 					resourceURIBrowseFileSystemButton.setLayoutData(data);
> 				}
> 				resourceURIBrowseWorkspaceButton
>-					.setText(EMFEditUIPlugin.INSTANCE
>-						.getString("_UI_BrowseWorkspace_label")); //$NON-NLS-1$
>+					.setText(MSLExampleMessages.BrowseWorkspace_label);
> 				resourceURIBrowseWorkspaceButton
> 					.addSelectionListener(new SelectionAdapter() {
> 
> 						public void widgetSelected(SelectionEvent event) {
> 							ContainerSelectionDialog containerSelectionDialog = new ContainerSelectionDialog(
> 								getShell(), ResourcesPlugin.getWorkspace()
>-									.getRoot(), false, EMFEditUIPlugin.INSTANCE
>-									.getString("_UI_SelectTheResource_label")); //$NON-NLS-1$
>+									.getRoot(), false,
>+									MSLExampleMessages.SelectContainer_label);
> 
> 							containerSelectionDialog.open();
> 							Object[] result = containerSelectionDialog
>@@ -297,7 +292,7 @@
> 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
> 	 */
> 	public void run(IAction action) {
>-		LoadResourceDialog loadResourceDialog = new LoadResourceDialog(
>+		SetPathmapDialog loadResourceDialog = new SetPathmapDialog(
> 			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
> 			domain);
> 
>Index: src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.properties
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.emf/src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 MSLExampleMessages.properties
>--- src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.properties	31 Oct 2005 19:43:56 -0000	1.2
>+++ src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.properties	23 Feb 2006 17:01:41 -0000
>@@ -57,4 +57,13 @@
> ControlUnitAction_label = Control Unit
> UncontrolUnitAction_label = Uncontrol Unit
> 
>-Resource_name=Resource
>\ No newline at end of file
>+Resource_name=Resource
>+
>+ResourceURI_label=Resource URI:
>+ContainerURI_label=Container URI:
>+BrowseFileSystem_label=Browse File System...
>+BrowseWorkspace_label=Browse Workspace...
>+SelectContainer_label=Select Resource Container
>+Undo_menu_item_label=&Undo {0}@Ctrl+Z
>+Redo_menu_item_label=&Redo {0}@Ctrl+Y
>+SetPathmapDialog_title=Set Pathmap
>Index: src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.emf/src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLExampleMessages.java
>--- src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.java	31 Oct 2005 19:43:56 -0000	1.2
>+++ src/org/eclipse/gmf/examples/runtime/emf/internal/l10n/MSLExampleMessages.java	23 Feb 2006 17:01:41 -0000
>@@ -54,6 +54,15 @@
> 	public static String ControlUnitAction_label;
> 	public static String UncontrolUnitAction_label;
> 	public static String Resource_name;
>+	
>+	public static String ResourceURI_label;
>+	public static String ContainerURI_label;
>+	public static String BrowseFileSystem_label;
>+	public static String BrowseWorkspace_label;
>+	public static String SelectContainer_label;
>+	public static String Undo_menu_item_label;
>+	public static String Redo_menu_item_label;
>+	public static String SetPathmapDialog_title;
> 
> 	static {
> 		NLS.initializeMessages(BUNDLE_NAME, MSLExampleMessages.class);

Actions: View | Diff

Attachments on bug 128855: 35242