summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/LiveDeployment/GraphView.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-09-28 17:03:31 +0200
committerJose <jose@zeroc.com>2012-09-28 17:03:31 +0200
commitfa42c63bf14595e9c043bfeca32d7b5646b6b982 (patch)
tree0b8c8fc682a43f6c42a4f4fcc2fe4001a9a67597 /java/src/IceGridGUI/LiveDeployment/GraphView.java
parentupdates (diff)
parentAdded timestamp parameter to getMetricsView, support for metrics in C# and Ja... (diff)
downloadice-fa42c63bf14595e9c043bfeca32d7b5646b6b982.tar.bz2
ice-fa42c63bf14595e9c043bfeca32d7b5646b6b982.tar.xz
ice-fa42c63bf14595e9c043bfeca32d7b5646b6b982.zip
Merge branch 'mx' of ssh://dev.zeroc.com/home/git/ice into mx
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/GraphView.java')
-rw-r--r--java/src/IceGridGUI/LiveDeployment/GraphView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java
index a718c877b19..4b8ee00cf3a 100644
--- a/java/src/IceGridGUI/LiveDeployment/GraphView.java
+++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java
@@ -331,7 +331,8 @@ public class GraphView extends JFrame implements MetricsFieldContext
Ice.ObjectPrx admin = _coordinator.getAdmin().ice_identity(adminId);
IceMX.Callback_MetricsAdmin_getMetricsView cb = new IceMX.Callback_MetricsAdmin_getMetricsView()
{
- public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data)
+ public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data,
+ long timestamp)
{
addData(m, data, System.currentTimeMillis());
}