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

Refactor CTarget to Target

Browse source 
CSession to SEssion
CThread to Thread
This commit is contained in:
Alain Magloire 2003-01-27 03:09:20 +00:00
parent 2e05997cce
commit d6d02ccf76
8 changed files with 82 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ChangedEvent.java
View file

@ -10,12 +10,13 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.SharedLibraryManager;
import org.eclipse.cdt.debug.mi.core.cdi.VariableManager;
import org.eclipse.cdt.debug.mi.core.cdi.model.CObject;
import org.eclipse.cdt.debug.mi.core.cdi.model.Register;
import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
import org.eclipse.cdt.debug.mi.core.event.MIBreakpointChangedEvent;
import org.eclipse.cdt.debug.mi.core.event.MIRegisterChangedEvent;
import org.eclipse.cdt.debug.mi.core.event.MISharedLibChangedEvent;
@ -25,24 +26,24 @@ import org.eclipse.cdt.debug.mi.core.event.MIVarChangedEvent;
*/
public class ChangedEvent implements ICDIChangedEvent {
CSession session;
Session session;
ICDIObject source;
public ChangedEvent(CSession s, MIVarChangedEvent var) {
public ChangedEvent(Session s, MIVarChangedEvent var) {
session = s;
VariableManager mgr = session.getVariableManager();
VariableManager mgr = (VariableManager)session.getVariableManager();
String varName = var.getVarName();
VariableManager.Element element = mgr.getElement(varName);
if (element != null && element.variable != null) {
source = element.variable;
Variable variable = mgr.getVariable(varName);
if (variable != null) {
source = variable;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public ChangedEvent(CSession s, MIRegisterChangedEvent var) {
public ChangedEvent(Session s, MIRegisterChangedEvent var) {
session = s;
RegisterManager mgr = session.getRegisterManager();
RegisterManager mgr = (RegisterManager)session.getRegisterManager();
int regno = var.getNumber();
Register reg = null;
try {
@ -52,11 +53,11 @@ public class ChangedEvent implements ICDIChangedEvent {
if (reg != null) {
source = reg;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public ChangedEvent(CSession s, MIBreakpointChangedEvent bpoint) {
public ChangedEvent(Session s, MIBreakpointChangedEvent bpoint) {
session = s;
BreakpointManager mgr = (BreakpointManager)session.getBreakpointManager();
int number = bpoint.getNumber();
@ -64,11 +65,11 @@ public class ChangedEvent implements ICDIChangedEvent {
if (breakpoint != null) {
source = breakpoint;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public ChangedEvent(CSession s, MISharedLibChangedEvent slib) {
public ChangedEvent(Session s, MISharedLibChangedEvent slib) {
session = s;
SharedLibraryManager mgr = (SharedLibraryManager)session.getSharedLibraryManager();
String name = slib.getName();
@ -76,11 +77,11 @@ public class ChangedEvent implements ICDIChangedEvent {
if (lib != null) {
source = lib;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public ChangedEvent(CSession s, ICDIObject src) {
public ChangedEvent(Session s, ICDIObject src) {
session = s;
source = src;
}

45
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
View file

@ -12,14 +12,15 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
import org.eclipse.cdt.debug.core.cdi.model.ICDIThread;
import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager;
import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.SharedLibraryManager;
import org.eclipse.cdt.debug.mi.core.cdi.VariableManager;
import org.eclipse.cdt.debug.mi.core.cdi.model.CObject;
import org.eclipse.cdt.debug.mi.core.cdi.model.CTarget;
import org.eclipse.cdt.debug.mi.core.cdi.model.Register;
import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
import org.eclipse.cdt.debug.mi.core.event.MIBreakpointCreatedEvent;
import org.eclipse.cdt.debug.mi.core.event.MIMemoryCreatedEvent;
import org.eclipse.cdt.debug.mi.core.event.MIRegisterCreatedEvent;
@ -31,10 +32,10 @@ import org.eclipse.cdt.debug.mi.core.event.MIVarCreatedEvent;
*/
public class CreatedEvent implements ICDICreatedEvent {
CSession session;
Session session;
ICDIObject source;
public CreatedEvent(CSession s, MIBreakpointCreatedEvent bpoint) {
public CreatedEvent(Session s, MIBreakpointCreatedEvent bpoint) {
session = s;
BreakpointManager mgr = (BreakpointManager)session.getBreakpointManager();
int number = bpoint.getNumber();
@ -42,25 +43,25 @@ public class CreatedEvent implements ICDICreatedEvent {
if (breakpoint != null) {
source = breakpoint;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, MIVarCreatedEvent var) {
public CreatedEvent(Session s, MIVarCreatedEvent var) {
session = s;
VariableManager mgr = session.getVariableManager();
VariableManager mgr = (VariableManager)session.getVariableManager();
String varName = var.getVarName();
VariableManager.Element element = mgr.getElement(varName);
if (element != null && element.variable != null) {
source = element.variable;
Variable variable = mgr.getVariable(varName);
if (variable != null) {
source = variable;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, MIRegisterCreatedEvent var) {
public CreatedEvent(Session s, MIRegisterCreatedEvent var) {
session = s;
RegisterManager mgr = session.getRegisterManager();
RegisterManager mgr = (RegisterManager)session.getRegisterManager();
int regno = var.getNumber();
Register reg = null;
try {
@ -70,22 +71,22 @@ public class CreatedEvent implements ICDICreatedEvent {
if (reg != null) {
source = reg;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, MIThreadCreatedEvent ethread) {
public CreatedEvent(Session s, MIThreadCreatedEvent ethread) {
session = s;
CTarget target = (CTarget)session.getCurrentTarget();
Target target = (Target)session.getCurrentTarget();
ICDIThread thread = target.getThread(ethread.getId());
if (thread != null) {
source = thread;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, MIMemoryCreatedEvent mblock) {
public CreatedEvent(Session s, MIMemoryCreatedEvent mblock) {
session = s;
MemoryManager mgr = (MemoryManager)session.getMemoryManager();
ICDIMemoryBlock[] blocks = mgr.listMemoryBlocks();
@ -97,11 +98,11 @@ public class CreatedEvent implements ICDICreatedEvent {
}
}
if (source == null) {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, MISharedLibCreatedEvent slib) {
public CreatedEvent(Session s, MISharedLibCreatedEvent slib) {
session = s;
SharedLibraryManager mgr = (SharedLibraryManager)session.getSharedLibraryManager();
String name = slib.getName();
@ -109,11 +110,11 @@ public class CreatedEvent implements ICDICreatedEvent {
if (lib != null) {
source = lib;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public CreatedEvent(CSession s, ICDIObject src) {
public CreatedEvent(Session s, ICDIObject src) {
session = s;
source = src;
}

43
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DestroyedEvent.java
View file

@ -5,16 +5,18 @@
*/
package org.eclipse.cdt.debug.mi.core.cdi.event;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.SharedLibraryManager;
import org.eclipse.cdt.debug.mi.core.cdi.VariableManager;
import org.eclipse.cdt.debug.mi.core.cdi.model.Breakpoint;
import org.eclipse.cdt.debug.mi.core.cdi.model.CObject;
import org.eclipse.cdt.debug.mi.core.cdi.model.CThread;
import org.eclipse.cdt.debug.mi.core.cdi.model.Thread;
import org.eclipse.cdt.debug.mi.core.cdi.model.Variable;
import org.eclipse.cdt.debug.mi.core.event.MIBreakpointDeletedEvent;
import org.eclipse.cdt.debug.mi.core.event.MISharedLibUnloadedEvent;
import org.eclipse.cdt.debug.mi.core.event.MIThreadExitEvent;
@ -24,39 +26,44 @@ import org.eclipse.cdt.debug.mi.core.event.MIVarChangedEvent;
*/
public class DestroyedEvent implements ICDIDestroyedEvent {
CSession session;
Session session;
ICDIObject source;
public DestroyedEvent(CSession s, MIThreadExitEvent ethread) {
public DestroyedEvent(Session s, MIThreadExitEvent ethread) {
session = s;
source = new CThread(session.getCTarget(), ethread.getId());
source = new Thread(session.getCurrentTarget(), ethread.getId());
}
public DestroyedEvent(CSession s, MIVarChangedEvent var) {
public DestroyedEvent(Session s, MIVarChangedEvent var) {
session = s;
VariableManager mgr = session.getVariableManager();
VariableManager mgr = (VariableManager)session.getVariableManager();
String varName = var.getVarName();
VariableManager.Element element = mgr.removeOutOfScope(varName);
if (element != null && element.variable != null) {
source = element.variable;
Variable variable = mgr.getVariable(varName);
if (variable!= null) {
source = variable;
try {
mgr.removeVariable(variable.getMIVar().getVarName());
} catch (CDIException e) {
}
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public DestroyedEvent(CSession s, MIBreakpointDeletedEvent bpoint) {
public DestroyedEvent(Session s, MIBreakpointDeletedEvent bpoint) {
session = s;
BreakpointManager mgr = (BreakpointManager)session.getBreakpointManager();
int number = bpoint.getNumber();
Breakpoint breakpoint = mgr.deleteBreakpoint(number);
Breakpoint breakpoint = mgr.getBreakpoint(number);
if (breakpoint != null) {
source = breakpoint;
mgr.deleteBreakpoint(number);
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public DestroyedEvent(CSession s, MISharedLibUnloadedEvent slib) {
public DestroyedEvent(Session s, MISharedLibUnloadedEvent slib) {
session = s;
SharedLibraryManager mgr = (SharedLibraryManager)session.getSharedLibraryManager();
String name = slib.getName();
@ -65,16 +72,16 @@ public class DestroyedEvent implements ICDIDestroyedEvent {
mgr.removeFromUnloadedList(name);
source = lib;
} else {
source = new CObject(session.getCTarget());
source = new CObject(session.getCurrentTarget());
}
}
public DestroyedEvent(CSession s, ICDIObject src) {
public DestroyedEvent(Session s, ICDIObject src) {
session = s;
source = src;
}
public DestroyedEvent(CSession s) {
public DestroyedEvent(Session s) {
session = s;
}

6
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/DisconnectedEvent.java
View file

@ -2,7 +2,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.event;
import org.eclipse.cdt.debug.core.cdi.event.ICDIDisconnectedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
/**
*/
@ -10,8 +10,8 @@ public class DisconnectedEvent implements ICDIDisconnectedEvent {
ICDIObject source;
public DisconnectedEvent(CSession session) {
source = (ICDIObject)session.getCTarget();
public DisconnectedEvent(Session session) {
source = (ICDIObject)session.getCurrentTarget();
}
/**

6
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ExitedEvent.java
View file

@ -8,7 +8,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.event;
import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo;
import org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.ExitInfo;
import org.eclipse.cdt.debug.mi.core.event.MIInferiorExitEvent;
@ -17,9 +17,9 @@ import org.eclipse.cdt.debug.mi.core.event.MIInferiorExitEvent;
public class ExitedEvent implements ICDIExitedEvent {
MIInferiorExitEvent event;
CSession session;
Session session;
public ExitedEvent(CSession s, MIInferiorExitEvent e) {
public ExitedEvent(Session s, MIInferiorExitEvent e) {
session = s;
event = e;
}

6
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/MemoryChangedEvent.java
View file

@ -9,7 +9,7 @@ import java.util.List;
import org.eclipse.cdt.debug.core.cdi.event.ICDIMemoryChangedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.cdi.model.MemoryBlock;
import org.eclipse.cdt.debug.mi.core.event.MIMemoryChangedEvent;
@ -17,11 +17,11 @@ import org.eclipse.cdt.debug.mi.core.event.MIMemoryChangedEvent;
*/
public class MemoryChangedEvent implements ICDIMemoryChangedEvent {
CSession session;
Session session;
MemoryBlock source;
MIMemoryChangedEvent miMem;
public MemoryChangedEvent(CSession s, MemoryBlock block, MIMemoryChangedEvent mem) {
public MemoryChangedEvent(Session s, MemoryBlock block, MIMemoryChangedEvent mem) {
session = s;
source = block;
miMem = mem;

6
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/event/ResumedEvent.java
View file

@ -7,17 +7,17 @@ package org.eclipse.cdt.debug.mi.core.cdi.event;
import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.mi.core.cdi.CSession;
import org.eclipse.cdt.debug.mi.core.cdi.Session;
import org.eclipse.cdt.debug.mi.core.event.MIRunningEvent;
/**
*/
public class ResumedEvent implements ICDIResumedEvent {
CSession session;
Session session;
MIRunningEvent event;
public ResumedEvent(CSession s, MIRunningEvent e) {
public ResumedEvent(Session s, MIRunningEvent e) {
session = s;
event = e;
}

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

@ -8,14 +8,14 @@ package org.eclipse.cdt.debug.mi.core.cdi.event;
import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent;
import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
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.Session;
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;
import org.eclipse.cdt.debug.mi.core.event.MIBreakpointHitEvent;
import org.eclipse.cdt.debug.mi.core.event.MIErrorEvent;
import org.eclipse.cdt.debug.mi.core.event.MIEvent;
@ -32,9 +32,9 @@ import org.eclipse.cdt.debug.mi.core.event.MIWatchpointTriggerEvent;
public class SuspendedEvent implements ICDISuspendedEvent {
MIEvent event;
CSession session;
Session session;
public SuspendedEvent(CSession s, MIEvent e) {
public SuspendedEvent(Session s, MIEvent e) {
session = s;
event = e;
}
@ -64,7 +64,7 @@ public class SuspendedEvent implements ICDISuspendedEvent {
* @see org.eclipse.cdt.debug.core.cdi.event.ICDIEvent#getSource()
*/
public ICDIObject getSource() {
CTarget target = session.getCTarget();
ICDITarget target = session.getCurrentTarget();
// We can send the target as the Source. CDI
// Will assume that all threads are supended for this.
// This is true for gdb when it suspend the inferior