[jbosstools-commits] JBoss Tools SVN: r19586 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui: wizards/project and 1 other directory.

Author: scabanovich Date: 2009-12-25 09:02:29 -0500 (Fri, 25 Dec 2009) New Revision: 19586 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-5573 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2009-12-25 13:23:26 UTC (rev 19585) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2009-12-25 14:02:29 UTC (rev 19586) @@ -506,8 +506,16 @@ } if(webroot != null) { IFolder f = project.getFolder("WEB-ROOT"); //$NON-NLS-1$ - if(!f.exists()) f.createLink(new Path(webroot), IFolder.FORCE, null); - setProperty(WEB_CONTENT_LOCATION_ID, "/WEB-ROOT"); //$NON-NLS-1$ + if(f.exists()) { + setProperty(WEB_CONTENT_LOCATION_ID, "/WEB-ROOT"); //$NON-NLS-1$ + } else if(project.exists() && webroot.startsWith(project.getLocation().toString().replace('\\', '/') + "/")) { + f = project.getFolder(webroot.substring(project.getLocation().toString().replace('\\', '/').length() + 1)); + } + if(!f.exists()) { + f = project.getFolder("WEB-ROOT"); //$NON-NLS-1$ + f.createLink(new Path(webroot), IFolder.FORCE, null); + setProperty(WEB_CONTENT_LOCATION_ID, "/WEB-ROOT"); //$NON-NLS-1$ + } } if(javaRoot != null && javaRoot.length > 0 && javaRoot[0].length() > 0) { IFolder f = project.getFolder("src"); //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2009-12-25 13:23:26 UTC (rev 19585) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2009-12-25 14:02:29 UTC (rev 19586) @@ -41,10 +41,10 @@ import org.jboss.tools.jst.web.ui.WebUiPlugin; public abstract class ImportWebProjectWizard extends Wizard implements IImportWizard { - public static final String IMPORT_WEB_PROJECT_WIZARD_PROJECT_LOCATION = "IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_LOCATION"; //$NON-NLS-1$ - public static final String IMPORT_WEB_PROJECT_SELECT_WEB_XML = "IMPORT_STRUTS_PROJECT_SELECT_WEB_XML"; //$NON-NLS-1$ - public static final String IMPORT_WEB_PROJECT_WIZARD_PROJECT_FOLDERS = "IMPORT_STRUTS_PROJECT_WIZARD_PROJECT_FOLDERS"; //$NON-NLS-1$ - public static final String IMPORT_WEB_PROJECT_SELECT_PROJECT_FOLDERS = "IMPORT_STRUTS_PROJECT_SELECT_PROJECT_FOLDERS"; //$NON-NLS-1$ + public static final String IMPORT_WEB_PROJECT_WIZARD_PROJECT_LOCATION = "IMPORT_WEB_PROJECT_WIZARD_PROJECT_LOCATION"; //$NON-NLS-1$ + public static final String IMPORT_WEB_PROJECT_SELECT_WEB_XML = "IMPORT_WEB_PROJECT_SELECT_WEB_XML"; //$NON-NLS-1$ + public static final String IMPORT_WEB_PROJECT_WIZARD_PROJECT_FOLDERS = "IMPORT_WEB_PROJECT_WIZARD_PROJECT_FOLDERS"; //$NON-NLS-1$ + public static final String IMPORT_WEB_PROJECT_SELECT_PROJECT_FOLDERS = "IMPORT_WEB_PROJECT_SELECT_PROJECT_FOLDERS"; //$NON-NLS-1$ protected IWorkbench workbench; protected IStructuredSelection selection;