From 586e639a47b7c98276e44a307d5c5cea3bf41c65 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 26 Mar 2007 14:33:59 +0000 Subject: [PATCH] Bug 175338: Debug is broken after M5. Renamed IModelProxyFactoryAdapter to IModelProxyFactory. --- .../ui/elements/adapters/CDebugElementAdapterFactory.java | 8 ++++---- .../internal/ui/views/modules/ModuleProxyFactory.java | 4 ++-- 2 files changed, 6 insertions(+), 6 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 8cb92deb77c..4c7c9653566 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.IModelProxyFactoryAdapter; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory; /** * 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 IModelProxyFactoryAdapter fgModuleProxyFactory = new ModuleProxyFactory(); + private static IModelProxyFactory 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( IModelProxyFactoryAdapter.class ) ) { + if ( adapterType.equals( IModelProxyFactory.class ) ) { if ( adaptableObject instanceof IModuleRetrieval ) { return fgModuleProxyFactory; } @@ -80,7 +80,7 @@ public class CDebugElementAdapterFactory implements IAdapterFactory { return new Class[] { IElementLabelProvider.class, IElementContentProvider.class, - IModelProxyFactoryAdapter.class, + IModelProxyFactory.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 86c27e681b8..61fa6946898 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,10 +14,10 @@ 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.IModelProxyFactoryAdapter; +import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory; import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext; -public class ModuleProxyFactory implements IModelProxyFactoryAdapter { +public class ModuleProxyFactory implements IModelProxyFactory { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxyFactoryAdapter#createModelProxy(java.lang.Object, org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext)