X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index a131065..fd46139 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -71,6 +71,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 
@@ -1190,7 +1191,8 @@ public class JavaModelManager implements ISaveParticipant {
 				}
 				// wrap callbacks with Safe runnable for subsequent listeners to
 				// be called when some are causing grief
-				Platform.run(new ISafeRunnable() {
+				
+				SafeRunner.run(new ISafeRunnable() {
 					public void handleException(Throwable exception) {
 						Util
 								.log(exception,
@@ -1283,8 +1285,8 @@ public class JavaModelManager implements ISaveParticipant {
 		if (returnProject) {
 			return proj;
 		}
-		int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT,
-				projectEnd + 1);
+//		int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT,
+//				projectEnd + 1);
 		// TODO temp-del
 		// if (rootEnd == -1) {
 		// return model.getHandleFromMementoForRoot(memento, proj, projectEnd,