fixed various IceGridGUI bugs

Conflicts:

15 files changed, 56 insertions, 5 deletions

diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 0463e1e5cbf..0e5c52ab490 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -555,6 +555,11 @@ class AdapterEditor extends CommunicatorChildEditor
         _applyButton.setEnabled(adapter.isEphemeral());
         _discardButton.setEnabled(adapter.isEphemeral());         
         detectUpdates(true);
+
+        if(adapter.isEphemeral())
+        {
+            updated();
+        }
     }
 
     Adapter getAdapter()
diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java
index b937cd96ba8..5bb7078ca10 100755
--- a/java/src/IceGridGUI/Application/DbEnvEditor.java
+++ b/java/src/IceGridGUI/Application/DbEnvEditor.java
@@ -152,6 +152,11 @@ class DbEnvEditor extends CommunicatorChildEditor
         _applyButton.setEnabled(dbEnv.isEphemeral());
         _discardButton.setEnabled(dbEnv.isEphemeral());   
         detectUpdates(true);
+
+        if(dbEnv.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private DbEnv getDbEnv()
diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/Application/Editor.java
index cb3308c0111..d460f0dc863 100755
--- a/java/src/IceGridGUI/Application/Editor.java
+++ b/java/src/IceGridGUI/Application/Editor.java
@@ -87,6 +87,8 @@ public class Editor extends EditorBase
 
     protected void discardUpdate()
     {
+        Root root = _target.getRoot();
+
         if(_target.isEphemeral())
         {
             _target.delete();
@@ -95,6 +97,7 @@ public class Editor extends EditorBase
         {
             _target.getCoordinator().getCurrentTab().showNode(_target);
         }
+        root.cancelEdit();
     }
 
     protected void appendProperties(DefaultFormBuilder builder)
diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java
index 1260456a360..748d12679ed 100755
--- a/java/src/IceGridGUI/Application/Node.java
+++ b/java/src/IceGridGUI/Application/Node.java
@@ -670,6 +670,7 @@ class Node extends TreeNode implements PropertySetParent
             update.variables = _descriptor.variables;
             update.removeVariables = new String[0];
             update.loadFactor = new IceGrid.BoxedString(_descriptor.loadFactor);
+            update.description = new IceGrid.BoxedString(_descriptor.description);
         }
         else
         {
diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java
index b8ca49a9302..913cf36be0a 100755
--- a/java/src/IceGridGUI/Application/NodeEditor.java
+++ b/java/src/IceGridGUI/Application/NodeEditor.java
@@ -258,6 +258,10 @@ class NodeEditor extends Editor
         _applyButton.setEnabled(node.isEphemeral());
         _discardButton.setEnabled(node.isEphemeral());
         detectUpdates(true);
+        if(node.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private JTextField _name = new JTextField(20);
diff --git a/java/src/IceGridGUI/Application/PlainServerEditor.java b/java/src/IceGridGUI/Application/PlainServerEditor.java
index d2859d1339a..12d365fd01d 100755
--- a/java/src/IceGridGUI/Application/PlainServerEditor.java
+++ b/java/src/IceGridGUI/Application/PlainServerEditor.java
@@ -70,6 +70,10 @@ class PlainServerEditor extends AbstractServerEditor
         _applyButton.setEnabled(server.isEphemeral());
         _discardButton.setEnabled(server.isEphemeral());          
         detectUpdates(true);
+        if(server.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private ServerSubEditor _subEditor;
diff --git a/java/src/IceGridGUI/Application/PlainServiceEditor.java b/java/src/IceGridGUI/Application/PlainServiceEditor.java
index f2487413ba8..295a827f200 100755
--- a/java/src/IceGridGUI/Application/PlainServiceEditor.java
+++ b/java/src/IceGridGUI/Application/PlainServiceEditor.java
@@ -84,6 +84,10 @@ class PlainServiceEditor extends CommunicatorChildEditor
         _applyButton.setEnabled(service.isEphemeral());
         _discardButton.setEnabled(service.isEphemeral());         
         detectUpdates(true);
+        if(service.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private ServiceSubEditor _subEditor;
diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/Application/PropertySetEditor.java
index bad0ca590d2..b7877bd9621 100755
--- a/java/src/IceGridGUI/Application/PropertySetEditor.java
+++ b/java/src/IceGridGUI/Application/PropertySetEditor.java
@@ -243,6 +243,10 @@ class PropertySetEditor extends Editor
         _applyButton.setEnabled(nps.isEphemeral());
         _discardButton.setEnabled(nps.isEphemeral());     
         detectUpdates(true);
+        if(nps.isEphemeral())
+        {
+            updated();
+        }
     }
 
     protected JComponent getIdComponent()
diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
index 18477b511fd..7b4afef8cc5 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
@@ -407,6 +407,10 @@ class ReplicaGroupEditor extends Editor
         _applyButton.setEnabled(replicaGroup.isEphemeral());
         _discardButton.setEnabled(replicaGroup.isEphemeral());    
         detectUpdates(true);
+        if(replicaGroup.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private ReplicaGroup getReplicaGroup()
diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java
index 572f2e00897..c1b9427e85e 100755
--- a/java/src/IceGridGUI/Application/Root.java
+++ b/java/src/IceGridGUI/Application/Root.java
@@ -1174,7 +1174,11 @@ public class Root extends ListTreeNode
                 boolean ok = update(d);
                 assert ok;
             }
-            _concurrentUpdates.clear();
+            if(!_concurrentUpdates.isEmpty())
+            {
+                _applicationPane.refresh();
+                _concurrentUpdates.clear();
+            }
 
             _coordinator.getSaveAction().setEnabled(false);
             _coordinator.getDiscardUpdatesAction().setEnabled(false);
diff --git a/java/src/IceGridGUI/Application/ServerInstanceEditor.java b/java/src/IceGridGUI/Application/ServerInstanceEditor.java
index 44affdcbaed..5da277628fc 100755
--- a/java/src/IceGridGUI/Application/ServerInstanceEditor.java
+++ b/java/src/IceGridGUI/Application/ServerInstanceEditor.java
@@ -217,6 +217,10 @@ class ServerInstanceEditor extends AbstractServerEditor
         _applyButton.setEnabled(server.isEphemeral());
         _discardButton.setEnabled(server.isEphemeral());          
         detectUpdates(true);
+        if(server.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private JComboBox _template = new JComboBox();
diff --git a/java/src/IceGridGUI/Application/ServerTemplateEditor.java b/java/src/IceGridGUI/Application/ServerTemplateEditor.java
index 91a7203d926..2b43d966d65 100755
--- a/java/src/IceGridGUI/Application/ServerTemplateEditor.java
+++ b/java/src/IceGridGUI/Application/ServerTemplateEditor.java
@@ -58,6 +58,10 @@ class ServerTemplateEditor extends TemplateEditor
         _applyButton.setEnabled(t.isEphemeral());
         _discardButton.setEnabled(t.isEphemeral());       
         detectUpdates(true);
+        if(t.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private ServerSubEditor _subEditor;
diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
index bf55a13611a..34a431d13d8 100755
--- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
+++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
@@ -228,6 +228,10 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
         _applyButton.setEnabled(service.isEphemeral());
         _discardButton.setEnabled(service.isEphemeral());         
         detectUpdates(true);
+        if(service.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private JComboBox _template = new JComboBox();
diff --git a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java
index 8d37cc803f5..3c7e9f8b5d4 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java
@@ -58,6 +58,10 @@ class ServiceTemplateEditor extends TemplateEditor
         _applyButton.setEnabled(t.isEphemeral());
         _discardButton.setEnabled(t.isEphemeral());       
         detectUpdates(true);
+        if(t.isEphemeral())
+        {
+            updated();
+        }
     }
 
     private ServiceSubEditor _subEditor;
diff --git a/java/src/IceGridGUI/TreeNodeBase.java b/java/src/IceGridGUI/TreeNodeBase.java
index c25becaadcd..3163e1939dd 100755
--- a/java/src/IceGridGUI/TreeNodeBase.java
+++ b/java/src/IceGridGUI/TreeNodeBase.java
@@ -303,15 +303,12 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer
 
     protected void childrenChanged(java.util.List children, DefaultTreeModel treeModel)
     {
-        int[] indices = new int[children.size()];
-        int i = 0;
         java.util.Iterator p = children.iterator();
         while(p.hasNext())
         {
             TreeNodeBase child = (TreeNodeBase)p.next();
-            indices[i++] = getIndex(child);
+            treeModel.nodeStructureChanged(child);
         }
-        treeModel.nodesChanged(this, indices);
     }
     
     public int[] resize(int[] array, int size)