From b38be153355db3e177d6dc833e0200ae5faf4f2b Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 4 Nov 2004 16:40:42 +0000 Subject: [PATCH] No need of "ICSignalManager". --- debug/org.eclipse.cdt.debug.core/ChangeLog | 6 +++++ .../cdt/debug/core/ICSignalManager.java | 27 ------------------- .../debug/internal/core/CSignalManager.java | 10 +++---- .../internal/core/model/CDebugTarget.java | 7 +++-- 4 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICSignalManager.java diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index bf6b5469683..0ecc777b87e 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,9 @@ +2004-11-04 Mikhail Khodjaiants + No need of "ICSignalManager". + * ICSignalManager.java: removed + * CSignalManager.java + * CDebugTarget.java + 2004-11-04 Mikhail Khodjaiants CSignalManager no longer extends CUpdateManager. * CSignalManager.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICSignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICSignalManager.java deleted file mode 100644 index 277f6fed454..00000000000 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICSignalManager.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.debug.core; - -import org.eclipse.cdt.debug.core.model.ICSignal; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.debug.core.DebugException; - -/** - * Enter type comment. - * - * @since: Jan 31, 2003 - */ -public interface ICSignalManager extends IAdaptable -{ - ICSignal[] getSignals() throws DebugException; - - void dispose(); -} diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java index 4c4c4f2961a..b29662444b8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java @@ -12,12 +12,12 @@ package org.eclipse.cdt.debug.internal.core; import java.util.ArrayList; import org.eclipse.cdt.debug.core.CDebugModel; -import org.eclipse.cdt.debug.core.ICSignalManager; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDISignal; import org.eclipse.cdt.debug.core.model.ICSignal; import org.eclipse.cdt.debug.internal.core.model.CDebugTarget; import org.eclipse.cdt.debug.internal.core.model.CSignal; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugEvent; @@ -26,7 +26,7 @@ import org.eclipse.debug.core.DebugException; /** * Manages the collection of signals on a debug target. */ -public class CSignalManager implements ICSignalManager { +public class CSignalManager implements IAdaptable { /** * The debug target associated with this manager. @@ -86,12 +86,12 @@ public class CSignalManager implements ICSignalManager { * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ public Object getAdapter( Class adapter ) { - if ( adapter.equals( ICSignalManager.class ) ) { - return this; - } if ( adapter.equals( CSignalManager.class ) ) { return this; } + if ( adapter.equals( CDebugTarget.class ) ) { + return getDebugTarget(); + } return null; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index e999e0bb901..e5e167c232c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -30,7 +30,6 @@ import org.eclipse.cdt.debug.core.ICGlobalVariableManager; import org.eclipse.cdt.debug.core.ICMemoryManager; import org.eclipse.cdt.debug.core.ICRegisterManager; import org.eclipse.cdt.debug.core.ICSharedLibraryManager; -import org.eclipse.cdt.debug.core.ICSignalManager; import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit; import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange; @@ -854,7 +853,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv return getBreakpointManager(); if ( adapter.equals( ICSharedLibraryManager.class ) ) return getSharedLibraryManager(); - if ( adapter.equals( ICSignalManager.class ) ) + if ( adapter.equals( CSignalManager.class ) ) return getSignalManager(); if ( adapter.equals( ICRegisterManager.class ) ) return getRegisterManager(); @@ -1702,7 +1701,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#getSignals() */ public ICSignal[] getSignals() throws DebugException { - ICSignalManager sm = getSignalManager(); + CSignalManager sm = getSignalManager(); if ( sm != null ) { return sm.getSignals(); } @@ -1724,7 +1723,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv * @see org.eclipse.cdt.debug.core.model.ICDebugTarget#hasSignals() */ public boolean hasSignals() throws DebugException { - ICSignalManager sm = getSignalManager(); + CSignalManager sm = getSignalManager(); if ( sm != null ) { return (sm.getSignals().length > 0); }