Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2012-01-10 14:54:24 -0500
committerEugene Tarassov2012-01-10 14:54:24 -0500
commit405c920e4161de3fafa0bb5bea21ec54d5acbd4a (patch)
tree79fb2231fb67ef256e59ea6bfc8eb8dc4a46918b
parent6a935544e30ad0dc59353e1271bfd85bc7e96d24 (diff)
parent0274cd2d87349af3abdb566ec259fbdee480e97f (diff)
downloadorg.eclipse.tcf-juno-refactoring.tar.gz
org.eclipse.tcf-juno-refactoring.tar.xz
org.eclipse.tcf-juno-refactoring.zip
Merge remote branch 'remotes/origin/master' into juno-refactoringjuno-refactoring
Conflicts: pom.xml
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF3
-rw-r--r--python/src/tcf/services/remote/ExpressionsProxy.py3
-rw-r--r--python/src/tcf/services/remote/MemoryProxy.py12
3 files changed, 11 insertions, 7 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
index 52d4d35c1..5e077e27c 100644
--- a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
com.jcraft.jsch;bundle-version="0.1.37",
org.eclipse.jsch.core;bundle-version="1.1.100",
org.eclipse.jsch.ui;bundle-version="1.1.100",
- org.eclipse.core.filesystem;bundle-version="1.3.0"
+ org.eclipse.core.filesystem;bundle-version="1.3.0",
+ org.eclipse.ui.views
Import-Package: org.eclipse.core.expressions,
org.eclipse.tcf.core;version="1.0.0",
org.eclipse.tcf.protocol;version="1.0.0",
diff --git a/python/src/tcf/services/remote/ExpressionsProxy.py b/python/src/tcf/services/remote/ExpressionsProxy.py
index 064152c01..462756f3c 100644
--- a/python/src/tcf/services/remote/ExpressionsProxy.py
+++ b/python/src/tcf/services/remote/ExpressionsProxy.py
@@ -1,5 +1,5 @@
# *******************************************************************************
-# * Copyright (c) 2011 Wind River Systems, Inc. and others.
+# * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
# * All rights reserved. This program and the accompanying materials
# * are made available under the terms of the Eclipse Public License v1.0
# * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@ from tcf.channel.Command import Command
class ExpressionsProxy(expressions.ExpressionsService):
def __init__(self, channel):
self.channel = channel
+ self.listeners = {}
def assign(self, id, value, done):
done = self._makeCallback(done)
diff --git a/python/src/tcf/services/remote/MemoryProxy.py b/python/src/tcf/services/remote/MemoryProxy.py
index 10de25cff..ebf8a2420 100644
--- a/python/src/tcf/services/remote/MemoryProxy.py
+++ b/python/src/tcf/services/remote/MemoryProxy.py
@@ -1,5 +1,5 @@
# *******************************************************************************
-# * Copyright (c) 2011 Wind River Systems, Inc. and others.
+# * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
# * All rights reserved. This program and the accompanying materials
# * are made available under the terms of the Eclipse Public License v1.0
# * which accompanies this distribution, and is available at
@@ -211,10 +211,10 @@ class ChannelEventListener(channel.EventListener):
args = channel.fromJSONSequence(data)
if name == "contextAdded":
assert len(args) == 1
- self.listener.contextAdded(_toContextArray(args[0]))
+ self.listener.contextAdded(_toContextArray(self.service, args[0]))
elif name == "contextChanged":
assert len(args) == 1
- self.listener.contextChanged(_toContextArray(args[0]))
+ self.listener.contextChanged(_toContextArray(self.service, args[0]))
elif name == "contextRemoved":
assert len(args) == 1
self.listener.contextRemoved(args[0])
@@ -227,9 +227,11 @@ class ChannelEventListener(channel.EventListener):
self.service.channel.terminate(x)
-def _toContextArray(o):
+def _toContextArray(svc, o):
if o is None: return None
- return map(MemContext, o)
+ ctx = []
+ for m in o: ctx.append(MemContext(svc, m))
+ return ctx
def _toSizeArray(o):
if o is None: return None

Back to the top