Attachment #71640 for bug #189608

View | Details | Raw Unified | Return to bug 189608
Collapse All | Expand All

Lines 8-13 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/Class2EditPart.java (+13 lines)
8	import org.eclipse.draw2d.RectangleFigure;	8	import org.eclipse.draw2d.RectangleFigure;
9	import org.eclipse.draw2d.StackLayout;	9	import org.eclipse.draw2d.StackLayout;
10	import org.eclipse.draw2d.ToolbarLayout;	10	import org.eclipse.draw2d.ToolbarLayout;
		11	import org.eclipse.emf.common.notify.Notification;
		12	import org.eclipse.emf.ecore.EcorePackage;
11	import org.eclipse.gef.EditPart;	13	import org.eclipse.gef.EditPart;
12	import org.eclipse.gef.EditPolicy;	14	import org.eclipse.gef.EditPolicy;
13	import org.eclipse.gef.Request;	15	import org.eclipse.gef.Request;
Lines 320-325 Link Here
320	/**	322	/**
321	* @generated	323	* @generated
322	*/	324	*/
		325	protected void handleNotificationEvent(Notification event) {
		326	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		327	handleMajorSemanticChange();
		328	} else {
		329	super.handleNotificationEvent(event);
		330	}
		331	}
		332
		333	/**
		334	* @generated
		335	*/
