Expanded tabs into spaces

1 files changed, 354 insertions, 354 deletions

diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
index a93852cd935..d0762ed687a 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java
@@ -34,402 +34,402 @@ class ReplicaGroupEditor extends Editor
 {
     protected boolean applyUpdate(boolean refresh)
     {
-	ReplicaGroup replicaGroup = (ReplicaGroup)_target;
-	Root root = replicaGroup.getRoot();
-
-	root.disableSelectionListener();
-	try
-	{
-	    if(replicaGroup.isEphemeral())
-	    {
-		ReplicaGroups replicaGroups = (ReplicaGroups)replicaGroup.getParent();
-		writeDescriptor();
-		ReplicaGroupDescriptor descriptor = 
-		    (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
-		replicaGroup.destroy(); // just removes the child
-		
-		try
-		{
-		    replicaGroups.tryAdd(descriptor, true);
-		}
-		catch(UpdateFailedException e)
-		{
-		    //
-		    // Add back ephemeral child
-		    //
-		    try
-		    {
-			replicaGroups.insertChild(replicaGroup, true);
-		    }
-		    catch(UpdateFailedException die)
-		    {
-			assert false;
-		    }
-		    root.setSelectedNode(replicaGroup);
-		    
-		    JOptionPane.showMessageDialog(
-			root.getCoordinator().getMainFrame(),
-			e.toString(),
-			"Apply failed",
-			JOptionPane.ERROR_MESSAGE);
-		    return false;
-		}
-
-		//
-		// Success
-		//
-		_target = replicaGroups.findChildWithDescriptor(descriptor);
-		root.updated();
-	    }
-	    else if(isSimpleUpdate())
-	    {
-		writeDescriptor();
-		root.updated();
-		replicaGroup.getEditable().markModified();
-	    }
-	    else
-	    {
-		//
-		// Save to be able to rollback
-		//
-		Object savedDescriptor = replicaGroup.saveDescriptor();
-		ReplicaGroups replicaGroups = (ReplicaGroups)replicaGroup.getParent();
-		writeDescriptor();
-		ReplicaGroupDescriptor descriptor = 
-		    (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
-		
-		replicaGroups.removeChild(replicaGroup);	    
-		try
-		{
-		    replicaGroups.tryAdd(descriptor, false);
-		}
-		catch(UpdateFailedException e)
-		{
-		    //
-		    // Restore all
-		    //
-		    try
-		    {
-			replicaGroups.insertChild(replicaGroup, true);
-		    }
-		    catch(UpdateFailedException die)
-		    {
-			assert false;
-		    }
-		    replicaGroup.restoreDescriptor(savedDescriptor);
-		    root.setSelectedNode(_target);
-
-		    JOptionPane.showMessageDialog(
-			root.getCoordinator().getMainFrame(),
-			e.toString(),
-			"Apply failed",
-			JOptionPane.ERROR_MESSAGE);
-		    return false;
-		}
-		    
-		//
-		// Success
-		//
-
-		// replaced by brand new ReplicaGroup
-		replicaGroups.getEditable().
-		    removeElement(replicaGroup.getId(), 
-				  replicaGroup.getEditable(), ReplicaGroup.class); 
-
-		_target = replicaGroups.findChildWithDescriptor(descriptor);
-		root.updated();
-
-		if(refresh)
-		{
-		    root.setSelectedNode(_target);
-		}
-	    }
-	    
-	    if(refresh)
-	    {
-		root.getCoordinator().getCurrentTab().showNode(_target);
-	    }
-	    _applyButton.setEnabled(false);
-	    _discardButton.setEnabled(false);
-	    return true;
-	}
-	finally
-	{
-	    root.enableSelectionListener();
-	}
+        ReplicaGroup replicaGroup = (ReplicaGroup)_target;
+        Root root = replicaGroup.getRoot();
+
+        root.disableSelectionListener();
+        try
+        {
+            if(replicaGroup.isEphemeral())
+            {
+                ReplicaGroups replicaGroups = (ReplicaGroups)replicaGroup.getParent();
+                writeDescriptor();
+                ReplicaGroupDescriptor descriptor = 
+                    (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
+                replicaGroup.destroy(); // just removes the child
+                
+                try
+                {
+                    replicaGroups.tryAdd(descriptor, true);
+                }
+                catch(UpdateFailedException e)
+                {
+                    //
+                    // Add back ephemeral child
+                    //
+                    try
+                    {
+                        replicaGroups.insertChild(replicaGroup, true);
+                    }
+                    catch(UpdateFailedException die)
+                    {
+                        assert false;
+                    }
+                    root.setSelectedNode(replicaGroup);
+                    
+                    JOptionPane.showMessageDialog(
+                        root.getCoordinator().getMainFrame(),
+                        e.toString(),
+                        "Apply failed",
+                        JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+
+                //
+                // Success
+                //
+                _target = replicaGroups.findChildWithDescriptor(descriptor);
+                root.updated();
+            }
+            else if(isSimpleUpdate())
+            {
+                writeDescriptor();
+                root.updated();
+                replicaGroup.getEditable().markModified();
+            }
+            else
+            {
+                //
+                // Save to be able to rollback
+                //
+                Object savedDescriptor = replicaGroup.saveDescriptor();
+                ReplicaGroups replicaGroups = (ReplicaGroups)replicaGroup.getParent();
+                writeDescriptor();
+                ReplicaGroupDescriptor descriptor = 
+                    (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
+                
+                replicaGroups.removeChild(replicaGroup);            
+                try
+                {
+                    replicaGroups.tryAdd(descriptor, false);
+                }
+                catch(UpdateFailedException e)
+                {
+                    //
+                    // Restore all
+                    //
+                    try
+                    {
+                        replicaGroups.insertChild(replicaGroup, true);
+                    }
+                    catch(UpdateFailedException die)
+                    {
+                        assert false;
+                    }
+                    replicaGroup.restoreDescriptor(savedDescriptor);
+                    root.setSelectedNode(_target);
+
+                    JOptionPane.showMessageDialog(
+                        root.getCoordinator().getMainFrame(),
+                        e.toString(),
+                        "Apply failed",
+                        JOptionPane.ERROR_MESSAGE);
+                    return false;
+                }
+                    
+                //
+                // Success
+                //
+
+                // replaced by brand new ReplicaGroup
+                replicaGroups.getEditable().
+                    removeElement(replicaGroup.getId(), 
+                                  replicaGroup.getEditable(), ReplicaGroup.class); 
+
+                _target = replicaGroups.findChildWithDescriptor(descriptor);
+                root.updated();
+
+                if(refresh)
+                {
+                    root.setSelectedNode(_target);
+                }
+            }
+            
+            if(refresh)
+            {
+                root.getCoordinator().getCurrentTab().showNode(_target);
+            }
+            _applyButton.setEnabled(false);
+            _discardButton.setEnabled(false);
+            return true;
+        }
+        finally
+        {
+            root.enableSelectionListener();
+        }
     }
 
     Utils.Resolver getDetailResolver()
     {
-	Root root = _target.getRoot();
-
-	if(root.getCoordinator().substitute())
-	{
-	    return root.getResolver();
-	}
-	else
-	{
-	    return null;
-	}
+        Root root = _target.getRoot();
+
+        if(root.getCoordinator().substitute())
+        {
+            return root.getResolver();
+        }
+        else
+        {
+            return null;
+        }
     }
 
     ReplicaGroupEditor()
     {
-	_objects = new MapField(this, "Identity", "Type", true);
-	
-	//
-	// load balancing
-	//
-	_loadBalancing.addItemListener(new ItemListener()
-	    {
-		public void itemStateChanged(ItemEvent e)
-		{
-		    if(e.getStateChange() == ItemEvent.SELECTED)
-		    {
-			updated();
-
-			Object item = e.getItem();	
-			_loadSampleLabel.setVisible(item == ADAPTIVE);
-			_loadSample.setVisible(item == ADAPTIVE);
-		    }
-		}
-	    });
-	_loadBalancing.setToolTipText(
-	    "<html>Specifies how IceGrid selects adapters and return<br>"
-	    + "their endpoints when resolving a replica group ID</html>");
-
-	//
-	// Associate updateListener with various fields
-	//
-	_id.getDocument().addDocumentListener(_updateListener);
-	_id.setToolTipText("Must be unique within this IceGrid deployment");
-
-	_description.getDocument().addDocumentListener(_updateListener);
-	_description.setToolTipText(
-	    "An optional description for this replica group");
-
-	_nReplicas.getDocument().addDocumentListener(_updateListener);
-	_nReplicas.setToolTipText("<html>IceGrid returns the endpoints of "
-				  + "up to <i>number</i> adapters<br>"
-				  + "when resolving a replica group ID.<br>"
-				  + "Enter 0 to returns the endpoints of all adapters.</html>");
-
-	_loadSample.setEditable(true);
-	JTextField loadSampleTextField = (JTextField)
-	    _loadSample.getEditor().getEditorComponent();
-	loadSampleTextField.getDocument().addDocumentListener(_updateListener);
-	_loadSample.setToolTipText(
-	    "Use the load average or CPU usage over the last 1, 5 or 15 minutes?");
+        _objects = new MapField(this, "Identity", "Type", true);
+        
+        //
+        // load balancing
+        //
+        _loadBalancing.addItemListener(new ItemListener()
+            {
+                public void itemStateChanged(ItemEvent e)
+                {
+                    if(e.getStateChange() == ItemEvent.SELECTED)
+                    {
+                        updated();
+
+                        Object item = e.getItem();      
+                        _loadSampleLabel.setVisible(item == ADAPTIVE);
+                        _loadSample.setVisible(item == ADAPTIVE);
+                    }
+                }
+            });
+        _loadBalancing.setToolTipText(
+            "<html>Specifies how IceGrid selects adapters and return<br>"
+            + "their endpoints when resolving a replica group ID</html>");
+
+        //
+        // Associate updateListener with various fields
+        //
+        _id.getDocument().addDocumentListener(_updateListener);
+        _id.setToolTipText("Must be unique within this IceGrid deployment");
+
+        _description.getDocument().addDocumentListener(_updateListener);
+        _description.setToolTipText(
+            "An optional description for this replica group");
+
+        _nReplicas.getDocument().addDocumentListener(_updateListener);
+        _nReplicas.setToolTipText("<html>IceGrid returns the endpoints of "
+                                  + "up to <i>number</i> adapters<br>"
+                                  + "when resolving a replica group ID.<br>"
+                                  + "Enter 0 to returns the endpoints of all adapters.</html>");
+
+        _loadSample.setEditable(true);
+        JTextField loadSampleTextField = (JTextField)
+            _loadSample.getEditor().getEditorComponent();
+        loadSampleTextField.getDocument().addDocumentListener(_updateListener);
+        _loadSample.setToolTipText(
+            "Use the load average or CPU usage over the last 1, 5 or 15 minutes?");
     }
     
     void writeDescriptor()
     {
-	ReplicaGroupDescriptor descriptor = 
-	    (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();
-
-	descriptor.id = _id.getText().trim();
-	descriptor.description = _description.getText();
-	descriptor.objects = mapToObjectDescriptorSeq(_objects.get());
-	
-	Object loadBalancing = _loadBalancing.getSelectedItem();
-	if(loadBalancing == ORDERED)
-	{
-	    descriptor.loadBalancing =  new OrderedLoadBalancingPolicy(
-		_nReplicas.getText().trim());
-	}
-	else if(loadBalancing == RANDOM)
-	{
-	    descriptor.loadBalancing = new RandomLoadBalancingPolicy(
-		_nReplicas.getText().trim());
-	}
-	else if(loadBalancing == ROUND_ROBIN)
-	{
-	    descriptor.loadBalancing = new RoundRobinLoadBalancingPolicy(
-		_nReplicas.getText().trim());
-	}
-	else if(loadBalancing == ADAPTIVE)
-	{
-	    descriptor.loadBalancing = new AdaptiveLoadBalancingPolicy(
-		_nReplicas.getText().trim(), 
-		_loadSample.getSelectedItem().toString().trim());
-	}
-	else
-	{
-	    assert false;
-	}
-    }	    
+        ReplicaGroupDescriptor descriptor = 
+            (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();
+
+        descriptor.id = _id.getText().trim();
+        descriptor.description = _description.getText();
+        descriptor.objects = mapToObjectDescriptorSeq(_objects.get());
+        
+        Object loadBalancing = _loadBalancing.getSelectedItem();
+        if(loadBalancing == ORDERED)
+        {
+            descriptor.loadBalancing =  new OrderedLoadBalancingPolicy(
+                _nReplicas.getText().trim());
+        }
+        else if(loadBalancing == RANDOM)
+        {
+            descriptor.loadBalancing = new RandomLoadBalancingPolicy(
+                _nReplicas.getText().trim());
+        }
+        else if(loadBalancing == ROUND_ROBIN)
+        {
+            descriptor.loadBalancing = new RoundRobinLoadBalancingPolicy(
+                _nReplicas.getText().trim());
+        }
+        else if(loadBalancing == ADAPTIVE)
+        {
+            descriptor.loadBalancing = new AdaptiveLoadBalancingPolicy(
+                _nReplicas.getText().trim(), 
+                _loadSample.getSelectedItem().toString().trim());
+        }
+        else
+        {
+            assert false;
+        }
+    }       
     
     boolean isSimpleUpdate()
     {
-	ReplicaGroupDescriptor descriptor = 
-	    (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();
-	return descriptor.id.equals(_id.getText().trim());
+        ReplicaGroupDescriptor descriptor = 
+            (ReplicaGroupDescriptor)getReplicaGroup().getDescriptor();
+        return descriptor.id.equals(_id.getText().trim());
     }
 
     protected void appendProperties(DefaultFormBuilder builder)
     {
-	builder.append("Replica Group ID");
-	builder.append(_id, 3);
-	builder.nextLine();
-	
-	builder.append("Description");
-	builder.nextLine();
-	builder.append("");
-	builder.nextRow(-2);
-	CellConstraints cc = new CellConstraints();
-	JScrollPane scrollPane = new JScrollPane(_description);
-	builder.add(scrollPane, 
-		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
-	builder.nextRow(2);
-	builder.nextLine();
-
-	builder.append("Well-known Objects");
-	builder.nextLine();
-	builder.append("");
-	builder.nextLine();
-	builder.append("");
-	builder.nextLine();
-	builder.append("");
-	builder.nextRow(-6);
-	scrollPane = new JScrollPane(_objects);
-	builder.add(scrollPane, 
-		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
-	builder.nextRow(6);
-	builder.nextLine();
-
-	builder.append("Load Balancing Policy");
-	builder.append(_loadBalancing, 3);
-	builder.nextLine();
-	builder.append("How many Adapters? (0 = all)");
-	builder.append(_nReplicas, 3);
-	builder.nextLine();
-	_loadSampleLabel = builder.append("Load Sample");
-	builder.append(_loadSample, 3);
-	builder.nextLine();
+        builder.append("Replica Group ID");
+        builder.append(_id, 3);
+        builder.nextLine();
+        
+        builder.append("Description");
+        builder.nextLine();
+        builder.append("");
+        builder.nextRow(-2);
+        CellConstraints cc = new CellConstraints();
+        JScrollPane scrollPane = new JScrollPane(_description);
+        builder.add(scrollPane, 
+                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 3));
+        builder.nextRow(2);
+        builder.nextLine();
+
+        builder.append("Well-known Objects");
+        builder.nextLine();
+        builder.append("");
+        builder.nextLine();
+        builder.append("");
+        builder.nextLine();
+        builder.append("");
+        builder.nextRow(-6);
+        scrollPane = new JScrollPane(_objects);
+        builder.add(scrollPane, 
+                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+        builder.nextRow(6);
+        builder.nextLine();
+
+        builder.append("Load Balancing Policy");
+        builder.append(_loadBalancing, 3);
+        builder.nextLine();
+        builder.append("How many Adapters? (0 = all)");
+        builder.append(_nReplicas, 3);
+        builder.nextLine();
+        _loadSampleLabel = builder.append("Load Sample");
+        builder.append(_loadSample, 3);
+        builder.nextLine();
     }
 
     protected void buildPropertiesPanel()
     {
-	super.buildPropertiesPanel();
-	_propertiesPanel.setName("Replica Group Properties");
+        super.buildPropertiesPanel();
+        _propertiesPanel.setName("Replica Group Properties");
     }
 
     protected boolean validate()
     {
-	return check(new String[]{"Replica Group ID", _id.getText().trim()});
+        return check(new String[]{"Replica Group ID", _id.getText().trim()});
     }
 
 
     void show(ReplicaGroup replicaGroup)
     {
-	//
-	// Make sure everything is built
-	//
-	getProperties();
-
-	detectUpdates(false);
-	_target = replicaGroup;
-
-	Utils.Resolver resolver = getDetailResolver();
-	boolean isEditable = (resolver == null);
-	
-	ReplicaGroupDescriptor descriptor = 
-	    (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
-	
-	_id.setText(descriptor.id);
-	_id.setEditable(isEditable);
-	
-	_description.setText(
-	    Utils.substitute(descriptor.description, resolver));
-	_description.setEditable(isEditable);
-	_description.setOpaque(isEditable);
-
-	_objects.set(objectDescriptorSeqToMap(descriptor.objects), resolver, isEditable);
-
-	_loadBalancing.setEnabled(true);
-
-	if(descriptor.loadBalancing == null)
-	{
-	    _loadBalancing.setSelectedItem(RANDOM);
-	    _nReplicas.setText("0");
-	    _loadSample.setSelectedItem("1");
-	}
-	else if(descriptor.loadBalancing instanceof RandomLoadBalancingPolicy)
-	{
-	    _loadBalancing.setSelectedItem(RANDOM);
-	    _nReplicas.setText(
-		Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
-	    _loadSample.setSelectedItem("1");
-	}
-	else if(descriptor.loadBalancing instanceof OrderedLoadBalancingPolicy)
-	{
-	    _loadBalancing.setSelectedItem(ORDERED);
-	    _nReplicas.setText(
-		Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
-	    _loadSample.setSelectedItem("1");
-	}
-	else if(descriptor.loadBalancing instanceof RoundRobinLoadBalancingPolicy)
-	{
-	    _loadBalancing.setSelectedItem(ROUND_ROBIN);
-	    _nReplicas.setText(
-		Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
-	    _loadSample.setSelectedItem("1");
-	}
-	else if(descriptor.loadBalancing instanceof AdaptiveLoadBalancingPolicy)
-	{
-	    _loadBalancing.setSelectedItem(ADAPTIVE);
-	    _nReplicas.setText(
-		Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
-
-	    _loadSample.setSelectedItem(
-		Utils.substitute(
-		    ((AdaptiveLoadBalancingPolicy)descriptor.loadBalancing).loadSample,
-		    resolver));
-	}
-	else
-	{
-	    assert false;
-	}
-	_nReplicas.setEditable(isEditable);
-	_loadSample.setEditable(isEditable);
-	_loadBalancing.setEnabled(isEditable);
-
-	_applyButton.setEnabled(replicaGroup.isEphemeral());
-	_discardButton.setEnabled(replicaGroup.isEphemeral());	  
-	detectUpdates(true);
+        //
+        // Make sure everything is built
+        //
+        getProperties();
+
+        detectUpdates(false);
+        _target = replicaGroup;
+
+        Utils.Resolver resolver = getDetailResolver();
+        boolean isEditable = (resolver == null);
+        
+        ReplicaGroupDescriptor descriptor = 
+            (ReplicaGroupDescriptor)replicaGroup.getDescriptor();
+        
+        _id.setText(descriptor.id);
+        _id.setEditable(isEditable);
+        
+        _description.setText(
+            Utils.substitute(descriptor.description, resolver));
+        _description.setEditable(isEditable);
+        _description.setOpaque(isEditable);
+
+        _objects.set(objectDescriptorSeqToMap(descriptor.objects), resolver, isEditable);
+
+        _loadBalancing.setEnabled(true);
+
+        if(descriptor.loadBalancing == null)
+        {
+            _loadBalancing.setSelectedItem(RANDOM);
+            _nReplicas.setText("0");
+            _loadSample.setSelectedItem("1");
+        }
+        else if(descriptor.loadBalancing instanceof RandomLoadBalancingPolicy)
+        {
+            _loadBalancing.setSelectedItem(RANDOM);
+            _nReplicas.setText(
+                Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
+            _loadSample.setSelectedItem("1");
+        }
+        else if(descriptor.loadBalancing instanceof OrderedLoadBalancingPolicy)
+        {
+            _loadBalancing.setSelectedItem(ORDERED);
+            _nReplicas.setText(
+                Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
+            _loadSample.setSelectedItem("1");
+        }
+        else if(descriptor.loadBalancing instanceof RoundRobinLoadBalancingPolicy)
+        {
+            _loadBalancing.setSelectedItem(ROUND_ROBIN);
+            _nReplicas.setText(
+                Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
+            _loadSample.setSelectedItem("1");
+        }
+        else if(descriptor.loadBalancing instanceof AdaptiveLoadBalancingPolicy)
+        {
+            _loadBalancing.setSelectedItem(ADAPTIVE);
+            _nReplicas.setText(
+                Utils.substitute(descriptor.loadBalancing.nReplicas, resolver));
+
+            _loadSample.setSelectedItem(
+                Utils.substitute(
+                    ((AdaptiveLoadBalancingPolicy)descriptor.loadBalancing).loadSample,
+                    resolver));
+        }
+        else
+        {
+            assert false;
+        }
+        _nReplicas.setEditable(isEditable);
+        _loadSample.setEditable(isEditable);
+        _loadBalancing.setEnabled(isEditable);
+
+        _applyButton.setEnabled(replicaGroup.isEphemeral());
+        _discardButton.setEnabled(replicaGroup.isEphemeral());    
+        detectUpdates(true);
     }
 
     private ReplicaGroup getReplicaGroup()
     {
-	return (ReplicaGroup)_target;
+        return (ReplicaGroup)_target;
     }
 
     private java.util.Map objectDescriptorSeqToMap(java.util.List objects)
     {
-	java.util.Map result = new java.util.TreeMap();
-	java.util.Iterator p = objects.iterator();
-	while(p.hasNext())
-	{
-	    ObjectDescriptor od = (ObjectDescriptor)p.next();
-	    result.put(Ice.Util.identityToString(od.id), 
-		       od.type);
-	}
-	return result;
+        java.util.Map result = new java.util.TreeMap();
+        java.util.Iterator p = objects.iterator();
+        while(p.hasNext())
+        {
+            ObjectDescriptor od = (ObjectDescriptor)p.next();
+            result.put(Ice.Util.identityToString(od.id), 
+                       od.type);
+        }
+        return result;
     }
     
     private java.util.LinkedList mapToObjectDescriptorSeq(java.util.Map map)
     {
-	java.util.LinkedList result = new java.util.LinkedList();
-	java.util.Iterator p = map.entrySet().iterator();
-	while(p.hasNext())
-	{
-	    java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
-	    Ice.Identity id = 
-		Ice.Util.stringToIdentity((String)entry.getKey());
-	    String type = (String)entry.getValue();
-	    result.add(new ObjectDescriptor(id, type));
-	}
-	return result;
+        java.util.LinkedList result = new java.util.LinkedList();
+        java.util.Iterator p = map.entrySet().iterator();
+        while(p.hasNext())
+        {
+            java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
+            Ice.Identity id = 
+                Ice.Util.stringToIdentity((String)entry.getKey());
+            String type = (String)entry.getValue();
+            result.add(new ObjectDescriptor(id, type));
+        }
+        return result;
     }
 
 
@@ -442,13 +442,13 @@ class ReplicaGroupEditor extends Editor
     private JTextArea _description = new JTextArea(3, 20);
 
     private JComboBox _loadBalancing = new JComboBox(new Object[]
-	{ADAPTIVE, ORDERED, RANDOM, ROUND_ROBIN}); 
+        {ADAPTIVE, ORDERED, RANDOM, ROUND_ROBIN}); 
     
     private JTextField _nReplicas = new JTextField(20);
 
     private JLabel _loadSampleLabel;
     private JComboBox _loadSample = new JComboBox(new Object[]
-	{"1", "5", "15"});
+        {"1", "5", "15"});
     
     private MapField _objects;
 }