| commit | 1a659c0a8c801758ae5c6026621491f994b30011 | [log] [tgz] |
|---|---|---|
| author | jlanuti <jlanuti> | Fri Jul 28 18:34:14 2006 +0000 |
| committer | jlanuti <jlanuti> | Fri Jul 28 18:34:14 2006 +0000 |
| tree | e0fe19d7921f4b699379f78bca4cec3a52e61fef | |
| parent | 94486ab6018f1c324b98df87772d4c48ccc78326 [diff] |
[152139] fixed NPE's
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java index 803d4f9..aca9e0c 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
@@ -455,10 +455,11 @@ * @return The root object of the underlying model */ public EObject getContentModelRoot() { - if(isBinary()){ + if(isBinary()) return binaryComponentHelper.getPrimaryRootObject(); - } - return artifactEditModel.getPrimaryRootObject(); + if (artifactEditModel!=null) + return artifactEditModel.getPrimaryRootObject(); + return null; } /** @@ -489,7 +490,7 @@ */ public void removeListener(EditModelListener listener) { if(isBinary()){ - } else { + } else if (artifactEditModel!=null) { artifactEditModel.removeListener(listener); } }