More fixes

3 files changed, 16 insertions, 8 deletions

diff --git a/java/src/IceGrid/RegistryObserverI.java b/java/src/IceGrid/RegistryObserverI.java
index de9e5a084e4..7e8b2a1f6c2 100755
--- a/java/src/IceGrid/RegistryObserverI.java
+++ b/java/src/IceGrid/RegistryObserverI.java
@@ -13,9 +13,10 @@ import javax.swing.SwingUtilities;
 class RegistryObserverI extends _RegistryObserverDisp

 {

 

-    RegistryObserverI(SessionKeeper sessionKeeper, Model model)

+    RegistryObserverI(SessionKeeper sessionKeeper, StatusBar statusBar, Model model)

     {

 	_sessionKeeper = sessionKeeper;

+	_statusBar = statusBar;

 	_model = model;

     }

 

@@ -50,6 +51,7 @@ class RegistryObserverI extends _RegistryObserverDisp
 	if(_initialized)

 	{

 	    _model.registryInit(_serial, _applications, _nodesUp);

+	    _statusBar.setText("Connected; initialized (" + _serial + ")"); 

 	}

 	else

 	{

@@ -78,6 +80,8 @@ class RegistryObserverI extends _RegistryObserverDisp
 		    if(_model.updateSerial(serial))

 		    {

 			_model.applicationAdded(desc);

+			_statusBar.setText("Connected; application '" 

+					   + desc.name + "' added (" + serial + ")"); 

 		    }

 		    else

 		    {

@@ -98,6 +102,8 @@ class RegistryObserverI extends _RegistryObserverDisp
 		    if(_model.updateSerial(serial))

 		    {

 			_model.applicationRemoved(name);

+			_statusBar.setText("Connected; application '" 

+					   + name + "' removed (" + serial + ")"); 

 		    }

 		    else

 		    {

@@ -118,11 +124,13 @@ class RegistryObserverI extends _RegistryObserverDisp
 		    if(_model.updateSerial(serial))

 		    {

 			_model.applicationSynced(desc);

+			_statusBar.setText("Connected; application '" 

+					   + desc.name + "' sync-ed (" + serial + ")"); 

 		    }

 		    else

 		    {

 			_sessionKeeper.sessionLost(

-			    "Received application update (application synced) out of sequence");

+			    "Received application update (application sync-ed) out of sequence");

 		    }

 		}

 	    });

@@ -138,6 +146,8 @@ class RegistryObserverI extends _RegistryObserverDisp
 		    if(_model.updateSerial(serial))

 		    {

 			_model.applicationUpdated(desc);

+			_statusBar.setText("Connected; application '" 

+					   + desc.name + "' updated (" + serial + ")"); 

 		    }

 		    else

 		    {

@@ -158,8 +168,10 @@ class RegistryObserverI extends _RegistryObserverDisp
 

     }

 

-    private Model _model;

     private SessionKeeper _sessionKeeper;

+    private StatusBar _statusBar;

+    private Model _model;

+ 

     private boolean _initialized = false;

     

     //

diff --git a/java/src/IceGrid/SessionKeeper.java b/java/src/IceGrid/SessionKeeper.java
index 736766113c0..99c9fee8d51 100755
--- a/java/src/IceGrid/SessionKeeper.java
+++ b/java/src/IceGrid/SessionKeeper.java
@@ -538,7 +538,7 @@ class SessionKeeper
 	    _nodeObserverIdentity.category = "nodeObserver";

 

 	    RegistryObserverI registryObserverServant = new RegistryObserverI(

-		this, _model);

+		this, _statusBar, _model);

 

 	    RegistryObserverPrx registryObserver = 

 		RegistryObserverPrxHelper.uncheckedCast(

diff --git a/java/src/IceGrid/TreeNode/ApplicationViewRoot.java b/java/src/IceGrid/TreeNode/ApplicationViewRoot.java
index f936f35637f..8cfe46713e4 100755
--- a/java/src/IceGrid/TreeNode/ApplicationViewRoot.java
+++ b/java/src/IceGrid/TreeNode/ApplicationViewRoot.java
@@ -78,8 +78,6 @@ public class ApplicationViewRoot extends Parent
 

     public void applicationSynced(ApplicationDescriptor desc)

     {

-	System.err.println("applicationSynced " + desc.name);

-

 	applicationRemoved(desc.name, false);

 	Application child = applicationAdded(desc, false);

 	child.fireStructureChangedEvent(this);

@@ -87,8 +85,6 @@ public class ApplicationViewRoot extends Parent
     

     public void applicationUpdated(ApplicationUpdateDescriptor desc)

     {

-	System.err.println("applicationUpdated " + desc.name);

-

 	Application application = (Application)findChild(desc.name);

 	application.update(desc);

     }