Author: scabanovich Date: 2007-08-02 07:17:42 -0400 (Thu, 02 Aug 2007) New Revision: 2843 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java Log: Reference to obsolete class XModelClassLoader removed Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2007-08-02 11:17:22 UTC (rev 2842) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2007-08-02 11:17:42 UTC (rev 2843) @@ -30,7 +30,6 @@ import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl; -import org.jboss.tools.common.model.impl.XModelClassLoader; import org.jboss.tools.common.model.impl.XModelImpl; import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; @@ -62,10 +61,10 @@ fss.setAttributeValue("application name", p.getProperty("name")); File webInfDir = ((IResource)webinf.getAdapter(IResource.class)).getLocation().toFile(); - Map modules = getModules(location); - Iterator it = modules.entrySet().iterator(); + Map<String,String> modules = getModules(location); + Iterator<Map.Entry<String,String>> it = modules.entrySet().iterator(); while (it.hasNext()) { - Map.Entry entry = (Map.Entry)it.next(); + Map.Entry<String,String> entry = it.next(); String module = (String)entry.getKey(); String config = (String)entry.getValue(); String fileName = config.substring(config.indexOf('/', 1) + 1); @@ -106,8 +105,6 @@ model.save(); model.update(); - XModelClassLoader cl = (XModelClassLoader)model.getModelClassLoader(); - cl.validate(); updateOverlapped(model); registerTLDs(model, p); Watcher.getInstance(model).forceUpdate(); @@ -153,7 +150,7 @@ if(fs != null) fs.updateOverlapped(); } - public static Map getModules(String location) { + public static Map<String,String> getModules(String location) { Map<String,String> modules = new HashMap<String,String>(); File webXML = new File(location, "web.xml"); if(!webXML.isFile()) return modules; @@ -206,7 +203,7 @@ static { try { - Class c = WebAppConfig.class; + Class<?> c = WebAppConfig.class; XMLEntityResolver.registerPublicEntity("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", FileLocator.resolve(c.getResource("/meta/web-app_2_2.dtd")).toString()); XMLEntityResolver.registerPublicEntity("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", FileLocator.resolve(c.getResource("/meta/web-app_2_3.dtd")).toString()); } catch (Exception e) {