From 858f7f4173d53b29d493e9e391eb99eb15fb6deb Mon Sep 17 00:00:00 2001
From: kthoms
Date: Fri, 27 Feb 2009 11:11:44 +0000
Subject: getPrimitive(): avoiding NPE when argument is null

---
 .../xtend/typesystem/uml2/UML2MetaModelBase.java   | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/org.eclipse.xtend.typesystem.uml2/src/org/eclipse/xtend/typesystem/uml2/UML2MetaModelBase.java b/plugins/org.eclipse.xtend.typesystem.uml2/src/org/eclipse/xtend/typesystem/uml2/UML2MetaModelBase.java
index 607e662e..e8ececa7 100644
--- a/plugins/org.eclipse.xtend.typesystem.uml2/src/org/eclipse/xtend/typesystem/uml2/UML2MetaModelBase.java
+++ b/plugins/org.eclipse.xtend.typesystem.uml2/src/org/eclipse/xtend/typesystem/uml2/UML2MetaModelBase.java
@@ -78,19 +78,20 @@ public abstract class UML2MetaModelBase extends EmfMetaModel {
         return result;
     }
 
-    private Type getPrimitive(String typeName) {
-        if (typeName.equalsIgnoreCase(UML2_STRING) || typeName.equalsIgnoreCase(UML2_STRING1)) {
-            return getTypeSystem().getStringType();
-        } else if (typeName.equalsIgnoreCase(UML2_BOOLEAN) || typeName.equalsIgnoreCase(UML2_BOOLEAN1)) {
-            return getTypeSystem().getBooleanType();
-        } else if (typeName.equalsIgnoreCase(UML2_INTEGER) || typeName.equalsIgnoreCase(UML2_UNLIMITED_NATURAL)
-                || typeName.equalsIgnoreCase(UML2_INTEGER1) || typeName.equalsIgnoreCase(UML2_UNLIMITED_NATURAL1)) {
-            return getTypeSystem().getIntegerType();
-        } else if (typeName.equalsIgnoreCase(UML2_REAL) || typeName.equalsIgnoreCase(UML2_REAL1)) {
-            return getTypeSystem().getRealType();
-        }
-        return null;
-    }
+	private Type getPrimitive(String typeName) {
+		if (UML2_STRING.equalsIgnoreCase(typeName) || UML2_STRING1.equalsIgnoreCase(typeName)) {
+			return getTypeSystem().getStringType();
+		} else if (UML2_BOOLEAN.equalsIgnoreCase(typeName) || UML2_BOOLEAN1.equalsIgnoreCase(typeName)) {
+			return getTypeSystem().getBooleanType();
+		} else if (UML2_INTEGER.equalsIgnoreCase(typeName) || UML2_UNLIMITED_NATURAL.equalsIgnoreCase(typeName)
+				|| UML2_INTEGER1.equalsIgnoreCase(typeName) || UML2_UNLIMITED_NATURAL1.equalsIgnoreCase(typeName)) {
+			return getTypeSystem().getIntegerType();
+		} else if (UML2_REAL.equalsIgnoreCase(typeName) || UML2_REAL1.equalsIgnoreCase(typeName)) {
+			return getTypeSystem().getRealType();
+		} else {
+			return null;
+		}
+	}
 
 	@Override
 	public void setTypeSystem(TypeSystem typeSystem) {
-- 
cgit v1.2.3