mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Rename ICDISignal to ICDISignalReceived

Browse source 
and create model/ICDISignal
This commit is contained in:
Alain Magloire 2003-01-21 21:40:47 +00:00
parent 278e4f62ee
commit fa5b091353
15 changed files with 141 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,3 +1,18 @@
2003-01-21 Alain Magloire
* src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java:
Use ICDISignalReceived instead.
* src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java:
New file, element of the SignalManager.
* src/org/eclipse/cdt/debug/core/cdi/model/ICDISignalManager.java:
Return model/ICDISignal.
* src/org/eclipse/cdt/debug/core/cdi/model/ICDISignalReceived.java:
New file.
* src/org/eclipse/cdt/debug/core/internal/core/model/CDebugTarget.java:
Use ICDISignalReceived.
* src/org/eclipse/cdt/debug/core/internal/core/model/CThread.java:
Use ICDISignalReceived.
2003-01-21 Mikhail Khodjaiants
Retry to set breakpoints if shared library's symbols are loaded.
* CDebugTarget.java

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
View file

@ -5,6 +5,8 @@
package org.eclipse.cdt.debug.core.cdi;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
/**
*
* The signal manager manages the collection of signals defined

24
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java Normal file
View file

@ -0,0 +1,24 @@
/*
*(c) Copyright QNX Software Systems Ltd. 2002.
* All Rights Reserved.
*
*/
package org.eclipse.cdt.debug.core.cdi;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
/**
*
* Represents a signal.
*
* @since Jul 10, 2002
*/
public interface ICDISignalReceived extends ICDISessionObject {
/**
* Method getSignal.
* @return ICDISignal
*/
ICDISignal getSignal();
}

2
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
View file

@ -20,7 +20,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
* objects:
* <ul>
* <li>breakpoint (ICDIBreakpoint)
* <li>signal (ICDISignal)
* <li>signal (ICDISignalReceived)
* <li>end of the stepping range (ICDIEndSteppingRange)
* </ul>
*

7
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java → debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
View file

