Attachment 75027 Details for Bug 170213 – changes limited to pde.iu

[patch] changes limited to pde.iu

patch_pde_170213.txt (text/plain), 3.09 KB, created by bartosz michalik

on 2007-07-31 08:35:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: bartosz michalik

Created: 2007-07-31 08:35:35 EDT

Size: 3.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java,v
>retrieving revision 1.28
>diff -u -r1.28 LaunchConfigurationHelper.java
>--- src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java	29 Apr 2007 02:43:35 -0000	1.28
>+++ src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java	31 Jul 2007 12:32:29 -0000
>@@ -66,7 +66,10 @@
> 	}
> 	
> 	public static File getConfigurationLocation(ILaunchConfiguration config) {
>-		File dir = new File(PDECore.getDefault().getStateLocation().toOSString(), config.getName());
>+		//bug 170213 change config location if config name contains #
>+		String configName = config.getName();
>+		configName = configName.replace('#', 'h');
>+		File dir = new File(PDECore.getDefault().getStateLocation().toOSString(), configName);
> 		try {
> 			if (!config.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true)) {
> 				String userPath = config.getAttribute(IPDELauncherConstants.CONFIG_LOCATION, (String)null);
>Index: src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java,v
>retrieving revision 1.5
>diff -u -r1.5 LaunchConfigurationListener.java
>--- src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java	8 Jun 2007 16:45:07 -0000	1.5
>+++ src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java	31 Jul 2007 12:32:29 -0000
>@@ -15,7 +15,6 @@
> import org.eclipse.debug.core.DebugPlugin;
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.core.ILaunchConfigurationListener;
>-import org.eclipse.pde.internal.core.PDECore;
> import org.eclipse.pde.internal.core.util.CoreUtility;
> 
> 
>@@ -37,14 +36,13 @@
> 	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
> 	 */
> 	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
>-		File metadataLocation = new File(PDECore.getDefault().getStateLocation().toOSString());
>-		File configDir = new File(metadataLocation, configuration.getName());
>+		File configDir = LaunchConfigurationHelper.getConfigurationLocation(configuration);
> 		if (configDir.exists()) {
> 			// rename the config area if it was auto-set by PDE when the launch configuration is renamed
> 			ILaunchConfiguration destination = DebugPlugin.getDefault().getLaunchManager().getMovedTo(configuration);
> 			boolean delete = true;
> 			if (destination != null) {
>-				delete = !configDir.renameTo(new File(metadataLocation, destination.getName()));
>+				delete = !configDir.renameTo(LaunchConfigurationHelper.getConfigurationLocation(destination));
> 			}
> 			if (delete)
> 				CoreUtility.deleteContent(configDir);

Actions: View | Diff

Attachments on bug 170213: 74844 | 75027