Index: DiagramModelingAssistantProvider.java
===================================================================
RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramModelingAssistantProvider.java,v
retrieving revision 1.2
diff -u -r1.2 DiagramModelingAssistantProvider.java
--- DiagramModelingAssistantProvider.java	12 Sep 2005 21:26:25 -0000	1.2
+++ DiagramModelingAssistantProvider.java	3 Oct 2005 21:16:55 -0000
@@ -15,17 +15,17 @@
 import java.util.List;
 
 import org.eclipse.core.runtime.IAdaptable;
-
 import org.eclipse.gmf.runtime.common.core.service.IOperation;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.INoteableEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.internal.util.PresentationNotationType;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnSourceAndTargetOperation;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnSourceOperation;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetRelTypesOnTargetOperation;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetTypesForSourceOperation;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.GetTypesForTargetOperation;
 import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 
 /**
  * Provides modeling assistant functionality for diagram shapes (i.e. connector
@@ -91,7 +91,13 @@
 	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnSource(org.eclipse.core.runtime.IAdaptable)
 	 */
 	public List getRelTypesOnSource(IAdaptable source) {
-		return getConnectorTypes();
+		if (source!=null) {
+			INoteableEditPart noteable = (INoteableEditPart)source.getAdapter(INoteableEditPart.class);
+			if ( noteable!=null && noteable.canAttachNote()) {
+				return getConnectorTypes();
+			}
+		}
+		return Collections.EMPTY_LIST;
 	}
 
 	/*
@@ -100,7 +106,13 @@
 	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnTarget(org.eclipse.core.runtime.IAdaptable)
 	 */
 	public List getRelTypesOnTarget(IAdaptable target) {
-		return getConnectorTypes();
+		if (target!=null) {
+			INoteableEditPart noteable = (INoteableEditPart)target.getAdapter(INoteableEditPart.class);
+			if ( noteable!=null && noteable.canAttachNote()) {
+				return getConnectorTypes();
+			}
+		}
+		return Collections.EMPTY_LIST;
 	}
 
 	/*