445078: [XText editor] NPE when editing an untyped Port via the XText

editor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=445078

1 files changed, 3 insertions, 15 deletions

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
index 719f3f7a827..a132acb2e20 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/adapters/PortTypeAdapter.java
@@ -97,9 +97,6 @@ public class PortTypeAdapter extends AdapterImpl {
 				break;
 			}
 		}
-
-
-
 	}
 
 	/**
@@ -110,9 +107,11 @@ public class PortTypeAdapter extends AdapterImpl {
 	 *
 	 */
 	private void detachAdapter(Type type) {
+		if (type == null) {
+			return;
+		}
 		EObject source = determineSource(type);
 		source.eAdapters().remove(adapter);
-
 	}
 
 	/**
@@ -123,7 +122,6 @@ public class PortTypeAdapter extends AdapterImpl {
 	 */
 	private void attachAdapter(Type oldType, Type newType) {
 
-
 		EObject newSource = determineSource(newType);
 		if (newSource != null) {
 
@@ -136,7 +134,6 @@ public class PortTypeAdapter extends AdapterImpl {
 				}
 			}
 
-
 			// Attach adapter for new type
 			if (adapter == null || !newSource.eAdapters().contains(adapter)) {
 
@@ -150,17 +147,10 @@ public class PortTypeAdapter extends AdapterImpl {
 						} else if (Notification.REMOVE == notification.getEventType()) {
 							port.eNotify(new ENotificationImpl((InternalEObject) port, notification.getEventType(), derivedFeature, notification.getOldValue(), notification.getNewValue()));
 						}
-
 					};
-
 				};
-
 			}
 		}
-
-
-
-
 	}
 
 	/**
@@ -200,7 +190,5 @@ public class PortTypeAdapter extends AdapterImpl {
 
 		// Notify observers
 		port.eNotify(new ENotificationImpl((InternalEObject) port, Notification.SET, derivedFeature, null, port.eGet(derivedFeature), true));
-
-
 	}
 }