fixed potential NPEs

2 files changed, 14 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java
index beccf84ab..2f48bde86 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java
@@ -85,7 +85,11 @@ public class ViewImpl extends ContainerImpl implements View {
 	 * @generated NOT
 	 */
 	public String getQualifiedIdentifier() {
-		StringBuilder result = new StringBuilder(name);
+		StringBuilder result;
+		if (name != null)
+			result = new StringBuilder(name);
+		else
+			result = new StringBuilder();
 		result.append(NamingHelper.nameDiscriminator(this));
 		EObject container = this.eContainer();
 		while (container != null) {
diff --git a/plugins/org.eclipse.emf.eef.views/src/org/eclispe/emf/eef/views/helpers/NamingHelper.java b/plugins/org.eclipse.emf.eef.views/src/org/eclispe/emf/eef/views/helpers/NamingHelper.java
index e35b19f04..7e7a560fd 100644
--- a/plugins/org.eclipse.emf.eef.views/src/org/eclispe/emf/eef/views/helpers/NamingHelper.java
+++ b/plugins/org.eclipse.emf.eef.views/src/org/eclispe/emf/eef/views/helpers/NamingHelper.java
@@ -16,11 +16,9 @@ import org.eclipse.emf.eef.views.ViewsRepository;
 
 /**
  * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
- *
  */
 public class NamingHelper {
 
-	
 	/**
 	 * @param element
 	 * @return
@@ -30,14 +28,14 @@ public class NamingHelper {
 		StringBuffer buffer = new StringBuffer();
 		EObject container = element.eContainer();
 		while (container instanceof ViewElement) {
-			if (equalsIngnoreWhiteSpacesAndCase(((ViewElement)container).getName(),baseName)) {
+			if (equalsIngnoreWhiteSpacesAndCase(((ViewElement)container).getName(), baseName)) {
 				buffer.append('_');
 			}
 			container = container.eContainer();
 		}
 		ViewsRepository repository = repository(container);
 		if (repository != null) {
-			if (equalsIngnoreWhiteSpacesAndCase(repository.getName(),baseName)) {
+			if (equalsIngnoreWhiteSpacesAndCase(repository.getName(), baseName)) {
 				buffer.append('_');
 			}
 		}
@@ -47,16 +45,18 @@ public class NamingHelper {
 	private static boolean equalsIngnoreWhiteSpacesAndCase(String name1, String name2) {
 		return removeWhiteSpaces(name1).equalsIgnoreCase(removeWhiteSpaces(name2));
 	}
-	
+
 	private static String removeWhiteSpaces(String name) {
-		return name.replaceAll("\\s", "").trim();
+		if (name != null)
+			return name.replaceAll("\\s", "").trim();
+		return "";
 	}
-	
+
 	private static ViewsRepository repository(EObject obj) {
-		EObject container  = obj.eContainer();
+		EObject container = obj.eContainer();
 		while (container != null) {
 			if (container instanceof ViewsRepository) {
-				return (ViewsRepository) container;
+				return (ViewsRepository)container;
 			}
 			container = container.eContainer();
 		}