@ -4,7 +4,7 @@
*
*/
package org.eclipse.cdt.debug.core.cdi;
package org.eclipse.cdt.debug.core.cdi.model;
/**
*
@ -12,8 +12,8 @@ package org.eclipse.cdt.debug.core.cdi;
*
* @since Jul 10, 2002
*/
public interface ICDISignal extends ICDISessionObject
{
public interface ICDISignal extends ICDIObject {
/**
* Returns the name of this signal.
*
@ -27,4 +27,5 @@ public interface ICDISignal extends ICDISessionObject
* @return the meaning of this signal
*/
String getMeaning();
}

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -32,7 +32,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
import org.eclipse.cdt.debug.core.cdi.ICDILocation;
import org.eclipse.cdt.debug.core.cdi.ICDIRegisterObject;
import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
import org.eclipse.cdt.debug.core.cdi.ICDISignal;
import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived;
import org.eclipse.cdt.debug.core.cdi.ICDISourceManager;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger;
@ -1301,9 +1301,9 @@ public class CDebugTarget extends CDebugElement
{
handleBreakpointHit( (ICDIBreakpointHit)reason );
}
else if ( reason instanceof ICDISignal )
else if ( reason instanceof ICDISignalReceived )
{
handleSuspendedBySignal( (ICDISignal)reason );
handleSuspendedBySignal( (ICDISignalReceived)reason );
}
else if ( reason instanceof ICDIWatchpointTrigger )
{
@ -1375,7 +1375,7 @@ public class CDebugTarget extends CDebugElement
fireSuspendEvent( DebugEvent.BREAKPOINT );
}
private void handleSuspendedBySignal( ICDISignal signal )
private void handleSuspendedBySignal( ICDISignalReceived signal )
{
fireSuspendEvent( DebugEvent.UNSPECIFIED );
}

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
View file

@ -16,7 +16,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
import org.eclipse.cdt.debug.core.cdi.ICDIEndSteppingRange;
import org.eclipse.cdt.debug.core.cdi.ICDILocation;
import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
import org.eclipse.cdt.debug.core.cdi.ICDISignal;
import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived;
import org.eclipse.cdt.debug.core.cdi.event.ICDIChangedEvent;
import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent;
import org.eclipse.cdt.debug.core.cdi.event.ICDIDisconnectedEvent;
@ -884,9 +884,9 @@ public class CThread extends CDebugElement
{
handleBreakpointHit( (ICDIBreakpoint)reason );
}
else if ( reason instanceof ICDISignal )
else if ( reason instanceof ICDISignalReceived )
{
handleSuspendedBySignal( (ICDISignal)reason );
handleSuspendedBySignal( (ICDISignalReceived)reason );
}
else
{
@ -947,7 +947,7 @@ public class CThread extends CDebugElement
fireSuspendEvent( DebugEvent.BREAKPOINT );
}
private void handleSuspendedBySignal( ICDISignal signal )
private void handleSuspendedBySignal( ICDISignalReceived signal )
{
fireSuspendEvent( DebugEvent.UNSPECIFIED );
}

7
debug/org.eclipse.cdt.debug.mi.core/ChangeLog
View file

@ -1,3 +1,10 @@
2003-01-20 Alain Magloire
* src/.../mi/core/cdi/SuspendedEvent.java: Use SignalReceived.
* src/.../mi/core/cdi/model/Signal.java: New file.
* src/.../mi/core/cdi/model/SignalManager.java: Use model/Signal.
* src/.../mi/core/cdi/SignalReceived.java: New file.
2003-01-20 Alain Magloire
The problem was that no check was done for the existence of

35
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Signal.java
View file

@ -1,35 +0,0 @@
/*
* (c) Copyright QNX Software Systems Ltd. 2002.
* All Rights Reserved.
*
*/
package org.eclipse.cdt.debug.mi.core.cdi;
import org.eclipse.cdt.debug.core.cdi.ICDISignal;
import org.eclipse.cdt.debug.mi.core.event.MISignalEvent;
/**
*/
public class Signal extends SessionObject implements ICDISignal {
MISignalEvent event;
public Signal(CSession session, MISignalEvent e) {
super(session);
event = e;
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getMeaning()
*/
public String getMeaning() {
return event.getMeaning();
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDISignal#getName()
*/
public String getName() {
return event.getName();
}
}

4
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
View file

@ -6,8 +6,8 @@
package org.eclipse.cdt.debug.mi.core.cdi;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISignal;
import org.eclipse.cdt.debug.core.cdi.ICDISignalManager;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
/**
*/
@ -21,7 +21,7 @@ public class SignalManager extends SessionObject implements ICDISignalManager {
* @see org.eclipse.cdt.debug.core.cdi.ICDISignalManager#getSignals()
*/
public ICDISignal[] getSignals() throws CDIException {
return null;
return new ICDISignal[0];
}
}

31
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java Normal file
View file

@ -0,0 +1,31 @@
/*
* (c) Copyright QNX Software Systems Ltd. 2002.
* All Rights Reserved.
*
*/
package org.eclipse.cdt.debug.mi.core.cdi;
import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
import org.eclipse.cdt.debug.mi.core.cdi.model.Signal;
import org.eclipse.cdt.debug.mi.core.event.MISignalEvent;
/**
*/
public class SignalReceived extends SessionObject implements ICDISignalReceived {
ICDISignal signal;
public SignalReceived(CSession session, MISignalEvent event) {
super(session);
signal = new Signal(session.getCTarget(), event);
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDISignalReceived#getSignal()
*/
public ICDISignal getSignal() {
return signal;
}
}

4
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java
View file

@ -12,7 +12,7 @@ import org.eclipse.cdt.debug.mi.core.cdi.BreakpointHit;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.EndSteppingRange;
import org.eclipse.cdt.debug.mi.core.cdi.ErrorInfo;
import org.eclipse.cdt.debug.mi.core.cdi.Signal;
import org.eclipse.cdt.debug.mi.core.cdi.SignalReceived;
import org.eclipse.cdt.debug.mi.core.cdi.WatchpointScope;
import org.eclipse.cdt.debug.mi.core.cdi.WatchpointTrigger;
import org.eclipse.cdt.debug.mi.core.cdi.model.CTarget;
@ -49,7 +49,7 @@ public class SuspendedEvent implements ICDISuspendedEvent {
} else if (event instanceof MISteppingRangeEvent) {
return new EndSteppingRange(session);
} else if (event instanceof MISignalEvent) {
return new Signal(session, (MISignalEvent)event);
return new SignalReceived(session, (MISignalEvent)event);
} else if (event instanceof MILocationReachedEvent) {
return new EndSteppingRange(session);
} else if (event instanceof MIFunctionFinishedEvent) {

35
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java Normal file
View file

@ -0,0 +1,35 @@
/*
* (c) Copyright QNX Software Systems Ltd. 2002.
* All Rights Reserved.
*
*/
package org.eclipse.cdt.debug.mi.core.cdi.model;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
import org.eclipse.cdt.debug.mi.core.event.MISignalEvent;
/**
*/
public class Signal extends CObject implements ICDISignal {
MISignalEvent event;
public Signal(CTarget target, MISignalEvent e) {
super(target);
event = e;
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDISignalReceived#getMeaning()
*/
public String getMeaning() {
return event.getMeaning();
}
/**
* @see org.eclipse.cdt.debug.core.cdi.ICDISignalReceived#getName()
*/
public String getName() {
return event.getName();
}
}

5
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,8 @@
2003-01-21 Mikhail Khodjaiants
* src/org/eclipse/cdt/debu/internal/ui/CDTDebugModelPresentation.java
(getTargetText): Use Signal.
2003-01-20 Mikhail Khodjaiants
Changed the icon for the 'Load Symbols' action.
icons/full/clcl16/load_symbols_co.gif

8
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
View file

@ -14,9 +14,10 @@ import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit;
import org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo;
import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo;
import org.eclipse.cdt.debug.core.cdi.ICDISession;
import org.eclipse.cdt.debug.core.cdi.ICDISignal;
import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICDebugTargetType;
@ -362,11 +363,12 @@ public class CDTDebugModelPresentation extends LabelProvider
case IState.SUSPENDED:
{
Object info = state.getCurrentStateInfo();
if ( info != null && info instanceof ICDISignal )
if ( info != null && info instanceof ICDISignalReceived )
{
ICDISignal signal = ((ICDISignalReceived)info).getSignal();
String label = target.getName() +
MessageFormat.format( " (Signal ''{0}'' received. Meaning: {1})",
new String[] { ((ICDISignal)info).getName(), ((ICDISignal)info).getMeaning() } );
new String[] { signal.getName(), signal.getMeaning() } );
return label;
}
if ( info != null && info instanceof ICDIWatchpointTrigger )