Attachment 161614 Details for Bug 239962 – fixes the subj

[patch] fixes the subj

239962 patch.txt (text/plain), 32.26 KB, created by Elena Shaverdova

on 2010-03-10 10:38:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Elena Shaverdova

Created: 2010-03-10 10:38:48 EST

Size: 32.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.diagram.csd
>Index: src/org/eclipse/uml2/diagram/csd/providers/UMLParserProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.csd/src/org/eclipse/uml2/diagram/csd/providers/UMLParserProvider.java,v
>retrieving revision 1.26
>diff -u -r1.26 UMLParserProvider.java
>--- src/org/eclipse/uml2/diagram/csd/providers/UMLParserProvider.java	10 Mar 2010 13:05:05 -0000	1.26
>+++ src/org/eclipse/uml2/diagram/csd/providers/UMLParserProvider.java	10 Mar 2010 15:11:32 -0000
>@@ -2,7 +2,6 @@
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EAttribute;
>-import org.eclipse.emf.ecore.ENamedElement;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
>@@ -13,8 +12,9 @@
> import org.eclipse.gmf.runtime.emf.type.core.IElementType;
> import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
> import org.eclipse.gmf.runtime.notation.View;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.common.parser.association.AssociationInstanceParser;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndApplyStrategy;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndParser;
>@@ -102,6 +102,19 @@
>  */
> public class UMLParserProvider extends AbstractProvider implements IParserProvider {
> 
>+	private static final ILabelProvider myLabelProvider = new LabelProvider() {
>+
>+		@Override
>+		public Image getImage(Object element) {
>+			if (element instanceof EObject) {
>+				return UMLElementTypes.getImage(((EObject) element).eClass());
>+			} else {
>+				return null;
>+			}
>+		}
>+
>+	};
>+
> 	/**
> 	 * @NOT-generated
> 	 */
>@@ -296,14 +309,8 @@
> 	protected IParser createInstanceSpecificationName_5022Parser() {
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
>-		ImageProvider imageProvider = new ImageProvider() {
> 
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new InstanceSpecificationSemanticParser(lookupSuite, imageProvider);
>+		return new InstanceSpecificationSemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -487,14 +494,7 @@
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new PropertySemanticParser(lookupSuite, imageProvider);
>+		return new PropertySemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -760,14 +760,7 @@
> 	 * @generated NOT
> 	 */
> 	protected IParser createSlot_3015Parser() {
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new SlotSemanticParser(new SlotLookupSuite(), imageProvider);
>+		return new SlotSemanticParser(new SlotLookupSuite(), myLabelProvider);
> 	}
> 
> 	/**
>#P org.eclipse.uml2.diagram.profile
>Index: custom-src/org/eclipse/uml2/diagram/profile/parser/property/PropertyParserProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.profile/custom-src/org/eclipse/uml2/diagram/profile/parser/property/PropertyParserProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 PropertyParserProvider.java
>--- custom-src/org/eclipse/uml2/diagram/profile/parser/property/PropertyParserProvider.java	10 Mar 2010 13:05:02 -0000	1.2
>+++ custom-src/org/eclipse/uml2/diagram/profile/parser/property/PropertyParserProvider.java	10 Mar 2010 15:11:33 -0000
>@@ -13,15 +13,16 @@
> package org.eclipse.uml2.diagram.profile.parser.property;
> 
> import org.eclipse.core.runtime.IAdaptable;
>-import org.eclipse.emf.ecore.ENamedElement;
>+import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
> import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;
> import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
> import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;
> import org.eclipse.gmf.runtime.emf.type.core.IElementType;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.common.parser.property.PropertySemanticParser;
> import org.eclipse.uml2.diagram.parser.BasicApplyStrategy;
> import org.eclipse.uml2.diagram.parser.lookup.DefaultOclLookups;
>@@ -49,14 +50,19 @@
> 		lookupSuite.addLookup(Type.class, new OCLLookup<Type>(UMLOCLFactory.getOCLLookupExpression(//
> 				DefaultOclLookups.DEFAULT_TYPE_LOOKUP, UMLPackage.eINSTANCE.getNamedElement())));
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>+		ILabelProvider labelProvider = new LabelProvider() {
> 
> 			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>+			public Image getImage(Object element) {
>+				if (element instanceof EObject) {
>+					return UMLElementTypes.getImage(((EObject) element).eClass());
>+				} else {
>+					return null;
>+				}
> 			}
>+
> 		};
>-		return new PropertySemanticParser(lookupSuite, imageProvider, new BasicApplyStrategy(), new StereotypePropertyToString());
>+		return new PropertySemanticParser(lookupSuite, labelProvider, new BasicApplyStrategy(), new StereotypePropertyToString());
> 	}
> 
> 	public boolean provides(IOperation operation) {
>#P org.eclipse.uml2.diagram.common
>Index: src/org/eclipse/uml2/diagram/common/parser/instance/InstanceSpecificationSemanticParser.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/instance/InstanceSpecificationSemanticParser.java,v
>retrieving revision 1.1
>diff -u -r1.1 InstanceSpecificationSemanticParser.java
>--- src/org/eclipse/uml2/diagram/common/parser/instance/InstanceSpecificationSemanticParser.java	10 Mar 2010 13:04:55 -0000	1.1
>+++ src/org/eclipse/uml2/diagram/common/parser/instance/InstanceSpecificationSemanticParser.java	10 Mar 2010 15:11:34 -0000
>@@ -3,8 +3,8 @@
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
>+import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.parser.ApplyStrategy;
> import org.eclipse.uml2.diagram.parser.BasicApplyStrategy;
> import org.eclipse.uml2.diagram.parser.ExternalToString;
>@@ -17,22 +17,22 @@
> 
> public class InstanceSpecificationSemanticParser extends SemanticParserAdapter {
> 
>-	private final ImageProvider myImageProvider;
>+	private final ILabelProvider myLabelProvider;
> 
> 	private final CompletionProcessor myCompletionProcessor;
> 
>-	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider) {
>-		this(lookupSuite, imageProvider, new BasicApplyStrategy(), new InstanceSpecificationToString.VIEW(), new InstanceSpecificationToString.EDIT());
>+	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider) {
>+		this(lookupSuite, labelProvider, new BasicApplyStrategy(), new InstanceSpecificationToString.VIEW(), new InstanceSpecificationToString.EDIT());
> 	}
> 
>-	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
>+	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
> 		super(new InstanceSpecificationParser(lookupSuite), applier, view, edit);
> 		myCompletionProcessor = new CompletionProcessor(lookupSuite.getLookup(Type.class));
>-		myImageProvider = imageProvider;
>+		myLabelProvider = labelProvider;
> 	}
> 
>-	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>-		this(lookupSuite, imageProvider, applier, viewAndEdit, viewAndEdit);
>+	public InstanceSpecificationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>+		this(lookupSuite, labelProvider, applier, viewAndEdit, viewAndEdit);
> 	}
> 
> 	protected final EObject doAdapt(IAdaptable adaptable) {
>@@ -66,7 +66,7 @@
> 
> 		@Override
> 		protected Image getProposalImage(Type proposedType) {
>-			return myImageProvider.getImage(proposedType.eClass());
>+			return myLabelProvider.getImage(proposedType);
> 		}
> 	}
> }
>Index: src/org/eclipse/uml2/diagram/common/parser/operation/OperationToString.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/operation/OperationToString.java,v
>retrieving revision 1.4
>diff -u -r1.4 OperationToString.java
>--- src/org/eclipse/uml2/diagram/common/parser/operation/OperationToString.java	29 Jun 2007 11:01:24 -0000	1.4
>+++ src/org/eclipse/uml2/diagram/common/parser/operation/OperationToString.java	10 Mar 2010 15:11:35 -0000
>@@ -48,6 +48,7 @@
> 				UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue(),
> 				UMLPackage.eINSTANCE.getLiteralUnlimitedNatural_Value(), 
> 				UMLPackage.eINSTANCE.getLiteralInteger_Value(),
>+				UMLPackage.eINSTANCE.getBehavioralFeature_OwnedParameter()
> 		});
> 		
> 		public String getToString(EObject object, int flags) {
>Index: src/org/eclipse/uml2/diagram/common/parser/operation/OperationSemanticParser.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/operation/OperationSemanticParser.java,v
>retrieving revision 1.3
>diff -u -r1.3 OperationSemanticParser.java
>--- src/org/eclipse/uml2/diagram/common/parser/operation/OperationSemanticParser.java	10 Mar 2010 13:04:53 -0000	1.3
>+++ src/org/eclipse/uml2/diagram/common/parser/operation/OperationSemanticParser.java	10 Mar 2010 15:11:35 -0000
>@@ -14,8 +14,8 @@
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
>+import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.parser.ApplyStrategy;
> import org.eclipse.uml2.diagram.parser.BasicApplyStrategy;
> import org.eclipse.uml2.diagram.parser.ExternalToString;
>@@ -28,22 +28,22 @@
> 
> public class OperationSemanticParser extends SemanticParserAdapter {
> 
>-	private final ImageProvider myImageProvider;
>+	private final ILabelProvider myLabelProvider;
> 
> 	private final CompletionProcessor myCompletionProcessor;
> 
>-	public OperationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider) {
>-		this(lookupSuite, imageProvider, new BasicApplyStrategy(), new OperationToString.VIEW(), new OperationToString.EDIT());
>+	public OperationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider) {
>+		this(lookupSuite, labelProvider, new BasicApplyStrategy(), new OperationToString.VIEW(), new OperationToString.EDIT());
> 	}
> 
>-	public OperationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
>+	public OperationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
> 		super(new OperationParser(lookupSuite), applier, view, edit);
>-		myImageProvider = imageProvider;
>+		myLabelProvider = labelProvider;
> 		myCompletionProcessor = new CompletionProcessor(lookupSuite.getLookup(Type.class));
> 	}
> 
>-	public OperationSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>-		this(lookupSuite, imageProvider, applier, viewAndEdit, viewAndEdit);
>+	public OperationSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>+		this(lookupSuite, labelProvider, applier, viewAndEdit, viewAndEdit);
> 	}
> 
> 	protected final EObject doAdapt(IAdaptable adaptable) {
>@@ -74,7 +74,7 @@
> 
> 		@Override
> 		protected Image getProposalImage(Type proposedEObject) {
>-			return myImageProvider.getImage(proposedEObject.eClass());
>+			return myLabelProvider.getImage(proposedEObject);
> 		}
> 	}
> }
>Index: src/org/eclipse/uml2/diagram/common/parser/property/PropertySemanticParser.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/property/PropertySemanticParser.java,v
>retrieving revision 1.3
>diff -u -r1.3 PropertySemanticParser.java
>--- src/org/eclipse/uml2/diagram/common/parser/property/PropertySemanticParser.java	10 Mar 2010 13:04:52 -0000	1.3
>+++ src/org/eclipse/uml2/diagram/common/parser/property/PropertySemanticParser.java	10 Mar 2010 15:11:35 -0000
>@@ -20,8 +20,8 @@
> import org.eclipse.jface.contentassist.IContentAssistSubjectControl;
> import org.eclipse.jface.text.contentassist.ICompletionProposal;
> import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
>+import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.parser.ApplyStrategy;
> import org.eclipse.uml2.diagram.parser.BasicApplyStrategy;
> import org.eclipse.uml2.diagram.parser.ExternalToString;
>@@ -33,21 +33,21 @@
> 
> public class PropertySemanticParser extends SemanticParserAdapter {
> 
>-	private final ImageProvider myImageProvider;
>+	private final ILabelProvider myLabelProvider;
> 
> 	private final CompletionProcessor myCompletionProcessor;
> 
>-	public PropertySemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider) {
>-		this(lookupSuite, imageProvider, new BasicApplyStrategy(), new PropertyToString.VIEW(), new PropertyToString.EDIT());
>+	public PropertySemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider) {
>+		this(lookupSuite, labelProvider, new BasicApplyStrategy(), new PropertyToString.VIEW(), new PropertyToString.EDIT());
> 	}
> 
>-	public PropertySemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, ExternalToString.WithReferences viewAndEdit) {
>-		this(lookupSuite, imageProvider, applier, viewAndEdit, viewAndEdit);
>+	public PropertySemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, ExternalToString.WithReferences viewAndEdit) {
>+		this(lookupSuite, labelProvider, applier, viewAndEdit, viewAndEdit);
> 	}
> 
>-	public PropertySemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, ExternalToString.WithReferences view, ExternalToString edit) {
>+	public PropertySemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, ExternalToString.WithReferences view, ExternalToString edit) {
> 		super(new PropertyParser(lookupSuite), applier, view, edit);
>-		myImageProvider = imageProvider;
>+		myLabelProvider = labelProvider;
> 		myCompletionProcessor = new CompletionProcessor(lookupSuite.getLookup(Type.class));
> 	}
> 
>@@ -107,7 +107,7 @@
> 
> 		@Override
> 		protected Image getProposalImage(Type proposedEObject) {
>-			return myImageProvider.getImage(proposedEObject.eClass());
>+			return myLabelProvider.getImage(proposedEObject);
> 		}
> 
> 	}
>Index: src/org/eclipse/uml2/diagram/common/parser/slot/SlotSemanticParser.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/slot/SlotSemanticParser.java,v
>retrieving revision 1.1
>diff -u -r1.1 SlotSemanticParser.java
>--- src/org/eclipse/uml2/diagram/common/parser/slot/SlotSemanticParser.java	10 Mar 2010 13:04:49 -0000	1.1
>+++ src/org/eclipse/uml2/diagram/common/parser/slot/SlotSemanticParser.java	10 Mar 2010 15:11:35 -0000
>@@ -3,8 +3,8 @@
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
>+import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.parser.ApplyStrategy;
> import org.eclipse.uml2.diagram.parser.BasicApplyStrategy;
> import org.eclipse.uml2.diagram.parser.ExternalToString;
>@@ -17,22 +17,22 @@
> 
> public class SlotSemanticParser extends SemanticParserAdapter {
> 
>-	private final ImageProvider myImageProvider;
>+	private final ILabelProvider myLabelProvider;
> 
> 	private final CompletionProcessor myCompletionProcessor;
> 
>-	public SlotSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider) {
>-		this(lookupSuite, imageProvider, new BasicApplyStrategy(), new SlotToString.VIEW(), new SlotToString.EDIT());
>+	public SlotSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider) {
>+		this(lookupSuite, labelProvider, new BasicApplyStrategy(), new SlotToString.VIEW(), new SlotToString.EDIT());
> 	}
> 
>-	public SlotSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
>+	public SlotSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences view, ExternalToString edit) {
> 		super(new SlotParser(lookupSuite), applier, view, edit);
> 		myCompletionProcessor = new CompletionProcessor(lookupSuite.getLookup(StructuralFeature.class));
>-		myImageProvider = imageProvider;
>+		myLabelProvider = labelProvider;
> 	}
> 
>-	public SlotSemanticParser(LookupSuite lookupSuite, ImageProvider imageProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>-		this(lookupSuite, imageProvider, applier, viewAndEdit, viewAndEdit);
>+	public SlotSemanticParser(LookupSuite lookupSuite, ILabelProvider labelProvider, ApplyStrategy applier, WithReferences viewAndEdit) {
>+		this(lookupSuite, labelProvider, applier, viewAndEdit, viewAndEdit);
> 	}
> 
> 	protected final EObject doAdapt(IAdaptable adaptable) {
>@@ -67,7 +67,7 @@
> 
> 		@Override
> 		protected Image getProposalImage(StructuralFeature proposedFeature) {
>-			return myImageProvider.getImage(proposedFeature.eClass());
>+			return myLabelProvider.getImage(proposedFeature);
> 		}
> 	}
> }
>Index: src/org/eclipse/uml2/diagram/common/parser/ImageProvider.java
>===================================================================
>RCS file: src/org/eclipse/uml2/diagram/common/parser/ImageProvider.java
>diff -N src/org/eclipse/uml2/diagram/common/parser/ImageProvider.java
>--- src/org/eclipse/uml2/diagram/common/parser/ImageProvider.java	10 Mar 2010 13:04:48 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,8 +0,0 @@
>-package org.eclipse.uml2.diagram.common.parser;
>-
>-import org.eclipse.emf.ecore.ENamedElement;
>-import org.eclipse.swt.graphics.Image;
>-
>-public interface ImageProvider {
>-	Image getImage(ENamedElement element);
>-}
>#P org.eclipse.uml2.diagram.deploy
>Index: src/org/eclipse/uml2/diagram/deploy/providers/UMLParserProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/providers/UMLParserProvider.java,v
>retrieving revision 1.9
>diff -u -r1.9 UMLParserProvider.java
>--- src/org/eclipse/uml2/diagram/deploy/providers/UMLParserProvider.java	10 Mar 2010 13:04:43 -0000	1.9
>+++ src/org/eclipse/uml2/diagram/deploy/providers/UMLParserProvider.java	10 Mar 2010 15:11:37 -0000
>@@ -2,7 +2,6 @@
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EAttribute;
>-import org.eclipse.emf.ecore.ENamedElement;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
>@@ -13,8 +12,9 @@
> import org.eclipse.gmf.runtime.emf.type.core.IElementType;
> import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
> import org.eclipse.gmf.runtime.notation.View;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.common.parser.imports.ElementImportParser;
> import org.eclipse.uml2.diagram.common.parser.property.PropertySemanticParser;
> import org.eclipse.uml2.diagram.common.parser.stereotype.DeploymentAppliedStereotypeParser;
>@@ -637,18 +637,23 @@
> 	/**
> 	 * @NOT-GENERATED
> 	 */
>-	private IParser createPropertyParser() {
>+	private IParser createPropertyParser() { 
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>+		ILabelProvider labelProvider = new LabelProvider() {
> 
> 			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>+			public Image getImage(Object element) {
>+				if (element instanceof EObject) { 
>+					return UMLElementTypes.getImage(((EObject) element).eClass());
>+				} else { 
>+					return null;
>+				}
> 			}
>+
> 		};
>-		return new PropertySemanticParser(lookupSuite, imageProvider);
>+		return new PropertySemanticParser(lookupSuite, labelProvider);
> 	}
> 
> 	/**
>@@ -828,6 +833,7 @@
> 
> 	/**
> 	 * Utility method that consults ParserService
>+	 * 
> 	 * @generated
> 	 */
> 	public static IParser getParser(IElementType type, EObject object, String parserHint) {
>#P org.eclipse.uml2.diagram.component
>Index: src/org/eclipse/uml2/diagram/component/providers/UMLParserProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.component/src/org/eclipse/uml2/diagram/component/providers/UMLParserProvider.java,v
>retrieving revision 1.20
>diff -u -r1.20 UMLParserProvider.java
>--- src/org/eclipse/uml2/diagram/component/providers/UMLParserProvider.java	10 Mar 2010 13:04:58 -0000	1.20
>+++ src/org/eclipse/uml2/diagram/component/providers/UMLParserProvider.java	10 Mar 2010 15:11:38 -0000
>@@ -2,7 +2,6 @@
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EAttribute;
>-import org.eclipse.emf.ecore.ENamedElement;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
>@@ -13,8 +12,9 @@
> import org.eclipse.gmf.runtime.emf.type.core.IElementType;
> import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
> import org.eclipse.gmf.runtime.notation.View;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndApplyStrategy;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndParser;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndToString;
>@@ -91,6 +91,19 @@
>  */
> public class UMLParserProvider extends AbstractProvider implements IParserProvider {
> 
>+	private static final ILabelProvider myLabelProvider = new LabelProvider() {
>+
>+		@Override
>+		public Image getImage(Object element) {
>+			if (element instanceof EObject) { 
>+				return UMLElementTypes.getImage(((EObject) element).eClass());
>+			} else { 
>+				return null;
>+			}
>+		}
>+
>+	};
>+
> 	/**
> 	 * @generated
> 	 */
>@@ -383,7 +396,9 @@
> 	}
> 
> 	/**
>-	 * XXX: Misleading name of the method. The only way to fix it is custom template 
>+	 * XXX: Misleading name of the method. The only way to fix it is custom
>+	 * template
>+	 * 
> 	 * @generated NOT
> 	 */
> 	protected IParser createClassQualifiedName_5015Parser() {
>@@ -716,14 +731,8 @@
> 	protected IParser createProperty_3011Parser() {
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
>-		ImageProvider imageProvider = new ImageProvider() {
> 
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new PropertySemanticParser(lookupSuite, imageProvider);
>+		return new PropertySemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -748,15 +757,7 @@
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-
>-		return new OperationSemanticParser(lookupSuite, imageProvider, new OperationInplaceApplier(), new OperationToString.VIEW(), new OperationToString.EDIT());
>+		return new OperationSemanticParser(lookupSuite, myLabelProvider, new OperationInplaceApplier(), new OperationToString.VIEW(), new OperationToString.EDIT());
> 	}
> 
> 	/**
>@@ -821,12 +822,13 @@
> 	}
> 
> 	/**
>-	 * @generated
>+	 * @generated NOT
> 	 */
> 	protected IParser createProperty_3017Parser() {
>-		EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
>-		MessageFormatParser parser = new MessageFormatParser(features);
>-		return parser;
>+		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
>+		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
>+
>+		return new PropertySemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -845,12 +847,13 @@
> 	}
> 
> 	/**
>-	 * @generated
>+	 * @generated NOT
> 	 */
> 	protected IParser createOperation_3018Parser() {
>-		EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() };
>-		MessageFormatParser parser = new MessageFormatParser(features);
>-		return parser;
>+		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
>+		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
>+
>+		return new OperationSemanticParser(lookupSuite, myLabelProvider, new OperationInplaceApplier(), new OperationToString.VIEW(), new OperationToString.EDIT());
> 	}
> 
> 	/**
>@@ -889,8 +892,7 @@
> 	private IParser dependencyName_6001Parser;
> 
> 	/**
>-	 * @NOT-GENERATED
>-	 * Different view's but shared common edit.
>+	 * @NOT-GENERATED Different view's but shared common edit.
> 	 */
> 	private IParser createAssocationRoleParser(boolean sourceNotTarget) {
> 		LookupSuite lookupSuite = getAssociationLookupSuite();
>@@ -1202,6 +1204,7 @@
> 
> 	/**
> 	 * Utility method that consults ParserService
>+	 * 
> 	 * @generated
> 	 */
> 	public static IParser getParser(IElementType type, EObject object, String parserHint) {
>#P org.eclipse.uml2.diagram.clazz
>Index: src/org/eclipse/uml2/diagram/clazz/providers/UMLParserProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2tools/plugins/org.eclipse.uml2.diagram.clazz/src/org/eclipse/uml2/diagram/clazz/providers/UMLParserProvider.java,v
>retrieving revision 1.43
>diff -u -r1.43 UMLParserProvider.java
>--- src/org/eclipse/uml2/diagram/clazz/providers/UMLParserProvider.java	10 Mar 2010 13:04:32 -0000	1.43
>+++ src/org/eclipse/uml2/diagram/clazz/providers/UMLParserProvider.java	10 Mar 2010 15:11:40 -0000
>@@ -2,7 +2,6 @@
> 
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.emf.ecore.EAttribute;
>-import org.eclipse.emf.ecore.ENamedElement;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
>@@ -13,6 +12,8 @@
> import org.eclipse.gmf.runtime.emf.type.core.IElementType;
> import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
> import org.eclipse.gmf.runtime.notation.View;
>+import org.eclipse.jface.viewers.ILabelProvider;
>+import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.uml2.diagram.clazz.edit.parts.AssociationClassEditPart;
> import org.eclipse.uml2.diagram.clazz.edit.parts.AssociationClassNameEditPart;
>@@ -109,7 +110,6 @@
> import org.eclipse.uml2.diagram.clazz.parser.dependency.DependencyTypeParser;
> import org.eclipse.uml2.diagram.clazz.parsers.MessageFormatParser;
> import org.eclipse.uml2.diagram.clazz.part.UMLVisualIDRegistry;
>-import org.eclipse.uml2.diagram.common.parser.ImageProvider;
> import org.eclipse.uml2.diagram.common.parser.association.AssociationInstanceParser;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndApplyStrategy;
> import org.eclipse.uml2.diagram.common.parser.association.end.AssociationEndParser;
>@@ -145,6 +145,19 @@
>  */
> public class UMLParserProvider extends AbstractProvider implements IParserProvider {
> 
>+	private static final ILabelProvider myLabelProvider = new LabelProvider() {
>+
>+		@Override
>+		public Image getImage(Object element) {
>+			if (element instanceof EObject) {
>+				return UMLElementTypes.getImage(((EObject) element).eClass());
>+			} else {
>+				return null;
>+			}
>+		}
>+
>+	};
>+
> 	/**
> 	 * @generated
> 	 */
>@@ -1852,15 +1865,7 @@
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-
>-		return new PropertySemanticParser(lookupSuite, imageProvider);
>+		return new PropertySemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -1912,15 +1917,7 @@
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
> 
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-
>-		return new OperationSemanticParser(lookupSuite, imageProvider);
>+		return new OperationSemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
>@@ -1968,28 +1965,15 @@
> 	private IParser createInstanceSpecificationParser() {
> 		LookupSuiteImpl lookupSuite = new LookupSuiteImpl();
> 		lookupSuite.addLookup(Type.class, TYPE_LOOKUP);
>-		ImageProvider imageProvider = new ImageProvider() {
> 
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new InstanceSpecificationSemanticParser(lookupSuite, imageProvider);
>+		return new InstanceSpecificationSemanticParser(lookupSuite, myLabelProvider);
> 	}
> 
> 	/**
> 	 * @generated NOT
> 	 */
> 	protected IParser createSlot_3017Parser() {
>-		ImageProvider imageProvider = new ImageProvider() {
>-
>-			@Override
>-			public Image getImage(ENamedElement element) {
>-				return UMLElementTypes.getImage(element);
>-			}
>-		};
>-		return new SlotSemanticParser(new SlotLookupSuite(), imageProvider);
>+		return new SlotSemanticParser(new SlotLookupSuite(), myLabelProvider);
> 	}
> 
> 	/**

Actions: View | Diff

Attachments on bug 239962: 161614 | 161617