Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-02-22 18:19:02 +0000
committereutarass2010-02-22 18:19:02 +0000
commit4964b236049b5d07a21c1cf2ce1b20a0c624d567 (patch)
treeaf60be954c90030d73c4bf1cb703d064824d11aa /plugins/org.eclipse.tm.tcf.dsf
parente85adcdb0929eebd3adc3a75795acc850034325f (diff)
downloadorg.eclipse.tcf-4964b236049b5d07a21c1cf2ce1b20a0c624d567.tar.gz
org.eclipse.tcf-4964b236049b5d07a21c1cf2ce1b20a0c624d567.tar.xz
org.eclipse.tcf-4964b236049b5d07a21c1cf2ce1b20a0c624d567.zip
Work in progress: more TCF value-add support - all tests have passed when connecting to a target through TCF symbols server value-add.
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.dsf')
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java18
-rw-r--r--plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java3
2 files changed, 3 insertions, 18 deletions
diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java
index 0f84629d7..0bcacf4ee 100644
--- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java
+++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFRegisters.java
@@ -395,7 +395,6 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d
final IDMContext[] parents;
Map<String,ObjectDMC> dmc_pool = new HashMap<String,ObjectDMC>();;
- boolean disposed;
public RegisterChildrenCache(IChannel channel, String id, IDMContext[] parents) {
super(channel);
@@ -410,18 +409,16 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d
}
}
- void dispose() {
- assert !disposed;
- reset();
+ @Override
+ public void dispose() {
+ super.dispose();
for (ObjectDMC dmc : dmc_pool.values()) dmc.dispose();
dmc_pool.clear();
- disposed = true;
}
@Override
public boolean startDataRetrieval() {
assert command == null;
- assert !disposed;
if (tcf_reg_service == null) {
reset(null);
return true;
@@ -484,8 +481,6 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d
final org.eclipse.tm.tcf.services.IRegisters.RegistersContext context;
final String fmt;
- boolean disposed;
-
public RegisterValueCache(IChannel channel,
org.eclipse.tm.tcf.services.IRegisters.RegistersContext context, String fmt) {
super(channel);
@@ -498,7 +493,6 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d
assert command == null;
assert tcf_reg_service != null;
assert context != null;
- assert !disposed;
command = context.get(new org.eclipse.tm.tcf.services.IRegisters.DoneGet() {
public void doneGet(IToken token, Exception err, byte[] value) {
if (command != token) return;
@@ -536,12 +530,6 @@ public class TCFDSFRegisters extends AbstractDsfService implements org.eclipse.d
});
return false;
}
-
- void dispose() {
- assert !disposed;
- reset();
- disposed = true;
- }
}
private static class RegisterGroupChangedEvent extends AbstractDMEvent<IRegisterGroupDMContext>
diff --git a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java
index c7e10f766..f002f1f0f 100644
--- a/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java
+++ b/plugins/org.eclipse.tm.tcf.dsf/src/org/eclipse/tm/internal/tcf/dsf/services/TCFDSFStack.java
@@ -262,9 +262,6 @@ public class TCFDSFStack extends AbstractDsfService implements IStack {
dmc.source_cache.reset();
}
}
-
- void dispose() {
- }
}
private final IChannel channel;

Back to the top