Rename ICDISignal to ICDISignalReceived

and create model/ICDISignal

15 files changed, 141 insertions, 54 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 28338f6c069..098c18ddb5e 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -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
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
index 6adfcf46570..150361393bc 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java
@@ -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 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java
new file mode 100644
index 00000000000..060798ab788
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignalReceived.java
@@ -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();
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
index 9a0ed463d4c..5d9379bc898 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
@@ -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>
  * 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
index ebb1e00ed9d..0a13ca8279a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISignal.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDISignal.java
@@ -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();
+
 }
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 55ca4db91aa..db5233750d3 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
@@ -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 );
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
index a39f941ab53..6f288b8ac36 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
@@ -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 );
 	}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 34b6d90cbac..ac11fd09bd2 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,5 +1,12 @@
 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
 	the program/executable nor the working directory etc ...
 	By asking the arguements to be File, the check is done by
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Signal.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Signal.java
deleted file mode 100644
index b3421323105..00000000000
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/Signal.java
+++ /dev/null
@@ -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();
-	}
-
-}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
index b47d2435163..d2e5bc84c93 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
@@ -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];
 	}
 
 }
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java
new file mode 100644
index 00000000000..2016d036f3e
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SignalReceived.java
@@ -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;
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java
index ce6546ad4c0..ef50465e6de 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/SuspendedEvent.java
@@ -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) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
new file mode 100644
index 00000000000..b13c1d7f1aa
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
@@ -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();
+	}
+
+}
diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index cb30a2c7a62..a5c9d2f66b4 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -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

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
index 30d3c001128..b84c8be772a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
@@ -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 )