Attachment 96072 Details for Bug 163150 – Patch.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch.

Defect_163150_patch.txt (text/plain), 2.16 KB, created by Paul Slauenwhite

on 2008-04-15 10:03:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-04-15 10:03:53 EDT

Size: 2.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.ui
>Index: src/org/eclipse/hyades/test/ui/dialog/EObjectResourceLabelProvider.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/dialog/EObjectResourceLabelProvider.java,v
>retrieving revision 1.5
>diff -u -r1.5 EObjectResourceLabelProvider.java
>--- src/org/eclipse/hyades/test/ui/dialog/EObjectResourceLabelProvider.java	18 May 2005 08:18:11 -0000	1.5
>+++ src/org/eclipse/hyades/test/ui/dialog/EObjectResourceLabelProvider.java	15 Apr 2008 14:03:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 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
>@@ -16,18 +16,23 @@
> import java.util.Iterator;
> import java.util.Map;
> 
>-import org.eclipse.core.resources.IFile;
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.hyades.models.common.common.CMNNamedElement;
> import org.eclipse.hyades.test.core.util.EMFUtil;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.ui.model.IWorkbenchAdapter;
> 
>-
> /**
>+ * EObjectResourceLabelProvider.java
>+ * </p>
>+ * 
>  * 
>+ * @author  Paul E. Slauenwhite
>+ * @version April 15, 2008
>+ * @since   February 1, 2005
>  */
> public class EObjectResourceLabelProvider extends LabelProvider
> {
>@@ -94,8 +99,12 @@
> 	
> 		if(element instanceof EObject)
> 		{
>-			IFile file = EMFUtil.getWorkspaceFile((EObject)element);
>-			text = file.getName();
>+			if(element instanceof CMNNamedElement){
>+				text = ((CMNNamedElement)(element)).getName();
>+			}
>+			else{
>+				text = EMFUtil.getWorkspaceFile(((EObject)(element))).getName();
>+			}
> 		}			
> 		else if(element instanceof IAdaptable)
> 		{

Actions: View | Diff

Attachments on bug 163150: 96072