[94609] removed component type and reaction to facets: committed for JL

5 files changed, 51 insertions, 62 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
index 363980685..8cd7d3b8e 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
@@ -25,6 +25,7 @@ import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
 import org.eclipse.jst.j2ee.internal.J2EEConstants;
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.common.XMLResource;
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentLoadStrategyImpl;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
 import org.eclipse.jst.j2ee.webapplication.WebAppResource;
@@ -73,13 +74,6 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 	public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
 	public static final String META_INF = "META-INF"; //$NON-NLS-1$
 	
-	/**
-	 * <p>
-	 * Identifier used to group and query common artifact edits.
-	 * </p>
-	 */
-	public static String TYPE_ID = "jst.web"; //$NON-NLS-1$
-	
 	public static IPath WEBLIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
 
 	/**
@@ -98,7 +92,15 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 	 */
 	public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
 		super(aProject, toAccessAsReadOnly);
-		// TODO Auto-generated constructor stub
+	}
+	
+	/**
+	 * @param aHandle
+	 * @param toAccessAsReadOnly
+	 * @throws IllegalArgumentException
+	 */
+	protected WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
+		super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.DYNAMIC_WEB);
 	}
 
 
@@ -246,10 +248,7 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 	public static boolean isValidWebModule(IVirtualComponent aModule) throws UnresolveableURIException {
 		if (!isValidEditableModule(aModule))
 			return false;
-		/* and match the JST_WEB_MODULE type */
-		if (!TYPE_ID.equals(aModule.getComponentTypeId()))
-			return false;
-		return true;
+		return J2EEProjectUtilities.isDynamicWebProject(aModule.getProject());
 	}
 
 	/**
@@ -276,7 +275,7 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 	 *            A non-null {@see WorkbenchComponent}pointing to a module from the given
 	 *            {@see ModuleCoreNature}
 	 */
-	public WebArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
+	protected WebArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
 		super(aNature, aModule, toAccessAsReadOnly);
 	}
 
@@ -600,4 +599,14 @@ public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifact
 		String uri = ModuleURIUtil.getHandleString(getComponent());
 		return CommonarchiveFactory.eINSTANCE.openWARFile(loader, uri);
 	}
+	
+	public static void createDeploymentDescriptor(IProject project, int version) {
+		WebArtifactEdit webEdit = new WebArtifactEdit(project,false,true);
+		try {
+			webEdit.createModelRoot(version);
+			webEdit.save(null);
+		} finally {
+			webEdit.dispose();
+		} 
+	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
index 4bd005d22..d1ee450c6 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.jst.j2ee.web.project.facet;
 
 import java.util.Set;
 
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
 import org.eclipse.jst.j2ee.project.facet.FacetInstallDataModelProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
 
@@ -34,7 +35,7 @@ public class WebFacetInstallDataModelProvider extends FacetInstallDataModelProvi
 		} else if(propertyName.equals(CONTEXT_ROOT)){
 			return getProperty(FACET_PROJECT_NAME);
 		} else if(propertyName.equals(FACET_ID)){
-			return "web";
+			return J2EEProjectUtilities.DYNAMIC_WEB;
 		}
 		return super.getDefaultProperty(propertyName);
 	}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
index a99ce0a57..845dd0086 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
@@ -188,18 +188,7 @@ public final class WebFacetInstallDelegate
             // Create the deployment descriptor (web.xml) if one doesn't exist
             if (!webinfFolder.getFile("web.xml").exists())
             {                
-                final WebArtifactEdit webEdit 
-                    = WebArtifactEdit.getWebArtifactEditForWrite( project );
-    
-                try 
-                {
-                    webEdit.createModelRoot( 24 );
-                    webEdit.save( null );
-                }
-                finally
-                {
-                    webEdit.dispose();
-                }
+               WebArtifactEdit.createDeploymentDescriptor(project,24);
             }
             
             // Setup the classpath. 
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallOperation.java
index 87853b3e6..264a9c1a5 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallOperation.java
@@ -39,6 +39,7 @@ import org.eclipse.wst.common.componentcore.internal.ComponentType;
 import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 import org.eclipse.wst.common.componentcore.internal.Property;
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
@@ -103,7 +104,7 @@ public class WebFacetInstallOperation extends AbstractDataModelOperation impleme
 
 			final ComponentType ctype = ComponentcoreFactory.eINSTANCE.createComponentType();
 
-			ctype.setComponentTypeId("jst.web");
+			ctype.setComponentTypeId(IModuleConstants.JST_WEB_MODULE);
 			ctype.setVersion(fv.getVersionString());
 
 			Property prop;
@@ -144,17 +145,9 @@ public class WebFacetInstallOperation extends AbstractDataModelOperation impleme
 
 			// Create the deployment descriptor (web.xml) if one doesn't exist
 			if (!webinfFolder.getFile("web.xml").exists()) {
-				final WebArtifactEdit webEdit = WebArtifactEdit.getWebArtifactEditForWrite(project);
-
+				WebArtifactEdit.createDeploymentDescriptor(project,24);
 	    		String ver = model.getStringProperty(IFacetDataModelPropeties.FACET_VERSION_STR);
 	    		int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-	    		
-				try {
-					webEdit.createModelRoot(nVer);
-					webEdit.save(null);
-				} finally {
-					webEdit.dispose();
-				}
 			}
 
 			// Setup the classpath.
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
index 3228b0c27..7efefafc8 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
@@ -15,9 +15,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ComponentType;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.project.facet.core.IDelegate;
 import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -72,29 +69,29 @@ public final class WebFacetVersionChangeDelegate
             
             final IVirtualComponent c = ComponentCore.createComponent(project);
             
-            final StructureEdit edit 
-                = StructureEdit.getStructureEditForWrite( project );
-            
-            try
-            {
-                final ComponentType oldctype 
-                    = StructureEdit.getComponentType( c );
-                
-                final ComponentType newctype 
-                    = ComponentcoreFactory.eINSTANCE.createComponentType();
-                
-                newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-                newctype.setVersion( fv.getVersionString() );
-                newctype.getProperties().addAll( oldctype.getProperties() );
-                
-                StructureEdit.setComponentType( c, newctype );
-                
-                edit.saveIfNecessary( null );
-            }
-            finally
-            {
-                edit.dispose();
-            }
+//            final StructureEdit edit 
+//                = StructureEdit.getStructureEditForWrite( project );
+//            
+//            try
+//            {
+//                final ComponentType oldctype 
+//                    = StructureEdit.getComponentType( c );
+//                
+//                final ComponentType newctype 
+//                    = ComponentcoreFactory.eINSTANCE.createComponentType();
+//                
+//                newctype.setComponentTypeId( oldctype.getComponentTypeId() );
+//                newctype.setVersion( fv.getVersionString() );
+//                newctype.getProperties().addAll( oldctype.getProperties() );
+//                
+//                StructureEdit.setComponentType( c, newctype );
+//                
+//                edit.saveIfNecessary( null );
+//            }
+//            finally
+//            {
+//                edit.dispose();
+//            }
             
             if( monitor != null )
             {