From 3c807be4d33a23a116ef935440bc7e5bd6a00a52 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Thu, 21 Dec 2006 18:01:22 +0000
Subject: Fixed bugs #1640 and #1641

---
 java/src/IceGridGUI/Application/Root.java | 71 ++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

(limited to 'java/src/IceGridGUI/Application/Root.java')

diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java
index 2522e75b4cc..d7ac93fd9e8 100755
--- a/java/src/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/Application/Root.java
@@ -36,6 +36,8 @@ public class Root extends ListTreeNode
     {
 	super(false, null, desc.name);
 	_coordinator = coordinator;
+	_traceSaveToRegistry = coordinator.traceSaveToRegistry();
+
 	_descriptor = desc;
 
 	_file = file;
@@ -52,6 +54,7 @@ public class Root extends ListTreeNode
     {
 	super(true, null, desc.name);
 	_coordinator = coordinator;
+	_traceSaveToRegistry = coordinator.traceSaveToRegistry();
 	_descriptor = desc;
 
 	_file = null;
@@ -422,6 +425,11 @@ public class Root extends ListTreeNode
 				    {
 					public void ice_response()
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("updateApplication for application " + _id + ": success");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{	
 						    public void run() 
@@ -435,6 +443,11 @@ public class Root extends ListTreeNode
 					
 					public void ice_exception(final Ice.UserException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("updateApplication for application " + _id + ": failed");
+					    }
+					    
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -449,6 +462,11 @@ public class Root extends ListTreeNode
 					    
 					public void ice_exception(final Ice.LocalException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("updateApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -462,6 +480,11 @@ public class Root extends ListTreeNode
 
 				    };
 
+				if(_traceSaveToRegistry)
+				{
+				    _coordinator.traceSaveToRegistry("sending updateApplication for application " + _id);
+				}
+
 				_coordinator.getAdmin().updateApplication_async(cb, updateDescriptor);
 				asyncRelease = true;
 
@@ -495,6 +518,11 @@ public class Root extends ListTreeNode
 				    {
 					public void ice_response()
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("addApplication for application " + _id + ": success");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{	
 						    public void run() 
@@ -510,6 +538,11 @@ public class Root extends ListTreeNode
 					
 					public void ice_exception(final Ice.UserException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("addApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -523,6 +556,11 @@ public class Root extends ListTreeNode
 					    
 					public void ice_exception(final Ice.LocalException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("addApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -535,6 +573,11 @@ public class Root extends ListTreeNode
 
 				    };
 
+				if(_traceSaveToRegistry)
+				{
+				    _coordinator.traceSaveToRegistry("sending addApplication for application " + _id);
+				}
+
 				_coordinator.getAdmin().addApplication_async(cb, _descriptor);
 				asyncRelease = true;
 			    }
@@ -547,6 +590,11 @@ public class Root extends ListTreeNode
 				    {
 					public void ice_response()
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("syncApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{	
 						    public void run() 
@@ -582,6 +630,11 @@ public class Root extends ListTreeNode
 					
 					public void ice_exception(final Ice.UserException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("syncApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -600,6 +653,11 @@ public class Root extends ListTreeNode
 					    
 					public void ice_exception(final Ice.LocalException e)
 					{
+					    if(_traceSaveToRegistry)
+					    {
+						_coordinator.traceSaveToRegistry("syncApplication for application " + _id + ": failed");
+					    }
+
 					    SwingUtilities.invokeLater(new Runnable() 
 						{
 						    public void run() 
@@ -617,6 +675,11 @@ public class Root extends ListTreeNode
 
 				    };
 
+				if(_traceSaveToRegistry)
+				{
+				    _coordinator.traceSaveToRegistry("sending syncApplication for application " + _id);
+				}
+
 				_coordinator.getAdmin().syncApplication_async(cb, _descriptor);
 				asyncRelease = true;
 				if(_live)
@@ -634,6 +697,11 @@ public class Root extends ListTreeNode
 		    }
 		    catch(Ice.LocalException e)
 		    {
+			if(_traceSaveToRegistry)
+			{
+			    _coordinator.traceSaveToRegistry("Ice communications exception while saving application " + _id);
+			}	
+
 			JOptionPane.showMessageDialog(
 			    _coordinator.getMainFrame(),
 			    e.toString(),
@@ -1367,7 +1435,8 @@ public class Root extends ListTreeNode
 	}
     }
 
-    private Coordinator _coordinator;
+    private final Coordinator _coordinator;
+    private final boolean _traceSaveToRegistry;
 
     //
     // 'this' is the root of the tree
-- 
cgit v1.2.3