Attachment 168962 Details for Bug 284557 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

import-delgates.patch (text/plain), 4.45 KB, created by Darin Wright

on 2010-05-18 12:22:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-05-18 12:22:19 EDT

Size: 4.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.debug.core
>Index: core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java,v
>retrieving revision 1.56
>diff -u -r1.56 LaunchConfigurationType.java
>--- core/org/eclipse/debug/internal/core/LaunchConfigurationType.java	18 Mar 2010 13:38:53 -0000	1.56
>+++ core/org/eclipse/debug/internal/core/LaunchConfigurationType.java	18 May 2010 16:20:14 -0000
>@@ -192,6 +192,7 @@
> 	 * @see org.eclipse.debug.core.ILaunchConfigurationType#getPreferredDelegate(java.util.Set)
> 	 */
> 	public ILaunchDelegate getPreferredDelegate(Set modes) {
>+		initializePreferredDelegates();
> 		return (ILaunchDelegate) fPreferredDelegates.get(modes);
> 	}
> 	
>@@ -208,6 +209,7 @@
> 	 * @since 3.3
> 	 */
> 	public Map getPreferredDelegates() {
>+		initializePreferredDelegates();
> 		return fPreferredDelegates;
> 	}
> 	
>@@ -503,5 +505,11 @@
> 		return fModeCombinations.contains(modes);
> 	}
> 
>+	/** 
>+	 * Called on preference import to reset preferred delegates.
>+	 */
>+	void resetPreferredDelegates() {
>+		fPreferredDelegates = null;
>+	}
> }
> 
>Index: core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java
>===================================================================
>RCS file: core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java
>diff -N core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ core/org/eclipse/debug/internal/core/PreferredDelegateModifyListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.debug.internal.core;
>+
>+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
>+import org.eclipse.core.runtime.preferences.IPreferenceNodeVisitor;
>+import org.eclipse.core.runtime.preferences.PreferenceModifyListener;
>+import org.eclipse.debug.core.DebugPlugin;
>+import org.eclipse.debug.core.ILaunchConfigurationType;
>+import org.eclipse.debug.core.ILaunchManager;
>+import org.osgi.service.prefs.BackingStoreException;
>+
>+/**
>+ * Used to listen for preference imports that include changes to 
>+ * preferred launch delegates.
>+ * 
>+ * @since 3.6
>+ */
>+public class PreferredDelegateModifyListener extends PreferenceModifyListener {
>+	class Visitor implements IPreferenceNodeVisitor {
>+
>+		public boolean visit(IEclipsePreferences node) throws BackingStoreException {
>+			if (node.name().equals(DebugPlugin.getUniqueIdentifier())) {
>+				// reset preferred delegates, so they are re-initialized from the preferences
>+				ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
>+				ILaunchConfigurationType[] types = manager.getLaunchConfigurationTypes();
>+				for (int i = 0; i < types.length; i++) {
>+					((LaunchConfigurationType) types[i]).resetPreferredDelegates();
>+				}
>+				return false;
>+			}
>+			return true;
>+		}
>+		
>+	}
>+
>+	public IEclipsePreferences preApply(IEclipsePreferences node) {
>+		try {
>+			// force VMs to be initialized before we import the new VMs
>+			node.accept(new Visitor());
>+		} catch (BackingStoreException e) {
>+            DebugPlugin.log(e);
>+		}
>+		return node;
>+	}
>+
>+}
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.core/plugin.xml,v
>retrieving revision 1.77
>diff -u -r1.77 plugin.xml
>--- plugin.xml	27 Apr 2010 21:07:54 -0000	1.77
>+++ plugin.xml	18 May 2010 16:20:15 -0000
>@@ -234,6 +234,9 @@
>       <initializer
>             class="org.eclipse.debug.internal.core.DebugPreferenceInitializer">
>       </initializer>
>+      <modifier
>+            class="org.eclipse.debug.internal.core.PreferredDelegateModifyListener">
>+      </modifier>
>    </extension>
> 
>

Actions: View | Diff

Attachments on bug 284557: 168962 | 169147