Fixed bugs #1640 and #1641

1 files changed, 35 insertions, 1 deletions

diff --git a/java/src/IceGridGUI/AdapterObserverI.java b/java/src/IceGridGUI/AdapterObserverI.java
index 85c429eea37..8a7a85cd3a4 100644
--- a/java/src/IceGridGUI/AdapterObserverI.java
+++ b/java/src/IceGridGUI/AdapterObserverI.java
@@ -13,14 +13,32 @@ import IceGrid.*;
 
 class AdapterObserverI extends _AdapterObserverDisp
 {
-
     AdapterObserverI(Coordinator coordinator)
     {
 	_coordinator = coordinator;
+	_trace = coordinator.traceObservers();
     }
 
     public synchronized void adapterInit(final AdapterInfo[] adapters, Ice.Current current)
     {
+	if(_trace)
+	{
+	    if(adapters.length == 0)
+	    {
+		_coordinator.traceObserver("adapterInit (no adapter)");
+	    }
+	    else
+	    {
+		String names = "";
+		for(int i = 0; i < adapters.length; ++i)
+		{
+		    names += " " + adapters[i].id;
+		}
+		
+		_coordinator.traceObserver("adapterInit for adapters" + names);
+	    }
+	}
+
 	SwingUtilities.invokeLater(new Runnable() 
 	    {
 		public void run() 
@@ -32,6 +50,11 @@ class AdapterObserverI extends _AdapterObserverDisp
 
     public void adapterAdded(final AdapterInfo info, Ice.Current current)
     {
+	if(_trace)
+	{
+	    _coordinator.traceObserver("adapterAdded for adapter " + info.id);
+	}
+
 	SwingUtilities.invokeLater(new Runnable() 
 	    {
 		public void run() 
@@ -43,6 +66,11 @@ class AdapterObserverI extends _AdapterObserverDisp
 
     public void adapterUpdated(final AdapterInfo info, Ice.Current current)
     {
+	if(_trace)
+	{
+	    _coordinator.traceObserver("adapterUpdated for adapter " + info.id);
+	}
+
 	SwingUtilities.invokeLater(new Runnable() 
 	    {
 		public void run() 
@@ -54,6 +82,11 @@ class AdapterObserverI extends _AdapterObserverDisp
 
     public void adapterRemoved(final String id, Ice.Current current)
     {
+	if(_trace)
+	{
+	    _coordinator.traceObserver("adapterRemoved for adapter " + id);
+	}
+
 	SwingUtilities.invokeLater(new Runnable() 
 	    {
 		public void run() 
@@ -64,4 +97,5 @@ class AdapterObserverI extends _AdapterObserverDisp
     }
 
     private final Coordinator _coordinator;
+    private final boolean _trace;
 };