From 90bb8e66128e2aa8fa1466c5fd555106bf6f7cfe Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Thu, 22 Mar 2007 05:01:41 +0000
Subject: [PATCH] Backing out patch for 175338. We haven't moved to M6 yet.

---
 .../ui/elements/adapters/CDebugElementAdapterFactory.java | 8 ++++----
 .../internal/ui/views/modules/ModuleProxyFactory.java     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java
index 4c7c9653566..8cb92deb77c 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/elements/adapters/CDebugElementAdapterFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider;
-import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactoryAdapter;
  
 /**
  * Comment for .
@@ -31,7 +31,7 @@ public class CDebugElementAdapterFactory implements IAdapterFactory {
 
 	private static IElementLabelProvider fgModuleLabelProvider = new ModuleLabelProvider();
     private static IElementContentProvider fgModuleContentProvider = new ModuleContentProvider();
-	private static IModelProxyFactory fgModuleProxyFactory = new ModuleProxyFactory();
+	private static IModelProxyFactoryAdapter fgModuleProxyFactory = new ModuleProxyFactory();
     private static IElementMementoProvider fgModuleMementoProvider = new ModuleMementoProvider();
 
 	/* (non-Javadoc)
@@ -60,7 +60,7 @@ public class CDebugElementAdapterFactory implements IAdapterFactory {
 				return fgModuleContentProvider;
 			}
 		}
-		if ( adapterType.equals( IModelProxyFactory.class ) ) {
+		if ( adapterType.equals( IModelProxyFactoryAdapter.class ) ) {
 			if ( adaptableObject instanceof IModuleRetrieval ) {
 				return fgModuleProxyFactory;
 			}
@@ -80,7 +80,7 @@ public class CDebugElementAdapterFactory implements IAdapterFactory {
 		return new Class[] {
 				IElementLabelProvider.class,
 				IElementContentProvider.class,
-				IModelProxyFactory.class,
+				IModelProxyFactoryAdapter.class,
         		IElementMementoProvider.class,
 			};
 	}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java
index dd7c3d04468..86c27e681b8 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModuleProxyFactory.java
@@ -14,13 +14,13 @@ package org.eclipse.cdt.debug.internal.ui.views.modules;
 import org.eclipse.cdt.debug.core.model.IModuleRetrieval;
 import org.eclipse.cdt.debug.ui.ICDebugUIConstants;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy;
-import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory;
+import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactoryAdapter;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
  
-public class ModuleProxyFactory implements IModelProxyFactory {
+public class ModuleProxyFactory implements IModelProxyFactoryAdapter {
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactory#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext)
+	 * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactoryAdapter#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext)
 	 */
 	public IModelProxy createModelProxy( Object element, IPresentationContext context ) {
 		if ( ICDebugUIConstants.ID_MODULES_VIEW.equals( context.getId() ) ) {