fixes for flexible project structure: committed for JL
diff --git a/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java index 20395de..b353179 100644 --- a/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java +++ b/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java
@@ -36,14 +36,18 @@ public void verifyProjectCreationDataModel(J2EEModuleCreationDataModel model) { WebModuleCreationDataModel dataModel = (WebModuleCreationDataModel) model; ProjectUtility.verifyProject(dataModel.getTargetProject().getName(), true); - WebEditModel editModel = null; Object key = new Object(); + WebArtifactEdit webEdit = null; try { - Object dd = getWebApplication(dataModel.getTargetProject()); - Assert.assertNotNull("Deployment Descriptor Null", dd); + Object dd = null; + webEdit = (WebArtifactEdit) ModuleCore.getFirstArtifactEditForRead(dataModel.getTargetProject()); + if(webEdit != null) + dd = (WebApp) webEdit.getDeploymentDescriptorRoot(); + Assert.assertNotNull("Deployment Descriptor Null", dd); } finally { - editModel.releaseAccess(key); - } + if( webEdit != null ) + webEdit.dispose(); + } if (dataModel.getBooleanProperty(WebModuleCreationDataModel.ADD_TO_EAR)) { IProject earProject = dataModel.getApplicationCreationDataModel().getTargetProject(); EAREditModel ear = null; @@ -60,19 +64,4 @@ } } - - protected WebApp getWebApplication(IProject project) { - WebArtifactEdit webEdit = null; - try{ - webEdit = (WebArtifactEdit) ModuleCore.getFirstArtifactEditForRead( project); - if(webEdit != null) { - return (WebApp) webEdit.getDeploymentDescriptorRoot(); - } - } finally{ - if( webEdit != null ) - webEdit.dispose(); - } - return null; - } - }