323	public class ClassFigure extends RectangleFigure {	336	public class ClassFigure extends RectangleFigure {
324		337
325	/**	338	/**

Lines 8-13 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/InstanceSpecification2EditPart.java (+13 lines)
8	import org.eclipse.draw2d.RectangleFigure;	8	import org.eclipse.draw2d.RectangleFigure;
9	import org.eclipse.draw2d.StackLayout;	9	import org.eclipse.draw2d.StackLayout;
10	import org.eclipse.draw2d.ToolbarLayout;	10	import org.eclipse.draw2d.ToolbarLayout;
		11	import org.eclipse.emf.common.notify.Notification;
		12	import org.eclipse.emf.ecore.EcorePackage;
11	import org.eclipse.gef.EditPart;	13	import org.eclipse.gef.EditPart;
12	import org.eclipse.gef.EditPolicy;	14	import org.eclipse.gef.EditPolicy;
13	import org.eclipse.gef.Request;	15	import org.eclipse.gef.Request;
Lines 243-248 Link Here
243	/**	245	/**
244	* @generated	246	* @generated
245	*/	247	*/
		248	protected void handleNotificationEvent(Notification event) {
		249	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		250	handleMajorSemanticChange();
		251	} else {
		252	super.handleNotificationEvent(event);
		253	}
		254	}
		255
		256	/**
		257	* @generated
		258	*/
246	public class InstanceNodeFigure extends RectangleFigure {	259	public class InstanceNodeFigure extends RectangleFigure {
247		260
248	/**	261	/**

Lines 6-11 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/InterfaceEditPart.java (+13 lines)
6	import org.eclipse.draw2d.PositionConstants;	6	import org.eclipse.draw2d.PositionConstants;
7	import org.eclipse.draw2d.StackLayout;	7	import org.eclipse.draw2d.StackLayout;
8	import org.eclipse.draw2d.geometry.Dimension;	8	import org.eclipse.draw2d.geometry.Dimension;
		9	import org.eclipse.emf.common.notify.Notification;
		10	import org.eclipse.emf.ecore.EcorePackage;
9	import org.eclipse.gef.EditPart;	11	import org.eclipse.gef.EditPart;
10	import org.eclipse.gef.EditPolicy;	12	import org.eclipse.gef.EditPolicy;
11	import org.eclipse.gef.Request;	13	import org.eclipse.gef.Request;
Lines 186-191 Link Here
186	/**	188	/**
187	* @generated	189	* @generated
188	*/	190	*/
		191	protected void handleNotificationEvent(Notification event) {
		192	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		193	handleMajorSemanticChange();
		194	} else {
		195	super.handleNotificationEvent(event);
		196	}
		197	}
		198
		199	/**
		200	* @generated
		201	*/
189	public class ProvidedInterfaceCircleFigure extends Ellipse {	202	public class ProvidedInterfaceCircleFigure extends Ellipse {
190		203
191	/**	204	/**

Lines 3-8 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/ConstraintEditPart.java (+13 lines)
3	import org.eclipse.draw2d.IFigure;	3	import org.eclipse.draw2d.IFigure;
4	import org.eclipse.draw2d.MarginBorder;	4	import org.eclipse.draw2d.MarginBorder;
5	import org.eclipse.draw2d.StackLayout;	5	import org.eclipse.draw2d.StackLayout;
		6	import org.eclipse.emf.common.notify.Notification;
		7	import org.eclipse.emf.ecore.EcorePackage;
6	import org.eclipse.gef.EditPart;	8	import org.eclipse.gef.EditPart;
7	import org.eclipse.gef.EditPolicy;	9	import org.eclipse.gef.EditPolicy;
8	import org.eclipse.gef.Request;	10	import org.eclipse.gef.Request;
Lines 206-211 Link Here
206	/**	208	/**
207	* @generated	209	* @generated
208	*/	210	*/
		211	protected void handleNotificationEvent(Notification event) {
		212	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		213	handleMajorSemanticChange();
		214	} else {
		215	super.handleNotificationEvent(event);
		216	}
		217	}
		218
		219	/**
		220	* @generated
		221	*/
209	public class ConstraintFigure extends MultilineConstraintFigure {	222	public class ConstraintFigure extends MultilineConstraintFigure {
210		223
211	/**	224	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/DataType2EditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 284-289 Link Here
284	/**	286	/**
285	* @generated	287	* @generated
286	*/	288	*/
		289	protected void handleNotificationEvent(Notification event) {
		290	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		291	handleMajorSemanticChange();
		292	} else {
		293	super.handleNotificationEvent(event);
		294	}
		295	}
		296
		297	/**
		298	* @generated
		299	*/
287	public class ClassFigure extends RectangleFigure {	300	public class ClassFigure extends RectangleFigure {
288		301
289	/**	302	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/DependencyEditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.geometry.Dimension;	9	import org.eclipse.draw2d.geometry.Dimension;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 187-192 Link Here
187	/**	189	/**
188	* @generated	190	* @generated
189	*/	191	*/
		192	protected void handleNotificationEvent(Notification event) {
		193	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		194	handleMajorSemanticChange();
		195	} else {
		196	super.handleNotificationEvent(event);
		197	}
		198	}
		199
		200	/**
		201	* @generated
		202	*/
190	public class DependencyNode extends RectangleFigure {	203	public class DependencyNode extends RectangleFigure {
191		204
192	/**	205	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/AssociationClass2EditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 302-307 Link Here
302	/**	304	/**
303	* @generated	305	* @generated
304	*/	306	*/
		307	protected void handleNotificationEvent(Notification event) {
		308	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		309	handleMajorSemanticChange();
		310	} else {
		311	super.handleNotificationEvent(event);
		312	}
		313	}
		314
		315	/**
		316	* @generated
		317	*/
305	public class ClassFigure extends RectangleFigure {	318	public class ClassFigure extends RectangleFigure {
306		319
307	/**	320	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/Enumeration2EditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 302-307 Link Here
302	/**	304	/**
303	* @generated	305	* @generated
304	*/	306	*/
		307	protected void handleNotificationEvent(Notification event) {
		308	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		309	handleMajorSemanticChange();
		310	} else {
		311	super.handleNotificationEvent(event);
		312	}
		313	}
		314
		315	/**
		316	* @generated
		317	*/
305	public class ClassFigure extends RectangleFigure {	318	public class ClassFigure extends RectangleFigure {
306		319
307	/**	320	/**

Lines 4-9 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/GeneralizationSetEditPart.java (+13 lines)
4	import org.eclipse.draw2d.PositionConstants;	4	import org.eclipse.draw2d.PositionConstants;
5	import org.eclipse.draw2d.StackLayout;	5	import org.eclipse.draw2d.StackLayout;
6	import org.eclipse.draw2d.geometry.Dimension;	6	import org.eclipse.draw2d.geometry.Dimension;
		7	import org.eclipse.emf.common.notify.Notification;
		8	import org.eclipse.emf.ecore.EcorePackage;
7	import org.eclipse.gef.EditPart;	9	import org.eclipse.gef.EditPart;
8	import org.eclipse.gef.EditPolicy;	10	import org.eclipse.gef.EditPolicy;
9	import org.eclipse.gef.Request;	11	import org.eclipse.gef.Request;
Lines 180-183 Link Here
180	return getChildBySemanticHint(UMLVisualIDRegistry.getType(GeneralizationSetIsCoveringIsDisjointEditPart.VISUAL_ID));	182	return getChildBySemanticHint(UMLVisualIDRegistry.getType(GeneralizationSetIsCoveringIsDisjointEditPart.VISUAL_ID));
181	}	183	}
182		184
		185	/**
		186	* @generated
		187	*/
		188	protected void handleNotificationEvent(Notification event) {
		189	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		190	handleMajorSemanticChange();
		191	} else {
		192	super.handleNotificationEvent(event);
		193	}
		194	}
		195
183	}	196	}

Lines 9-14 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/Package4EditPart.java (+13 lines)
9	import org.eclipse.draw2d.geometry.Point;	9	import org.eclipse.draw2d.geometry.Point;
10	import org.eclipse.draw2d.geometry.PointList;	10	import org.eclipse.draw2d.geometry.PointList;
11	import org.eclipse.draw2d.geometry.Rectangle;	11	import org.eclipse.draw2d.geometry.Rectangle;
		12	import org.eclipse.emf.common.notify.Notification;
		13	import org.eclipse.emf.ecore.EcorePackage;
12	import org.eclipse.gef.EditPart;	14	import org.eclipse.gef.EditPart;
13	import org.eclipse.gef.EditPolicy;	15	import org.eclipse.gef.EditPolicy;
14	import org.eclipse.gef.editpolicies.LayoutEditPolicy;	16	import org.eclipse.gef.editpolicies.LayoutEditPolicy;
Lines 214-219 Link Here
214	/**	216	/**
215	* @generated	217	* @generated
216	*/	218	*/
		219	protected void handleNotificationEvent(Notification event) {
		220	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		221	handleMajorSemanticChange();
		222	} else {
		223	super.handleNotificationEvent(event);
		224	}
		225	}
		226
		227	/**
		228	* @generated
		229	*/
217	public class SecondaryPackageFigure extends Shape {	230	public class SecondaryPackageFigure extends Shape {
218		231
219	/**	232	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/Interface2EditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 280-285 Link Here
280	/**	282	/**
281	* @generated	283	* @generated
282	*/	284	*/
		285	protected void handleNotificationEvent(Notification event) {
		286	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		287	handleMajorSemanticChange();
		288	} else {
		289	super.handleNotificationEvent(event);
		290	}
		291	}
		292
		293	/**
		294	* @generated
		295	*/
283	public class ClassFigure extends RectangleFigure {	296	public class ClassFigure extends RectangleFigure {
284		297
285	/**	298	/**

Lines 7-12 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/PrimitiveType2EditPart.java (+13 lines)
7	import org.eclipse.draw2d.RectangleFigure;	7	import org.eclipse.draw2d.RectangleFigure;
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
		10	import org.eclipse.emf.common.notify.Notification;
		11	import org.eclipse.emf.ecore.EcorePackage;
10	import org.eclipse.gef.EditPart;	12	import org.eclipse.gef.EditPart;
11	import org.eclipse.gef.EditPolicy;	13	import org.eclipse.gef.EditPolicy;
12	import org.eclipse.gef.Request;	14	import org.eclipse.gef.Request;
Lines 284-289 Link Here
284	/**	286	/**
285	* @generated	287	* @generated
286	*/	288	*/
		289	protected void handleNotificationEvent(Notification event) {
		290	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		291	handleMajorSemanticChange();
		292	} else {
		293	super.handleNotificationEvent(event);
		294	}
		295	}
		296
		297	/**
		298	* @generated
		299	*/
287	public class ClassFigure extends RectangleFigure {	300	public class ClassFigure extends RectangleFigure {
288		301
289	/**	302	/**

Lines 8-13 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/edit/parts/Package2EditPart.java (+13 lines)
8	import org.eclipse.draw2d.StackLayout;	8	import org.eclipse.draw2d.StackLayout;
9	import org.eclipse.draw2d.ToolbarLayout;	9	import org.eclipse.draw2d.ToolbarLayout;
10	import org.eclipse.draw2d.geometry.Dimension;	10	import org.eclipse.draw2d.geometry.Dimension;
		11	import org.eclipse.emf.common.notify.Notification;
		12	import org.eclipse.emf.ecore.EcorePackage;
11	import org.eclipse.gef.EditPart;	13	import org.eclipse.gef.EditPart;
12	import org.eclipse.gef.EditPolicy;	14	import org.eclipse.gef.EditPolicy;
13	import org.eclipse.gef.Request;	15	import org.eclipse.gef.Request;
Lines 301-306 Link Here
301	/**	303	/**
302	* @generated	304	* @generated
303	*/	305	*/
		306	protected void handleNotificationEvent(Notification event) {
		307	if (event.getNotifier() == getModel() && EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
		308	handleMajorSemanticChange();
		309	} else {
		310	super.handleNotificationEvent(event);
		311	}
		312	}
		313
		314	/**
		315	* @generated
		316	*/
304	public class PackageFigure extends RectangleFigure {	317	public class PackageFigure extends RectangleFigure {
305		318
306	/**	319	/**




<extension point="org.eclipse.core.expressions.propertyTesters">
      <?gmfgen generated="true"?>
       <propertyTester
           id="org.eclipse.uml2.diagram.clazz.ShortcutPropertyTester"
           type="org.eclipse.gmf.runtime.notation.View"
           namespace="org.eclipse.uml2.diagram.clazz"
           properties="isShortcut"
           class="org.eclipse.uml2.diagram.clazz.part.UMLShortcutPropertyTester">
       </propertyTester>
   </extension><extension point="org.eclipse.ui.contexts">
      <?gmfgen generated="true"?>

         contextId="org.eclipse.uml2.diagram.clazz.ui.diagramContext"
         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
         sequence="F5"/>
   </extension><extension point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
      <?gmfgen generated="true"?>
      <decoratorProvider class="org.eclipse.uml2.diagram.clazz.providers.UMLShortcutsDecoratorProvider">
         <Priority name="Lowest"/>
      </decoratorProvider>
   </extension>
<extension point="org.eclipse.core.expressions.propertyTesters">
      <?gmfgen generated="true"?>
       <propertyTester
           id="org.eclipse.uml2.diagram.clazz.DomainModelElementPropertyTester"
           type="org.eclipse.emf.ecore.EObject"
           namespace="org.eclipse.uml2.diagram.clazz"
           properties="isDomainModelElement"
           class="org.eclipse.uml2.diagram.clazz.part.UMLDomainModelElementTester">
       </propertyTester>
   </extension>






</plugin>

Lines 3-8 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/navigator/UMLNavigatorLinkHelper.java (+3 lines)
3	import java.util.Iterator;	3	import java.util.Iterator;
4		4
5	import org.eclipse.core.resources.IFile;	5	import org.eclipse.core.resources.IFile;
		6	import org.eclipse.core.runtime.IAdaptable;
6	import org.eclipse.emf.common.ui.URIEditorInput;	7	import org.eclipse.emf.common.ui.URIEditorInput;
7	import org.eclipse.emf.common.util.URI;	8	import org.eclipse.emf.common.util.URI;
8	import org.eclipse.emf.ecore.EObject;	9	import org.eclipse.emf.ecore.EObject;
Lines 86-91 Link Here
86	UMLNavigatorGroup navigatorGroup = (UMLNavigatorGroup) abstractNavigatorItem;	87	UMLNavigatorGroup navigatorGroup = (UMLNavigatorGroup) abstractNavigatorItem;
87	if (navigatorGroup.getParent() instanceof UMLNavigatorItem) {	88	if (navigatorGroup.getParent() instanceof UMLNavigatorItem) {
88	navigatorView = ((UMLNavigatorItem) navigatorGroup.getParent()).getView();	89	navigatorView = ((UMLNavigatorItem) navigatorGroup.getParent()).getView();
		90	} else if (navigatorGroup.getParent() instanceof IAdaptable) {
		91	navigatorView = (View) ((IAdaptable) navigatorGroup.getParent()).getAdapter(View.class);
89	}	92	}
90	}	93	}
91	if (navigatorView == null) {	94	if (navigatorView == null) {




import java.util.Iterator;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

			return getViewChildren(navigatorItem.getView(), parentElement);
		}

		/*
		 * Due to plugin.xml restrictions this code will be called only for views representing
		 * shortcuts to this diagram elements created on other diagrams. 
		 */
		if (parentElement instanceof IAdaptable) {
			View view = (View) ((IAdaptable) parentElement).getAdapter(View.class);
			if (view != null) {
				return getViewChildren(view, parentElement);
			}
		}

		return EMPTY_ARRAY;
	}


Lines 136-141 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/navigator/UMLNavigatorLabelProvider.java (+16 lines)
136	return getImage(navigatorItem.getView());	136	return getImage(navigatorItem.getView());
137	}	137	}
138		138
		139	// Due to plugin.xml content will be called only for "own" views
		140	if (element instanceof IAdaptable) {
		141	View view = (View) ((IAdaptable) element).getAdapter(View.class);
		142	if (view != null && isOwnView(view)) {
		143	return getImage(view);
		144	}
		145	}
		146
139	return super.getImage(element);	147	return super.getImage(element);
140	}	148	}
141		149
Lines 285-290 Link Here
285	return getText(navigatorItem.getView());	293	return getText(navigatorItem.getView());
286	}	294	}
287		295
		296	// Due to plugin.xml content will be called only for "own" views
		297	if (element instanceof IAdaptable) {
		298	View view = (View) ((IAdaptable) element).getAdapter(View.class);
		299	if (view != null && isOwnView(view)) {
		300	return getText(view);
		301	}
		302	}
		303
288	return super.getText(element);	304	return super.getText(element);
289	}	305	}
290		306

Lines 448-454 Link Here

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLVisualIDRegistry.java (-1 / +1 lines)
448	*/	448	*/
449	public static boolean canCreateNode(View containerView, int nodeVisualID) {	449	public static boolean canCreateNode(View containerView, int nodeVisualID) {
450	String containerModelID = org.eclipse.uml2.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);	450	String containerModelID = org.eclipse.uml2.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);
451	if (!PackageEditPart.MODEL_ID.equals(containerModelID)) {	451	if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
452	return false;	452	return false;
453	}	453	}
454	int containerVisualID;	454	int containerVisualID;




package org.eclipse.uml2.diagram.clazz.part;

import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.uml2.diagram.clazz.edit.parts.PackageEditPart;

/**
 * @generated
 */
public class UMLShortcutPropertyTester extends PropertyTester {

	/**
	 * @generated
	 */
	protected static final String SHORTCUT_PROPERTY = "isShortcut"; //$NON-NLS-1$

	/**
	 * @generated
	 */
	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
		if (false == receiver instanceof View) {
			return false;
		}
		View view = (View) receiver;
		if (SHORTCUT_PROPERTY.equals(method)) {
			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
			if (annotation != null) {
				return PackageEditPart.MODEL_ID.equals(annotation.getDetails().get("modelID")); //$NON-NLS-1$
			}
		}
		return false;
	}

}

