Down with ant. From the gradle to the grave.

1 files changed, 0 insertions, 1340 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java
deleted file mode 100644
index 6625687ebbb..00000000000
--- a/java/src/IceGridGUI/LiveDeployment/Root.java
+++ /dev/null
@@ -1,1340 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package IceGridGUI.LiveDeployment;
-
-import java.awt.Component;
-import java.awt.Cursor;
-
-import javax.swing.Icon;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultTreeModel;
-
-import java.util.prefs.Preferences;
-
-import IceGrid.*;
-import IceGridGUI.*;
-
-//
-// The Root node of the Live Deployment view
-//
-public class Root extends ListArrayTreeNode
-{
-
-    //
-    // A custom tree model to filter tree views.
-    //
-    class FilteredTreeModel extends DefaultTreeModel
-    {
-        public FilteredTreeModel(TreeNode root)
-        {
-            super(root, true);
-        }
-
-        public void resetFilters()
-        {
-            Object[] path = { root };
-            int[] childIndices  = new int[root.getChildCount()];
-            Object[] children  = new Object[root.getChildCount()];
-            for(int i = 0; i < root.getChildCount(); i++)
-            {
-                childIndices[i] = i;
-                children[i] = root.getChildAt(i);
-            }
-            fireTreeStructureChanged(this, path, childIndices, children);
-        }
-
-        @Override
-        public int
-        getChildCount(Object parent)
-        {
-            if(!filterEnabled())
-            {
-                return super.getChildCount(parent);
-            }
-            int p = super.getChildCount(parent);
-            int q = 0;
-            for (int j = 0; j < p; j++)
-            {
-                TreeNode node = (TreeNode)super.getChild(parent, j);
-                if(matchFilter(node))
-                {
-                    q++;
-                }
-            }
-            return q;
-        }
-
-        @Override
-        public Object getChild(Object parent, int index)
-        {
-            if(!filterEnabled())
-            {
-                return super.getChild(parent, index);
-            }
-            Object child = null;
-            int p = 0;
-            int q = super.getChildCount(parent);
-            for (int j = 0; j < q ; ++j)
-            {
-                TreeNode node = (TreeNode)super.getChild(parent, j);
-                if(!matchFilter(node))
-                {
-                    continue;
-                }
-
-                if(p == index)
-                {
-                    child = node;
-                    break;
-                }
-                p++;
-                if(p > index)
-                {
-                    break;
-                }
-            }
-            return child;
-        }
-    }
-
-    private boolean matchFilter(TreeNode n)
-    {
-        if(_applicationNameFilter == null)
-        {
-            return true;
-        }
-
-        if(n instanceof Server)
-        {
-            Server server = (Server)n;
-            if(!_applicationNameFilter.equals(server.getApplication().name))
-            {
-                return false;
-            }
-        }
-        else if(n instanceof Node)
-        {
-            return ((Node)n).hasServersFromApplication(_applicationNameFilter);
-        }
-        return true;
-    }
-
-    private boolean filterEnabled()
-    {
-        return _applicationNameFilter != null;
-    }
-
-    public void setApplicationNameFilter(String name)
-    {
-        _applicationNameFilter = name;
-        _label = _instanceName + " (" + _replicaName + ")";
-        if(_applicationNameFilter != null)
-        {
-            _label += " - " + _applicationNameFilter;
-        }
-        _treeModel.resetFilters();
-    }
-
-    public String getApplicationNameFilter()
-    {
-        return _applicationNameFilter;
-    }
-    
-    @Override
-    public void clearShowIceLogDialog()
-    {
-        _showIceLogDialog = null;
-    }
-
-    public Root(Coordinator coordinator)
-    {
-        super(null, "Root", 2);
-        _coordinator = coordinator;
-        _childrenArray[0] = _slaves;
-        _childrenArray[1] = _nodes;
-        _messageSizeMax = computeMessageSizeMax(_coordinator.getProperties().getPropertyAsInt("Ice.MessageSizeMax"));
-
-        _treeModel = new FilteredTreeModel(this);
-        _tree = new JTree();
-        _tree.setModel(_treeModel);
-        _addObjectDialog = new ObjectDialog(this, false);
-        _showObjectDialog = new ObjectDialog(this, true);
-
-        _tree.addTreeWillExpandListener(new javax.swing.event.TreeWillExpandListener()
-            {
-                @Override
-                public void treeWillExpand(javax.swing.event.TreeExpansionEvent event)
-                {
-                    //
-                    // Fetch metrics when Server node is expanded.
-                    //
-                    TreeNode node = (TreeNode)event.getPath().getLastPathComponent();
-                    if(node instanceof Server)
-                    {
-                        ((Server)node).fetchMetricsViewNames();
-                    }
-                    else if(node instanceof Service)
-                    {
-                        ((Service)node).fetchMetricsViewNames();
-                    }
-                }
-
-                @Override
-                public void treeWillCollapse(javax.swing.event.TreeExpansionEvent event)
-                    throws javax.swing.tree.ExpandVetoException
-                {
-                    if(event.getPath().getLastPathComponent() == Root.this)
-                    {
-                        throw new javax.swing.tree.ExpandVetoException(event);
-                    }
-                }
-            });
-
-        loadLogPrefs();
-    }
-
-    @Override
-    public boolean[] getAvailableActions()
-    {
-        boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT];
-        actions[ADD_OBJECT] = _coordinator.connectedToMaster();
-        actions[SHUTDOWN_REGISTRY] = true;
-        actions[RETRIEVE_ICE_LOG] = true;
-        actions[RETRIEVE_STDOUT] = true;
-        actions[RETRIEVE_STDERR] = true;
-        return actions;
-    }
-
-    @Override
-    public void shutdownRegistry()
-    {
-        final String prefix = "Shutting down registry '" + _replicaName + "'...";
-        final String errorTitle = "Failed to shutdown " + _replicaName;
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = _coordinator.getAdmin();
-            admin.begin_shutdownRegistry(_replicaName, new Ice.Callback()
-                {
-                    @Override
-                    public void completed(final Ice.AsyncResult r)
-                    {
-                        try
-                        {
-                            admin.end_shutdownRegistry(r);
-                            amiSuccess(prefix);
-                        }
-                        catch(Ice.UserException ex)
-                        {
-                            amiFailure(prefix, errorTitle, ex);
-                        }
-                        catch(Ice.LocalException ex)
-                        {
-                            amiFailure(prefix, errorTitle, ex.toString());
-                        }
-                    }
-                });
-        }
-        catch(Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-    }
-
-    public ApplicationDescriptor getApplicationDescriptor(String name)
-    {
-        ApplicationInfo app = _infoMap.get(name);
-        if(app == null)
-        {
-            return null;
-        }
-        else
-        {
-            return app.descriptor;
-        }
-    }
-
-    public Object[] getApplicationNames()
-    {
-        return _infoMap.keySet().toArray();
-    }
-
-    public Object[] getPatchableApplicationNames()
-    {
-        java.util.List<String> result = new java.util.ArrayList<String>();
-
-        for(java.util.Map.Entry<String, ApplicationInfo> p : _infoMap.entrySet())
-        {
-            ApplicationInfo app = p.getValue();
-            if(app.descriptor.distrib.icepatch.length() > 0)
-            {
-                result.add(p.getKey());
-            }
-        }
-        return result.toArray();
-    }
-
-    public java.util.SortedMap<String, String> getApplicationMap()
-    {
-        java.util.SortedMap<String, String> r = new java.util.TreeMap<String, String>();
-
-        for(java.util.Map.Entry<String, ApplicationInfo> p : _infoMap.entrySet())
-        {
-            ApplicationInfo app = p.getValue();
-
-            r.put(p.getKey(), java.text.DateFormat.getDateTimeInstance().format(new java.util.Date(app.updateTime)));
-        }
-        return r;
-    }
-
-    @Override
-    public Editor getEditor()
-    {
-        if(_editor == null)
-        {
-            _editor = new RegistryEditor();
-        }
-        _editor.show(this);
-        return _editor;
-    }
-
-    @Override
-    public Component getTreeCellRendererComponent(
-        JTree tree,
-        Object value,
-        boolean sel,
-        boolean expanded,
-        boolean leaf,
-        int row,
-        boolean hasFocus)
-    {
-        if(_cellRenderer == null)
-        {
-            //
-            // Initialization
-            //
-            _cellRenderer = new DefaultTreeCellRenderer();
-
-            Icon icon = Utils.getIcon("/icons/16x16/registry.png");
-            _cellRenderer.setOpenIcon(icon);
-            _cellRenderer.setClosedIcon(icon);
-        }
-
-        return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-    }
-
-    public void applicationInit(String instanceName, String replicaName, java.util.List<ApplicationInfo> applications)
-    {
-        _instanceName = instanceName;
-        _replicaName = replicaName;
-        _label = instanceName + " (" + _replicaName + ")";
-        _tree.setRootVisible(true);
-
-        for(ApplicationInfo p : applications)
-        {
-            applicationAdded(p);
-        }
-        _treeModel.resetFilters();
-    }
-
-    //
-    // Called when the session to the IceGrid Registry is closed
-    //
-    public void clear()
-    {
-        _adapters.clear();
-        _objects.clear();
-        _replicaName = null;
-        _applicationNameFilter = null;
-
-        _infoMap.clear();
-        _nodes.clear();
-        _slaves.clear();
-        _treeModel.nodeStructureChanged(this);
-        _tree.setRootVisible(false);
-    }
-
-    public void patch(final String applicationName)
-    {
-        int shutdown = JOptionPane.showConfirmDialog(
-            _coordinator.getMainFrame(),
-            "You are about to install or refresh your"
-            + " application distribution.\n"
-            + " Do you want shut down all servers affected by this update?",
-            "Patch Confirmation",
-            JOptionPane.YES_NO_CANCEL_OPTION);
-
-        if(shutdown == JOptionPane.CANCEL_OPTION)
-        {
-            return;
-        }
-
-        final String prefix = "Patching application '" + applicationName + "'...";
-        final String errorTitle = "Failed to patch '" + applicationName;
-
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = _coordinator.getAdmin();
-            admin.begin_patchApplication(applicationName, shutdown == JOptionPane.YES_OPTION,
-                new Ice.Callback()
-                    {
-                        @Override
-                        public void completed(final Ice.AsyncResult r)
-                        {
-                            try
-                            {
-                                admin.end_patchApplication(r);
-                                amiSuccess(prefix);
-                            }
-                            catch(Ice.UserException ex)
-                            {
-                                amiFailure(prefix, errorTitle, ex);
-                            }
-                            catch(Ice.LocalException ex)
-                            {
-                                amiFailure(prefix,  errorTitle, ex.toString());
-                            }
-                        }
-                    });
-        }
-        catch(Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-    }
-
-    public void showApplicationDetails(String appName)
-    {
-        ApplicationInfo app = _infoMap.get(appName);
-        if(app != null)
-        {
-            if(_applicationDetailsDialog == null)
-            {
-                _applicationDetailsDialog = new ApplicationDetailsDialog(this);
-            }
-
-            _applicationDetailsDialog.showDialog(app);
-        }
-    }
-
-    //
-    // From the Registry Observer:
-    //
-    public void applicationAdded(ApplicationInfo info)
-    {
-        _infoMap.put(info.descriptor.name, info);
-
-        for(java.util.Map.Entry<String, NodeDescriptor> p : info.descriptor.nodes.entrySet())
-        {
-            String nodeName = p.getKey();
-            NodeDescriptor nodeDesc = p.getValue();
-
-            Node node = findNode(nodeName);
-            if(node == null)
-            {
-                insertNode(new Node(this, info.descriptor, nodeName, nodeDesc));
-            }
-            else
-            {
-                node.add(info.descriptor, nodeDesc);
-            }
-        }
-    }
-
-    public void applicationRemoved(String name)
-    {
-        _infoMap.remove(name);
-
-        java.util.List<Node> toRemove = new java.util.LinkedList<Node>();
-        int[] toRemoveIndices = new int[_nodes.size()];
-
-        int i = 0;
-        for(int index = 0; index < _nodes.size(); ++index)
-        {
-            Node node = _nodes.get(index);
-            if(node.remove(name))
-            {
-                toRemove.add(node);
-                toRemoveIndices[i++] = _slaves.size() + index;
-            }
-        }
-
-        removeNodes(resize(toRemoveIndices, toRemove.size()), toRemove);
-    }
-
-    public void applicationUpdated(ApplicationUpdateInfo update)
-    {
-        ApplicationInfo app = _infoMap.get(update.descriptor.name);
-
-        app.updateTime = update.updateTime;
-        app.updateUser = update.updateUser;
-        app.revision = update.revision;
-
-        ApplicationDescriptor appDesc = app.descriptor;
-
-        //
-        // Update various fields of appDesc
-        //
-        if(update.descriptor.description != null)
-        {
-            appDesc.description = update.descriptor.description.value;
-        }
-        if(update.descriptor.distrib != null)
-        {
-            appDesc.distrib = update.descriptor.distrib.value;
-        }
-
-        appDesc.variables.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removeVariables));
-        appDesc.variables.putAll(update.descriptor.variables);
-        boolean variablesChanged = update.descriptor.removeVariables.length > 0 ||
-            !update.descriptor.variables.isEmpty();
-
-        //
-        // Update only descriptors (no tree node shown in this view)
-        //
-        appDesc.propertySets.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removePropertySets));
-        appDesc.propertySets.putAll(update.descriptor.propertySets);
-
-        for(String id : update.descriptor.removeReplicaGroups)
-        {
-            for(int i = 0; i < appDesc.replicaGroups.size(); ++i)
-            {
-                ReplicaGroupDescriptor rgd = appDesc.replicaGroups.get(i);
-                if(rgd.id.equals(id))
-                {
-                    appDesc.replicaGroups.remove(i);
-                    break; // for
-                }
-            }
-        }
-
-        for(ReplicaGroupDescriptor newRgd : update.descriptor.replicaGroups)
-        {
-            boolean replaced = false;
-            int i = 0;
-            while(i < appDesc.replicaGroups.size() && !replaced)
-            {
-                ReplicaGroupDescriptor oldRgd = appDesc.replicaGroups.get(i);
-
-                if(newRgd.id.equals(oldRgd.id))
-                {
-                    appDesc.replicaGroups.set(i, newRgd);
-                    replaced = true;
-                }
-                i++;
-            }
-
-            if(!replaced)
-            {
-                appDesc.replicaGroups.add(newRgd);
-            }
-        }
-
-        appDesc.serviceTemplates.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removeServiceTemplates));
-        appDesc.serviceTemplates.putAll(update.descriptor.serviceTemplates);
-
-        appDesc.serverTemplates.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removeServerTemplates));
-        appDesc.serverTemplates.putAll(update.descriptor.serverTemplates);
-
-        //
-        // Nodes
-        //
-
-        //
-        // Removal
-        //
-        appDesc.nodes.keySet().removeAll(java.util.Arrays.asList(update.descriptor.removeNodes));
-
-        for(String name : update.descriptor.removeNodes)
-        {
-            Node node = findNode(name);
-            if(node.remove(update.descriptor.name))
-            {
-                int index = getIndex(node);
-                _nodes.remove(node);
-                _treeModel.nodesWereRemoved(this, new int[]{index}, new Object[]{node});
-            }
-        }
-
-        //
-        // Add/update
-        //
-        java.util.Set<Node> freshNodes = new java.util.HashSet<Node>();
-        for(NodeUpdateDescriptor desc : update.descriptor.nodes)
-        {
-            String nodeName = desc.name;
-
-            Node node = findNode(nodeName);
-            if(node == null)
-            {
-                node = new Node(this, appDesc, desc);
-                insertNode(node);
-            }
-            else
-            {
-                node.update(appDesc, desc, variablesChanged,
-                            update.descriptor.serviceTemplates.keySet(), update.descriptor.serverTemplates.keySet());
-            }
-            freshNodes.add(node);
-        }
-
-        //
-        // Notify non-fresh nodes if needed
-        //
-        if(variablesChanged || !update.descriptor.serviceTemplates.isEmpty() ||
-           !update.descriptor.serverTemplates.isEmpty())
-        {
-            for(Node p : _nodes)
-            {
-                if(!freshNodes.contains(p))
-                {
-                    p.update(appDesc, null, variablesChanged, update.descriptor.serviceTemplates.keySet(),
-                             update.descriptor.serverTemplates.keySet());
-                }
-            }
-        }
-    }
-
-    public void adapterInit(AdapterInfo[] adapters)
-    {
-        for(AdapterInfo info : adapters)
-        {
-            _adapters.put(info.id, info);
-        }
-    }
-
-    public void adapterAdded(AdapterInfo info)
-    {
-        _adapters.put(info.id, info);
-    }
-
-    public void adapterUpdated(AdapterInfo info)
-    {
-        _adapters.put(info.id, info);
-    }
-
-    public void adapterRemoved(String id)
-    {
-        _adapters.remove(id);
-    }
-
-    public void objectInit(ObjectInfo[] objects)
-    {
-        for(ObjectInfo info : objects)
-        {
-            _objects.put(Ice.Util.identityToString(info.proxy.ice_getIdentity()), info);
-        }
-    }
-
-    public void objectAdded(ObjectInfo info)
-    {
-        _objects.put(Ice.Util.identityToString(info.proxy.ice_getIdentity()), info);
-    }
-
-    public void objectUpdated(ObjectInfo info)
-    {
-        _objects.put(Ice.Util.identityToString(info.proxy.ice_getIdentity()), info);
-    }
-
-    public void objectRemoved(Ice.Identity id)
-    {
-        _objects.remove(Ice.Util.identityToString(id));
-    }
-
-    //
-    // From the Registry Observer:
-    //
-    public void registryUp(RegistryInfo info)
-    {
-        if(info.name.equals(_replicaName))
-        {
-            _info = info;
-        }
-        else
-        {
-            Slave newSlave = new Slave(this, info, _replicaName);
-
-            int i;
-            for(i = 0; i < _slaves.size(); ++i)
-            {
-                String otherName = _slaves.get(i).toString();
-                if(info.name.compareTo(otherName) < 0)
-                {
-                    break;
-                }
-            }
-            _slaves.add(i, newSlave);
-            _treeModel.nodesWereInserted(this, new int[]{i});
-        }
-    }
-
-    public void registryDown(String name)
-    {
-        TreeNodeBase registry = find(name, _slaves);
-        if(registry != null)
-        {
-            int index = getIndex(registry);
-            _slaves.remove(registry);
-            _treeModel.nodesWereRemoved(this, new int[]{index}, new Object[]{registry});
-        }
-    }
-
-    //
-    // From the Node Observer:
-    //
-    public void nodeUp(NodeDynamicInfo updatedInfo)
-    {
-        Node node = findNode(updatedInfo.info.name);
-        if(node != null)
-        {
-            node.up(updatedInfo, true);
-        }
-        else
-        {
-            insertNode(new Node(this, updatedInfo));
-        }
-    }
-
-    public void nodeDown(String nodeName)
-    {
-        Node node = findNode(nodeName);
-        if(node != null)
-        {
-            if(node.down())
-            {
-                int index = getIndex(node);
-                _nodes.remove(node);
-                _treeModel.nodesWereRemoved(this, new int[]{index}, new Object[]{node});
-            }
-        }
-    }
-
-    public void updateServer(String nodeName, ServerDynamicInfo updatedInfo)
-    {
-        Node node = findNode(nodeName);
-        if(node != null)
-        {
-            node.updateServer(updatedInfo);
-        }
-    }
-
-    public void updateAdapter(String nodeName, AdapterDynamicInfo updatedInfo)
-    {
-        Node node = findNode(nodeName);
-        if(node != null)
-        {
-            node.updateAdapter(updatedInfo);
-        }
-    }
-
-    @Override
-    public JPopupMenu getPopupMenu()
-    {
-        LiveActions la = _coordinator.getLiveActionsForPopup();
-
-        if(_popup == null)
-        {
-            _popup = new JPopupMenu();
-            _popup.add(la.get(ADD_OBJECT));
-            _popup.addSeparator();
-            _popup.add(la.get(RETRIEVE_ICE_LOG));
-            _popup.add(la.get(RETRIEVE_STDOUT));
-            _popup.add(la.get(RETRIEVE_STDERR));
-            _popup.addSeparator();
-            _popup.add(la.get(SHUTDOWN_REGISTRY));
-        }
-
-        la.setTarget(this);
-        return _popup;
-    }
-
-    public void setSelectedNode(TreeNode node)
-    {
-        _tree.setSelectionPath(node.getPath());
-    }
-
-    public JTree getTree()
-    {
-        return _tree;
-    }
-
-    public DefaultTreeModel getTreeModel()
-    {
-        return _treeModel;
-    }
-
-    @Override
-    public Coordinator getCoordinator()
-    {
-        return _coordinator;
-    }
-
-    @Override
-    public String toString()
-    {
-        return _label;
-    }
-
-    //
-    // Check that this node is attached to the tree
-    //
-    public boolean hasNode(TreeNode node)
-    {
-        while(node != this)
-        {
-            TreeNode parent = (TreeNode)node.getParent();
-            if(parent.getIndex(node) == -1)
-            {
-                return false;
-            }
-            else
-            {
-                node = parent;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public void addObject()
-    {
-        _addObjectDialog.showDialog();
-    }
-
-    public void showObject(String proxy, String type)
-    {
-        _showObjectDialog.showDialog(proxy, type);
-    }
-
-    @Override
-    Root getRoot()
-    {
-        return this;
-    }
-
-    String getInstanceName()
-    {
-        return _instanceName;
-    }
-
-    java.util.SortedMap<String, ObjectInfo> getObjects()
-    {
-        return _objects;
-    }
-
-    java.util.SortedMap<String, AdapterInfo> getAdapters()
-    {
-        return _adapters;
-    }
-
-    RegistryInfo getRegistryInfo()
-    {
-        return _info;
-    }
-
-    void addObject(String strProxy, final String type, final JDialog dialog)
-    {
-        Ice.ObjectPrx proxy = null;
-
-        try
-        {
-            proxy = _coordinator.getCommunicator().stringToProxy(strProxy);
-        }
-        catch(Ice.LocalException e)
-        {
-            JOptionPane.showMessageDialog(
-                _coordinator.getMainFrame(),
-                "Cannot parse proxy '" + strProxy + "'",
-                "addObject failed",
-                JOptionPane.ERROR_MESSAGE);
-        }
-
-        if(proxy == null)
-        {
-            JOptionPane.showMessageDialog(
-                _coordinator.getMainFrame(),
-                "You must provide a non-null proxy",
-                "addObject failed",
-                JOptionPane.ERROR_MESSAGE);
-        }
-
-        String strIdentity = Ice.Util.identityToString(proxy.ice_getIdentity());
-
-        final String prefix = "Adding well-known object '" + strIdentity + "'...";
-        final AdminPrx admin = _coordinator.getAdmin();
-        Ice.Callback cb = new Ice.Callback()
-        {
-            @Override
-            public void completed(final Ice.AsyncResult r)
-            {
-                try
-                {
-                    if(type == null)
-                    {
-                        admin.end_addObject(r);
-                    }
-                    else
-                    {
-                        admin.end_addObjectWithType(r);
-                    }
-                    
-                    amiSuccess(prefix);
-                    
-                    SwingUtilities.invokeLater(new Runnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            dialog.setVisible(false);
-                        }
-                    });
-                }
-                catch(ObjectExistsException e)
-                {
-                    amiFailure(prefix, "addObject failed",
-                               "An object with this identity is already registered as a well-known object");
-                }
-                catch(DeploymentException ex)
-                {
-                    amiFailure(prefix, "addObject failed", "Deployment exception: " + ex.reason);
-                }
-                catch(Ice.LocalException ex)
-                {
-                    amiFailure(prefix, "addObject failed", ex.toString());
-                }
-            }
-        };
-
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            if(type == null)
-            {
-                admin.begin_addObject(proxy, cb);
-            }
-            else
-            {
-                admin.begin_addObjectWithType(proxy, type, cb);
-            }
-        }
-        catch(Ice.LocalException ex)
-        {
-            failure(prefix, "addObject failed", ex.toString());
-        }
-    }
-
-    void removeObject(String strProxy)
-    {
-        Ice.ObjectPrx proxy = _coordinator.getCommunicator().stringToProxy(strProxy);
-        Ice.Identity identity = proxy.ice_getIdentity();
-        final String strIdentity = Ice.Util.identityToString(identity);
-
-        final String prefix = "Removing well-known object '" + strIdentity + "'...";
-        final String errorTitle = "Failed to remove object '" + strIdentity + "'";
-
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = _coordinator.getAdmin();
-            admin.begin_removeObject(identity,
-                new Ice.Callback()
-                    {
-                        @Override
-                        public void completed(final Ice.AsyncResult r)
-                        {
-                            try
-                            {
-                                admin.end_removeObject(r);
-                                amiSuccess(prefix);
-                            }
-                            catch(Ice.UserException ex)
-                            {
-                                amiFailure(prefix, errorTitle, ex);
-                            }
-                            catch(Ice.LocalException ex)
-                            {
-                                amiFailure(prefix, errorTitle, ex.toString());
-                            }
-                        }
-                    });
-        }
-        catch(Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-    }
-
-    void removeAdapter(final String adapterId)
-    {
-        final String prefix = "Removing adapter '" + adapterId + "'...";
-        final String errorTitle = "Failed to remove adapter '" + adapterId + "'";
-        _coordinator.getStatusBar().setText(prefix);
-        try
-        {
-            final AdminPrx admin = _coordinator.getAdmin();
-            admin.begin_removeAdapter(adapterId, new Ice.Callback()
-                {
-                    @Override
-                    public void completed(final Ice.AsyncResult r)
-                    {
-                        try
-                        {
-                            admin.end_removeAdapter(r);
-                            amiSuccess(prefix);
-                        }
-                        catch(Ice.UserException ex)
-                        {
-                            amiFailure(prefix, errorTitle, ex);
-                        }
-                        catch(Ice.LocalException ex)
-                        {
-                            amiFailure(prefix, errorTitle, ex.toString());
-                        }
-                    }
-                });
-        }
-        catch(Ice.LocalException ex)
-        {
-            failure(prefix, errorTitle, ex.toString());
-        }
-
-    }
-
-    @Override
-    public void retrieveIceLog()
-    {
-        if(_showIceLogDialog == null)
-        {
-            final String prefix = "Retrieving Admin proxy for Registry...";
-            final String errorTitle = "Failed to retrieve Admin Proxy for Registry";
-            _coordinator.getStatusBar().setText(prefix);
-        
-            Callback_Admin_getRegistryAdmin cb = new Callback_Admin_getRegistryAdmin()
-            {
-                @Override
-                public void response(Ice.ObjectPrx prx)
-                {
-                    final Ice.LoggerAdminPrx loggerAdmin = Ice.LoggerAdminPrxHelper.uncheckedCast(prx.ice_facet("Logger"));
-                    final String title = "Registry " + _label + " Ice log";
-                    final String defaultFileName = "registry-" + _instanceName + "-" + _replicaName;
-                
-                    SwingUtilities.invokeLater(new Runnable()
-                    {
-                        @Override
-                        public void run()
-                        {
-                            success(prefix);
-                            if(_showIceLogDialog == null)
-                            {
-                                _showIceLogDialog = new ShowIceLogDialog(Root.this, title, loggerAdmin, defaultFileName, 
-                                            getLogMaxLines(), getLogInitialLines());
-                            }
-                            else
-                            {
-                                _showIceLogDialog.toFront();
-                            }
-                        }
-                    });
-                }
-                
-                @Override
-                public void exception(Ice.UserException e)
-                {
-                    amiFailure(prefix, errorTitle, e);
-                }
-
-                @Override
-                public void exception(Ice.LocalException e)
-                {
-                    amiFailure(prefix, errorTitle, e.toString());
-                }
-            };
-        
-            try
-            {
-                _coordinator.getSession().getAdmin().begin_getRegistryAdmin(_replicaName, cb);
-            }
-            catch(Ice.LocalException e)
-            {
-                failure(prefix, errorTitle, e.toString());
-            }
-        }
-        else
-        {
-            _showIceLogDialog.toFront();
-        }
-    }
-    
-    @Override
-    public void retrieveOutput(final boolean stdout)
-    {
-        getRoot().openShowLogFileDialog(new ShowLogFileDialog.FileIteratorFactory()
-            {
-                @Override
-                public FileIteratorPrx open(int count)
-                    throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException
-                {
-                    AdminSessionPrx session = _coordinator.getSession();
-
-                    FileIteratorPrx result;
-                    if(stdout)
-                    {
-                        result = session.openRegistryStdOut(_replicaName, count);
-                    }
-                    else
-                    {
-                        result = session.openRegistryStdErr(_replicaName, count);
-                    }
-                    return result;
-                }
-
-                @Override
-                public String getTitle()
-                {
-                    return "Registry " + _label + " " + (stdout ? "stdout" : "stderr");
-                }
-
-                @Override
-                public String getDefaultFilename()
-                {
-                    return _replicaName + (stdout ? ".out" : ".err");
-                }
-            });
-    }
-
-    PropertySetDescriptor findNamedPropertySet(String name, String applicationName)
-    {
-        ApplicationInfo app = _infoMap.get(applicationName);
-        return app.descriptor.propertySets.get(name);
-    }
-    
-    void addShowIceLogDialog(String title, ShowIceLogDialog dialog)
-    {
-        _showIceLogDialogMap.put(title, dialog);
-    }
-    
-    void removeShowIceLogDialog(String title)
-    {
-        _showIceLogDialogMap.remove(title);
-    }
-    
-    void openShowLogFileDialog(ShowLogFileDialog.FileIteratorFactory factory)
-    {
-        ShowLogFileDialog d = _showLogFileDialogMap.get(factory.getTitle());
-        if(d == null)
-        {
-            d = new ShowLogFileDialog(this, factory, _logMaxLines, _logMaxSize, _logInitialLines, _logMaxReadSize,
-                                  _logPeriod);
-
-            _showLogFileDialogMap.put(factory.getTitle(), d);
-        }
-        else
-        {
-            d.toFront();
-        }
-    }
-
-    void removeShowLogFileDialog(String title)
-    {
-        _showLogFileDialogMap.remove(title);
-    }
-
-    public void closeAllShowLogDialogs()
-    {
-        for(ShowIceLogDialog p : _showIceLogDialogMap.values())
-        {
-            p.close(false);
-        }
-        _showIceLogDialogMap.clear();
-        
-        for(ShowLogFileDialog p : _showLogFileDialogMap.values())
-        {
-            p.close(false);
-        }
-        _showLogFileDialogMap.clear();
-    }
-    
-    public int getMessageSizeMax()
-    {
-        return _messageSizeMax;
-    }
-
-    public void setLogPrefs(int maxLines, int maxSize, int initialLines, int maxReadSize, int period)
-    {
-        _logMaxLines = maxLines;
-        _logMaxSize = maxSize;
-        _logInitialLines = initialLines;
-        _logMaxReadSize = maxReadSize;
-        _logPeriod = period;
-
-        storeLogPrefs();
-    }
-    
-    public void setLogPrefs(int maxLines, int initialLines)
-    {
-        _logMaxLines = maxLines;
-        _logInitialLines = initialLines;
-        
-        storeLogPrefs();
-    }
-    
-    public int getLogMaxLines()
-    {
-        return _logMaxLines;
-    }
-    
-    public int getLogInitialLines()
-    {
-        return _logInitialLines;
-    }
-    
-    private void loadLogPrefs()
-    {
-        Preferences logPrefs = _coordinator.getPrefs().node("Log");
-        _logMaxLines = logPrefs.getInt("maxLines", 500);
-        _logMaxSize = logPrefs.getInt("maxSize", 20000);
-        _logInitialLines = logPrefs.getInt("initialLines", 10);
-        _logMaxReadSize = logPrefs.getInt("maxReadSize", 10000);
-        _logPeriod = logPrefs.getInt("period", 300);
-
-        if(_logMaxReadSize + 512 > _messageSizeMax)
-        {
-            _logMaxReadSize = _messageSizeMax - 512;
-        }
-    }
-
-    private void storeLogPrefs()
-    {
-        Preferences logPrefs = _coordinator.getPrefs().node("Log");
-        logPrefs.putInt("maxLines", _logMaxLines);
-        logPrefs.putInt("maxSize", _logMaxSize);
-        logPrefs.putInt("initialLines", _logInitialLines);
-        logPrefs.putInt("maxReadSize", _logMaxReadSize);
-        logPrefs.putInt("period", _logPeriod);
-    }
-
-    private Node findNode(String nodeName)
-    {
-        return (Node)find(nodeName, _nodes);
-    }
-
-    private void insertNode(Node node)
-    {
-        String nodeName = node.toString();
-        int i;
-        for(i = 0; i < _nodes.size(); ++i)
-        {
-            String otherNodeName = _nodes.get(i).toString();
-            if(nodeName.compareTo(otherNodeName) < 0)
-            {
-                break;
-            }
-        }
-
-        _nodes.add(i, node);
-        _treeModel.nodesWereInserted(this, new int[]{_slaves.size() + i});
-    }
-
-    @SuppressWarnings("rawtypes")
-    private void removeNodes(int[] toRemoveIndices, java.util.List toRemove)
-    {
-        if(toRemove.size() > 0)
-        {
-            _nodes.removeAll(toRemove);
-            _treeModel.nodesWereRemoved(this, toRemoveIndices, toRemove.toArray());
-        }
-    }
-
-    public static int computeMessageSizeMax(int num)
-    {
-        if(num <= 0)
-        {
-            num = 1024;
-        }
-
-        if(num > 0x7fffffff / 1024)
-        {
-            return 0x7fffffff;
-        }
-        else
-        {
-            return num * 1024; // num is in kilobytes, returned value in bytes
-        }
-    }
-
-    private final Coordinator _coordinator;
-    private String _instanceName = "";
-    private String _replicaName;
-
-    private final java.util.List<Node> _nodes = new java.util.LinkedList<Node>();
-    private final java.util.List<Slave> _slaves = new java.util.LinkedList<Slave>();
-
-    //
-    // Maps application name to current application info
-    //
-    private final java.util.Map<String, ApplicationInfo> _infoMap = new java.util.TreeMap<String, ApplicationInfo>();
-
-    //
-    // Map AdapterId => AdapterInfo
-    //
-    private java.util.SortedMap<String, AdapterInfo> _adapters = new java.util.TreeMap<String, AdapterInfo>();
-
-    //
-    // Map stringified identity => ObjectInfo
-    //
-    private java.util.SortedMap<String, ObjectInfo> _objects = new java.util.TreeMap<String, ObjectInfo>();
-
-    //
-    // 'this' is the root of the tree
-    //
-    private final JTree _tree;
-    private final FilteredTreeModel _treeModel;
-
-    private RegistryInfo _info;
-
-    private String _label;
-
-    private ObjectDialog _addObjectDialog;
-    private ObjectDialog _showObjectDialog;
-
-    //
-    // ShowLogFileDialog and ShowIceLogFileDialog
-    //
-    private final int _messageSizeMax;
-    
-    private final java.util.Map<String, ShowIceLogDialog> _showIceLogDialogMap = new java.util.HashMap<String, ShowIceLogDialog>();
-    private final java.util.Map<String, ShowLogFileDialog> _showLogFileDialogMap = new java.util.HashMap<String, ShowLogFileDialog>();
-   
-    int _logMaxLines;
-    int _logMaxSize;
-    int _logInitialLines;
-    int _logMaxReadSize;
-    int _logPeriod;
-    
-    private ShowIceLogDialog _showIceLogDialog;
-
-    private ApplicationDetailsDialog _applicationDetailsDialog;
-
-    static private RegistryEditor _editor;
-    static private JPopupMenu _popup;
-    static private DefaultTreeCellRenderer _cellRenderer;
-
-
-    //
-    // Application name to filter, if empty all applications are displayed.
-    //
-    private String _applicationNameFilter = null;
-}