diff options
author | Jose <jose@zeroc.com> | 2012-09-28 17:03:31 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2012-09-28 17:03:31 +0200 |
commit | fa42c63bf14595e9c043bfeca32d7b5646b6b982 (patch) | |
tree | 0b8c8fc682a43f6c42a4f4fcc2fe4001a9a67597 /java/src/IceGridGUI/LiveDeployment/MetricsView.java | |
parent | updates (diff) | |
parent | Added timestamp parameter to getMetricsView, support for metrics in C# and Ja... (diff) | |
download | ice-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/MetricsView.java')
-rw-r--r-- | java/src/IceGridGUI/LiveDeployment/MetricsView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsView.java b/java/src/IceGridGUI/LiveDeployment/MetricsView.java index 2b25f47fb69..63de78c90e1 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsView.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsView.java @@ -115,7 +115,8 @@ class MetricsView extends TreeNode 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) { SwingUtilities.invokeLater(new Runnable() { |