Author: dgeraskov
Date: 2010-01-21 08:28:36 -0500 (Thu, 21 Jan 2010)
New Revision: 19840
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5575
Generate unique name for newly created launch configuration.
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-21
13:11:11 UTC (rev 19839)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-21
13:28:36 UTC (rev 19840)
@@ -499,7 +499,7 @@
if (hibernateConsoleLaunchFile != null) {
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
- new File(project.getLocation().toFile(), project.getName() + ".launch"),
//$NON-NLS-1$
+ new File(project.getLocation().toFile(), getLaunchCfgName(project.getName()) +
".launch"), //$NON-NLS-1$
viewFilterSetCollection, false);
}
@@ -515,6 +515,11 @@
WtpUtils.createSourceFolder(project, source.getFullPath().removeFirstSegments(1),
source.getFullPath().removeFirstSegments(1),
webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev"));
//$NON-NLS-1$
}
}
+
+ protected String getLaunchCfgName(String baseName){
+ ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
+ return lm.generateUniqueLaunchConfigurationNameFrom(baseName);
+ }
protected File earContentsFolder;
protected File earLibFolder;
@@ -685,9 +690,10 @@
}
}
- AntCopyUtils.copyFileToFile(hibernateConsoleLaunchFile, new File(
- ejbProjectFolder, ejbProjectFolder.getName() + ".launch"), //$NON-NLS-1$
- new FilterSetCollection(ejbFilterSet), false);
+ AntCopyUtils.copyFileToFile(
+ hibernateConsoleLaunchFile,
+ new File(ejbProjectFolder, getLaunchCfgName(ejbProjectFolder.getName()) +
".launch"), //$NON-NLS-1$
+ new FilterSetCollection(ejbFilterSet), false);
AntCopyUtils.copyFileToFolder(hibernateConsolePropsFile,
ejbProjectFolder, hibernateDialectFilterSet, false);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-21
13:11:11 UTC (rev 19839)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-21
13:28:36 UTC (rev 19840)
@@ -29,6 +29,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -438,9 +441,10 @@
ejbFilterSet.addFilter("projectName", ejbProjectFolder.getName());
//$NON-NLS-1$
ejbFilterSet.addFilter("connectionProfile",
model.getStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE));//$NON-NLS-1$
+
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
- new File(ejbProjectFolder, ejbProjectFolder.getName() + ".launch"),
//$NON-NLS-1$
+ new File(ejbProjectFolder, getLaunchCfgName(ejbProjectFolder.getName()) +
".launch"), //$NON-NLS-1$
new FilterSetCollection(ejbFilterSet), true);
AntCopyUtils.copyFileToFolder(
@@ -448,6 +452,11 @@
ejbProjectFolder,
hibernateDialectFilterSet, true);
}
+
+ protected String getLaunchCfgName(String baseName){
+ ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
+ return lm.generateUniqueLaunchConfigurationNameFrom(baseName);
+ }
protected void createEarProject() {
model.setProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, earProjectName);