[222414] fix NPE's
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
index 10e76f1..7128301 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $$RCSfile: ProjectResourceSetImpl.java,v $$
- * $$Revision: 1.19 $$ $$Date: 2008/03/11 22:27:44 $$
+ * $$Revision: 1.20 $$ $$Date: 2008/03/12 14:21:40 $$
*/
package org.eclipse.jem.internal.util.emf.workbench;
@@ -103,6 +103,7 @@
}
private boolean detectURIMapping(URI uri) {
+ if (uri == null) return false;
return !(((URIConverterImpl.URIMap)getURIConverter().getURIMap()).getURI(uri).equals(uri));
}
/**
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
index 27bb8f1..f526237 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
@@ -10,7 +10,7 @@
*******************************************************************************/
/*
* $$RCSfile: WorkbenchResourceHelperBase.java,v $$
- * $$Revision: 1.5 $$ $$Date: 2006/08/09 15:40:22 $$
+ * $$Revision: 1.6 $$ $$Date: 2008/03/12 14:21:39 $$
*/
package org.eclipse.jem.util.emf.workbench;
@@ -688,6 +688,7 @@
* @since 1.0.0
*/
public static boolean isPlatformPluginResourceURI(URI uri) {
+ if (uri == null) return false;
return JEMUtilPlugin.PLATFORM_PROTOCOL.equals(uri.scheme()) && JEMUtilPlugin.PLATFORM_PLUGIN.equals(uri.segment(0));
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
index 511efc4..6033687 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
@@ -27,7 +27,6 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.util.URI;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
@@ -68,7 +67,7 @@
runtimePath = runtimePath.removeFirstSegments(matchingSegs);
IVirtualFile vFile = rootFolder.getFile(runtimePath);
return URI.createPlatformResourceURI(vFile.getWorkspaceRelativePath().toString());
- } catch (UnresolveableURIException e) {
+ } catch (Exception e) {
}
return aModuleResourceRuntimePath;