1 files changed, 11 insertions, 9 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
index 4f9281f8222..eabfb7a9e43 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2013 CEA LIST.
  *
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -101,7 +101,7 @@ public class NavigatorUtils {
 		public RootsIterator(Iterator<Resource> resources) {
 			this.resources = resources;
 			if(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 			}
 		}
 
@@ -115,7 +115,7 @@ public class NavigatorUtils {
 			}
 
 			while(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 				if(inner.hasNext()) {
 					return true;
 				}
@@ -135,7 +135,7 @@ public class NavigatorUtils {
 			}
 
 			while(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 				if(inner.hasNext()) {
 					return inner.next();
 				}
@@ -188,10 +188,12 @@ public class NavigatorUtils {
 		if(element.eResource() == null) {
 			return null;
 		}
+		if(element.eResource().getResourceSet() == null) {
+			return null;
+		}
 		return new ResourcesIterator(element.eResource().getResourceSet(), fileExtension);
 	}
 
-
 	/**
 	 * Represents an iterator over the notation resources of a ResourceSet
 	 * 
@@ -385,10 +387,10 @@ public class NavigatorUtils {
 	//
 	//	/**
 	//	 * Gets the object name or empty string.
-	//	 * 
+	//	 *
 	//	 * @param object
 	//	 *            the object
-	//	 * 
+	//	 *
 	//	 * @return the object name or empty string
 	//	 */
 	//	// @unused
@@ -402,10 +404,10 @@ public class NavigatorUtils {
 	//
 	//	/**
 	//	 * Gets the object name.
-	//	 * 
+	//	 *
 	//	 * @param object
 	//	 *            the object
-	//	 * 
+	//	 *
 	//	 * @return the object name
 	//	 */
 	//	// @unused