Remove deprecated usages of generateUniqueLaunchConfigurationNameFrom

method.

2 files changed, 16 insertions, 12 deletions

diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java
index b54f3b3026..04827b0df3 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java
@@ -127,7 +127,7 @@ public class LaunchWizard extends SystemTapLaunchShortcut {
 				Messages.getString("LaunchWizard.Text1") +  //$NON-NLS-1$
 				Messages.getString("LaunchWizard.Text2") +  //$NON-NLS-1$
 				Messages.getString("LaunchWizard.Text3"),   //$NON-NLS-1$
-				getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
+				getLaunchManager().generateLaunchConfigurationName(
 						Messages.getString("LaunchWizard.NamePrefix")), null);  //$NON-NLS-1$
 		id.open();
 		
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
index b8a124478a..ec8c7b00cc 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
@@ -372,9 +372,8 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
 						.newInstance(
 								null,
 								getLaunchManager()
-										.generateUniqueLaunchConfigurationNameFrom(
-												Messages
-														.getString("SystemTapLaunchShortcut.Invalid"))); //$NON-NLS-1$
+										.generateLaunchConfigurationName(
+												Messages.getString("SystemTapLaunchShortcut.Invalid"))); //$NON-NLS-1$
 			} catch (CoreException e) {
 				e.printStackTrace();
 			}
@@ -392,8 +391,8 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
 		ILaunchConfigurationWorkingCopy wc = null;
 		try {
 			ILaunchConfigurationType configType = getLaunchConfigType();
-			wc = configType.newInstance(null,getLaunchManager()
-							.generateUniqueLaunchConfigurationNameFrom(name));
+			wc = configType.newInstance(null, getLaunchManager()
+					.generateLaunchConfigurationName(name));
 
 			setDefaultProfileAttributes(wc);
 
@@ -421,8 +420,10 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
 			try {
 				String projectName = bin.getResource().getProjectRelativePath().toString();
 				ILaunchConfigurationType configType = getLaunchConfigType();
-				wc = configType.newInstance(null,getLaunchManager()
-						.generateUniqueLaunchConfigurationNameFrom(name + " - " + bin.getElementName())); //$NON-NLS-1$
+				wc = configType.newInstance(
+						null,
+						getLaunchManager().generateLaunchConfigurationName(
+								name + " - " + bin.getElementName())); //$NON-NLS-1$
 
 				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME,projectName);
 				wc.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, bin.getCProject().getElementName());
@@ -437,8 +438,10 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
 		} else {
 
 			try {
-				wc = getLaunchConfigType().newInstance(null,
-								getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name)); //$NON-NLS-1$
+				wc = getLaunchConfigType().newInstance(
+						null,
+						getLaunchManager()
+								.generateLaunchConfigurationName(name)); //$NON-NLS-1$
 				setDefaultProfileAttributes(wc);
 			} catch (CoreException e) {
 				e.printStackTrace();
@@ -725,8 +728,9 @@ public abstract class SystemTapLaunchShortcut extends ProfileLaunchShortcut {
 	 */
 	public ILaunchConfiguration getNewConfiguration() throws CoreException {
 		ILaunchConfigurationType configType = getLaunchConfigType();
-		ILaunchConfigurationWorkingCopy wc = configType.newInstance(null,
-				getLaunchManager().generateUniqueLaunchConfigurationNameFrom(
+		ILaunchConfigurationWorkingCopy wc = configType.newInstance(
+				null,
+				getLaunchManager().generateLaunchConfigurationName(
 						"TestingConfiguration")); //$NON-NLS-1$
 
 		return wc.doSave();