Author: scabanovich Date: 2008-02-27 07:06:29 -0500 (Wed, 27 Feb 2008) New Revision: 6598 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java Log: JBIDE-1714 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java 2008-02-27 12:06:22 UTC (rev 6597) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectAdoptOperation.java 2008-02-27 12:06:29 UTC (rev 6598) @@ -12,8 +12,12 @@ import java.io.File; +import org.jboss.tools.common.model.XModelConstants; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jsf.JSFPreference; +import org.jboss.tools.jsf.project.JSFAutoLoad; import org.jboss.tools.jsf.project.JSFNature; import org.jboss.tools.jsf.web.JSFTemplate; import org.jboss.tools.jsf.web.helpers.context.AdoptJSFProjectFinisher; @@ -49,6 +53,21 @@ } } + protected void postCreateWebNature() { + File f = getEclipseFile(); + if(f != null) { + f.delete(); + } + model.getProperties().put(XModelConstants.AUTOLOAD, new JSFAutoLoad()); + } + + private File getEclipseFile() { + String fn = getProject().getLocation().toString() + "/" + IModelNature.PROJECT_FILE; + File f = new File(fn); + if(f.exists()) return f; + return null; + } + protected String getNatureID() { return JSFNature.NATURE_ID; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java 2008-02-27 12:06:22 UTC (rev 6597) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/operation/JSFProjectCreationOperation.java 2008-02-27 12:06:29 UTC (rev 6598) @@ -21,10 +21,12 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.common.model.XModelConstants; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.jsf.project.JSFAutoLoad; import org.jboss.tools.jsf.project.JSFNature; import org.jboss.tools.jsf.web.JSFTemplate; import org.jboss.tools.jst.web.WebUtils; @@ -63,9 +65,7 @@ protected void copyTemplate() throws Exception { String location = getProject().getLocation().toString(); String location2 = location; - if(isMultipleModulesProject()) { - location2 += "/" + getProject().getName(); - } + String templateLocation = getTemplateLocation(); String version = getProperty(TEMPLATE_VERSION_ID); @@ -117,4 +117,13 @@ if(f.exists()) return f; return null; } + + protected void postCreateWebNature() { + if(projectFile != null) { + if(projectFile.isFile()) projectFile.delete(); + projectFile = null; + } + model.getProperties().put(XModelConstants.AUTOLOAD, new JSFAutoLoad()); + } + }