From ee03d27d335e56e3fd187972108f1fc83bf0eda5 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sat, 26 Oct 2002 20:27:28 +0000 Subject: [PATCH] super needs token as argument. --- .../mi/core/event/MIBreakpointEvent.java | 2 ++ .../debug/mi/core/event/MIChangedEvent.java | 3 +++ .../debug/mi/core/event/MIDetachedEvent.java | 3 ++- .../cdt/debug/mi/core/event/MIEvent.java | 10 ++++++++ .../core/event/MIFunctionFinishedEvent.java | 6 +++-- .../debug/mi/core/event/MIGDBExitEvent.java | 4 +++ .../mi/core/event/MIInferiorExitEvent.java | 9 ++++--- .../mi/core/event/MILocationReachedEvent.java | 6 +++-- .../mi/core/event/MIMemoryChangedEvent.java | 6 +++++ .../mi/core/event/MIRegisterChangedEvent.java | 25 ++++++++++--------- .../debug/mi/core/event/MIRunningEvent.java | 3 ++- .../debug/mi/core/event/MISignalEvent.java | 6 +++-- .../mi/core/event/MISteppingRangeEvent.java | 6 +++-- .../debug/mi/core/event/MIStoppedEvent.java | 3 ++- .../mi/core/event/MIThreadExitEvent.java | 5 ++++ .../mi/core/event/MIVarChangedEvent.java | 3 ++- .../mi/core/event/MIWatchpointScopeEvent.java | 6 +++-- .../core/event/MIWatchpointTriggerEvent.java | 6 +++-- 18 files changed, 81 insertions(+), 31 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIBreakpointEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIBreakpointEvent.java index db28b5cee49..46506459b64 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIBreakpointEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIBreakpointEvent.java @@ -27,11 +27,13 @@ public class MIBreakpointEvent extends MIStoppedEvent { MIResultRecord rr; public MIBreakpointEvent(MIExecAsyncOutput record) { + super(record.getToken()); exec = record; parse(); } public MIBreakpointEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIChangedEvent.java index b992b17beba..cc6828e4d2a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIChangedEvent.java @@ -12,4 +12,7 @@ package org.eclipse.cdt.debug.mi.core.event; * */ public abstract class MIChangedEvent extends MIEvent { + public MIChangedEvent(int id) { + super(id); + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java index 3ce0c0a76d1..e22782d54ba 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIDetachedEvent.java @@ -13,7 +13,8 @@ package org.eclipse.cdt.debug.mi.core.event; */ public class MIDetachedEvent extends MIEvent { - public MIDetachedEvent() { + public MIDetachedEvent(int token) { + super(token); } public String toString() { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIEvent.java index 23934a78ee7..45843d65f5c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIEvent.java @@ -8,4 +8,14 @@ package org.eclipse.cdt.debug.mi.core.event; /** */ public abstract class MIEvent { + + int token; + + public MIEvent(int token) { + this.token = token; + } + + public int getToken() { + return token; + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java index f4ebd5aff01..1922dcac35f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIFunctionFinishedEvent.java @@ -26,12 +26,14 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MIFunctionFinishedEvent(MIExecAsyncOutput record) { - exec = record; + public MIFunctionFinishedEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MIFunctionFinishedEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIGDBExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIGDBExitEvent.java index 828346ce907..79fb4492e87 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIGDBExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIGDBExitEvent.java @@ -11,4 +11,8 @@ package org.eclipse.cdt.debug.mi.core.event; * Gdb Session terminated. */ public class MIGDBExitEvent extends MIEvent { + + public MIGDBExitEvent(int token) { + super(token); + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorExitEvent.java index a043af4f271..cc6202e35e0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIInferiorExitEvent.java @@ -26,15 +26,18 @@ public class MIInferiorExitEvent extends MIEvent { MIExecAsyncOutput exec = null; MIResultRecord rr = null; - public MIInferiorExitEvent() { + public MIInferiorExitEvent(int token) { + super(token); } - public MIInferiorExitEvent(MIExecAsyncOutput record) { - exec = record; + public MIInferiorExitEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MIInferiorExitEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java index 84ad609c780..ea840665d4f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MILocationReachedEvent.java @@ -24,12 +24,14 @@ public class MILocationReachedEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MILocationReachedEvent(MIExecAsyncOutput record) { - exec = record; + public MILocationReachedEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MILocationReachedEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIMemoryChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIMemoryChangedEvent.java index 97fea0276c6..0bbd7b2088f 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIMemoryChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIMemoryChangedEvent.java @@ -14,7 +14,13 @@ package org.eclipse.cdt.debug.mi.core.event; public class MIMemoryChangedEvent extends MIChangedEvent { Long[] addresses; + public MIMemoryChangedEvent(Long[] addrs) { + this(0, addrs); + } + + public MIMemoryChangedEvent(int token, Long[] addrs) { + super(token); addresses = addrs; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRegisterChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRegisterChangedEvent.java index 5d353f665fe..d15f28555a8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRegisterChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRegisterChangedEvent.java @@ -13,19 +13,20 @@ package org.eclipse.cdt.debug.mi.core.event; */ public class MIRegisterChangedEvent extends MIChangedEvent { - String regName; - int regno; + String regName; + int regno; - public MIRegisterChangedEvent(String name, int no) { - regName = name; - regno = no; - } + public MIRegisterChangedEvent(int token, String name, int no) { + super(token); + regName = name; + regno = no; + } - public String getName() { - return regName; - } + public String getName() { + return regName; + } - public int getNumber() { - return regno; - } + public int getNumber() { + return regno; + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java index 5dcb3aa8d13..442a0275be9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIRunningEvent.java @@ -23,7 +23,8 @@ public class MIRunningEvent extends MIEvent { int type; - public MIRunningEvent(int t) { + public MIRunningEvent(int token, int t) { + super(token); type = t; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java index 61d0221addb..a63e9a4938a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISignalEvent.java @@ -27,12 +27,14 @@ public class MISignalEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MISignalEvent(MIExecAsyncOutput record) { - exec = record; + public MISignalEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MISignalEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java index d562622e9db..bf89bfb8e5b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MISteppingRangeEvent.java @@ -25,12 +25,14 @@ public class MISteppingRangeEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MISteppingRangeEvent(MIExecAsyncOutput record) { - exec = record; + public MISteppingRangeEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MISteppingRangeEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIStoppedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIStoppedEvent.java index a8d87a4572e..04a76c3480c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIStoppedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIStoppedEvent.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.debug.mi.core.event; */ public class MIStoppedEvent extends MIEvent { - public MIStoppedEvent() { + public MIStoppedEvent(int token) { + super(token); } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIThreadExitEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIThreadExitEvent.java index a49b18342a4..30d84cfd5ad 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIThreadExitEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIThreadExitEvent.java @@ -15,6 +15,11 @@ public class MIThreadExitEvent extends MIEvent { int tid; public MIThreadExitEvent(int id) { + this(0, id); + } + + public MIThreadExitEvent(int token, int id) { + super(token); tid = id; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIVarChangedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIVarChangedEvent.java index 8ebb2b11289..82500fbb83d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIVarChangedEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIVarChangedEvent.java @@ -16,7 +16,8 @@ public class MIVarChangedEvent extends MIChangedEvent { String varName; boolean inScope; - public MIVarChangedEvent(String var, boolean scope) { + public MIVarChangedEvent(int token, String var, boolean scope) { + super(token); varName = var; inScope = scope; } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java index 7a7dbc47852..3b02e1789d3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointScopeEvent.java @@ -26,12 +26,14 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MIWatchpointScopeEvent(MIExecAsyncOutput record) { - exec = record; + public MIWatchpointScopeEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MIWatchpointScopeEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java index d6657660b36..430685f1458 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/event/MIWatchpointTriggerEvent.java @@ -29,12 +29,14 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { MIExecAsyncOutput exec; MIResultRecord rr; - public MIWatchpointTriggerEvent(MIExecAsyncOutput record) { - exec = record; + public MIWatchpointTriggerEvent(MIExecAsyncOutput async) { + super(async.getToken()); + exec = async; parse(); } public MIWatchpointTriggerEvent(MIResultRecord record) { + super(record.getToken()); rr = record; parse(); }