LiveDeployment now shown using tables

1 files changed, 16 insertions, 15 deletions

diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 49cc88fa149..bb68c78e4e2 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -228,6 +228,19 @@ class AdapterEditor extends CommunicatorChildEditor
 	builder.append(_replicaGroupButton);

 	builder.nextLine();

 

+	builder.append("Endpoints" );

+	builder.append(_endpoints, 3);

+	builder.nextLine();

+

+	builder.append("Published Endpoints" );

+	builder.append(_publishedEndpoints, 3);

+	builder.nextLine();

+

+	builder.append("", _registerProcess);

+	builder.nextLine();

+	builder.append("", _waitForActivation);

+	builder.nextLine();

+

 	builder.append("Registered Objects");

 	builder.nextLine();

 	builder.append("");

@@ -241,19 +254,6 @@ class AdapterEditor extends CommunicatorChildEditor
 		    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));

 	builder.nextRow(6);

 	builder.nextLine();

-	

-	builder.append("", _registerProcess);

-	builder.nextLine();

-	builder.append("", _waitForActivation);

-	builder.nextLine();

-

-	builder.append("Endpoints" );

-	builder.append(_endpoints, 3);

-	builder.nextLine();

-

-	builder.append("Published Endpoints" );

-	builder.append(_publishedEndpoints, 3);

-	builder.nextLine();

     }

 

     protected void buildPropertiesPanel()

@@ -481,12 +481,13 @@ class AdapterEditor extends CommunicatorChildEditor
 

     static java.util.Map objectDescriptorSeqToMap(java.util.List objects)

     {

-	java.util.Map result = new java.util.HashMap(objects.size());

+	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);

+	    result.put(Ice.Util.identityToString(od.id), 

+		       od.type);

 	}

 	return result;

     }