| commit | b289037507cc903428d94504a103bb9f6cb97681 | [log] [tgz] |
|---|---|---|
| author | cbridgha <cbridgha> | Mon Jan 28 00:48:20 2008 +0000 |
| committer | cbridgha <cbridgha> | Mon Jan 28 00:48:20 2008 +0000 |
| tree | 7590b2b8bbb6ade947e662544c0e760dd1b69446 | |
| parent | 6b21806a979fb16e9d923077f16114c32a78f0ba [diff] |
[216439] fixup compile errors
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 3e58e6f..82de16e 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.13 $$ $$Date: 2007/10/17 22:37:18 $$ + * $$Revision: 1.14 $$ $$Date: 2008/01/28 00:48:20 $$ */ package org.eclipse.jem.internal.util.emf.workbench; @@ -369,6 +369,8 @@ { demandLoadHelper(resource); } + if (getContentTypeName(resource) != null && (!getContentTypeName(resource).equals(getContentTypeName(uri)))) + continue; if (map != null && (map.get(uri) == null)) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java index 9e21ff7..ce24d69 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
@@ -205,9 +205,11 @@ List metaResources = new ArrayList(); try { moduleCore = StructureEdit.getStructureEditForRead(getProject()); - WorkbenchComponent component = moduleCore.getComponent(); - if (component != null) - metaResources.addAll(component.getMetadataResources()); + if (moduleCore != null) { + WorkbenchComponent component = moduleCore.getComponent(); + if (component != null) + metaResources.addAll(component.getMetadataResources()); + } } finally { if (moduleCore != null) { moduleCore.dispose();