Lines 25-30 Link Here

(-)structures/classDiagram.gmfgen (+1 lines)
25	xsi:type="gmfgen:FigureViewmap"	25	xsi:type="gmfgen:FigureViewmap"
26	figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>	26	figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
27	<containsShortcutsTo>uml</containsShortcutsTo>	27	<containsShortcutsTo>uml</containsShortcutsTo>
		28	<shortcutsProvidedFor>uml</shortcutsProvidedFor>
28	<domainDiagramElement	29	<domainDiagramElement
29	href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>	30	href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
30	<childNodes	31	<childNodes

Return to bug 189608

Lines 1303-1313 Link Here

(-)plugin.xml (-4 / +20 lines)
1303	<extension point="org.eclipse.core.expressions.propertyTesters">	1303	<extension point="org.eclipse.core.expressions.propertyTesters">
1304	<?gmfgen generated="true"?>	1304	<?gmfgen generated="true"?>
1305	<propertyTester	1305	<propertyTester
1306	id="org.eclipse.uml2.diagram.clazz.DomainModelElementPropertyTester"	1306	id="org.eclipse.uml2.diagram.clazz.ShortcutPropertyTester"
1307	type="org.eclipse.emf.ecore.EObject"	1307	type="org.eclipse.gmf.runtime.notation.View"
1308	namespace="org.eclipse.uml2.diagram.clazz"	1308	namespace="org.eclipse.uml2.diagram.clazz"
1309	properties="isDomainModelElement"	1309	properties="isShortcut"
1310	class="org.eclipse.uml2.diagram.clazz.part.UMLDomainModelElementTester">	1310	class="org.eclipse.uml2.diagram.clazz.part.UMLShortcutPropertyTester">
1311	</propertyTester>	1311	</propertyTester>
1312	</extension><extension point="org.eclipse.ui.contexts">	1312	</extension><extension point="org.eclipse.ui.contexts">
1313	<?gmfgen generated="true"?>	1313	<?gmfgen generated="true"?>
Lines 1334-1343 Link Here
1334	contextId="org.eclipse.uml2.diagram.clazz.ui.diagramContext"	1334	contextId="org.eclipse.uml2.diagram.clazz.ui.diagramContext"
1335	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"	1335	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
1336	sequence="F5"/>	1336	sequence="F5"/>
		1337	</extension><extension point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
		1338	<?gmfgen generated="true"?>
		1339	<decoratorProvider class="org.eclipse.uml2.diagram.clazz.providers.UMLShortcutsDecoratorProvider">
		1340	<Priority name="Lowest"/>
		1341	</decoratorProvider>
		1342	</extension>
		1343	<extension point="org.eclipse.core.expressions.propertyTesters">
		1344	<?gmfgen generated="true"?>
		1345	<propertyTester
		1346	id="org.eclipse.uml2.diagram.clazz.DomainModelElementPropertyTester"
		1347	type="org.eclipse.emf.ecore.EObject"
		1348	namespace="org.eclipse.uml2.diagram.clazz"
		1349	properties="isDomainModelElement"
		1350	class="org.eclipse.uml2.diagram.clazz.part.UMLDomainModelElementTester">
		1351	</propertyTester>
