Author: vrubezhny Date: 2007-10-09 13:33:44 -0400 (Tue, 09 Oct 2007) New Revision: 4082 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java Log: http://jira.jboss.org/jira/browse/JBIDE-1016 Duplicate seam folders generated when select path not to workspace No more duplicates. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-10-09 17:33:36 UTC (rev 4081) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-10-09 17:33:44 UTC (rev 4082) @@ -24,6 +24,8 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -529,28 +531,41 @@ createSeamProjectPreferenes(project, model); - try { +// try { EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID); project.refreshLocal(IResource.DEPTH_INFINITE, monitor); String wsPath = project.getLocation().removeLastSegments(1) .toFile().getAbsoluteFile().getPath(); + + IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot(); + if(!isWarConfiguration(model)) { - ResourcesUtils.importProject( - wsPath+"/"+project.getName()+"-ejb", monitor); //$NON-NLS-1$ //$NON-NLS-2$ - ResourcesUtils.importProject( - wsPath+"/"+project.getName()+"-ear", monitor); //$NON-NLS-1$ //$NON-NLS-2$ +// ResourcesUtils.importProject( +// wsPath+"/"+project.getName()+"-ejb", monitor); //$NON-NLS-1$ //$NON-NLS-2$ + + IProject ejbProjectToBeImported = wsRoot.getProject(project.getName()+"-ejb"); + ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath+"/"+project.getName()+"-ejb", project.getName()+"-ejb"); + +// ResourcesUtils.importProject( +// wsPath+"/"+project.getName()+"-ear", monitor); //$NON-NLS-1$ //$NON-NLS-2$ + + IProject earProjectToBeImported = wsRoot.getProject(project.getName()+"-ear"); + ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath+"/"+project.getName()+"-ear", project.getName()+"-ear"); } - ResourcesUtils.importProject( - wsPath+"/"+project.getName()+"-test", monitor); //$NON-NLS-1$ //$NON-NLS-2$ + +// ResourcesUtils.importProject( +// wsPath+"/"+project.getName()+"-test", monitor); //$NON-NLS-1$ //$NON-NLS-2$ - } catch (IOException e) { - SeamCorePlugin.getPluginLog().logError(e); - } catch (InvocationTargetException e) { - SeamCorePlugin.getPluginLog().logError(e); - } catch (InterruptedException e) { - SeamCorePlugin.getPluginLog().logError(e); - } - + IProject testProjectToBeImported = wsRoot.getProject(project.getName()+"-test"); + ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath+"/"+project.getName()+"-test", project.getName()+"-test"); + +// } catch (IOException e) { +// SeamCorePlugin.getPluginLog().logError(e); +// } catch (InvocationTargetException e) { +// SeamCorePlugin.getPluginLog().logError(e); +// } catch (InterruptedException e) { +// SeamCorePlugin.getPluginLog().logError(e); +// } }