[131583] Removing facet check
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 33d6efd..1e3f542 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
@@ -25,10 +25,8 @@ import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler; -import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelRegistry; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener; -import org.eclipse.wst.common.internal.emfworkbench.integration.IEditModelFactory; /** * Provides a Facade pattern for accessing Module Content Metamodels for Web Tools Platform flexible @@ -212,10 +210,7 @@ IProject project = aModule.getProject(); if (project == null || !project.isAccessible()) return false; - /* and an edit model factory must be defined for the module type */ - IEditModelFactory factory = EditModelRegistry.getInstance().findEditModelFactoryByProject(aModule.getProject()); - if (factory == null) - return false; + return true; }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java index 8a1ebf4..a37da71 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java
@@ -26,7 +26,6 @@ import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelRegistry; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; /** @@ -66,12 +65,9 @@ String[] editModelIDs = EditModelRegistry.getInstance().getRegisteredEditModelIDs(); for (int i=0; i<editModelIDs.length; i++) { try { - IProjectFacet facet = ProjectFacetsManager.getProjectFacet(editModelIDs[i]); - if (facet != null && facetedProject.hasProjectFacet(facet)) { - EditModel editModel = nature.getExistingEditModel(editModelIDs[i],params,edit.isReadOnly()); - if (editModel !=null) - return editModel; - } + EditModel editModel = nature.getExistingEditModel(editModelIDs[i],params,edit.isReadOnly()); + if (editModel !=null) + return editModel; } catch (Exception e) { continue; }