1337	</extension>	1352	</extension>
1338		1353
1339		1354
1340		1355
1341		1356
1342		1357
		1358
1343	</plugin>	1359	</plugin>

Added Link Here

(-)src/org/eclipse/uml2/diagram/clazz/part/UMLShortcutPropertyTester.java (+35 lines)
1	package org.eclipse.uml2.diagram.clazz.part;
2
3	import org.eclipse.core.expressions.PropertyTester;
4	import org.eclipse.emf.ecore.EAnnotation;
5	import org.eclipse.gmf.runtime.notation.View;
6	import org.eclipse.uml2.diagram.clazz.edit.parts.PackageEditPart;
7
8	/**
9	* @generated
10	*/
11	public class UMLShortcutPropertyTester extends PropertyTester {
12
13	/**
14	* @generated
15	*/
16	protected static final String SHORTCUT_PROPERTY = "isShortcut"; //$NON-NLS-1$
17
18	/**
19	* @generated
20	*/
21	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
22	if (false == receiver instanceof View) {
23	return false;
24	}
25	View view = (View) receiver;
26	if (SHORTCUT_PROPERTY.equals(method)) {
27	EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
28	if (annotation != null) {
29	return PackageEditPart.MODEL_ID.equals(annotation.getDetails().get("modelID")); //$NON-NLS-1$
30	}
31	}
32	return false;
33	}
34
35	}