Added Ordered load-balancing policy and policy field on adapters

1 files changed, 25 insertions, 22 deletions

diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/Application/ReplicaGroup.java
index 046e5f3e581..ca234ec1ed5 100755
--- a/java/src/IceGridGUI/Application/ReplicaGroup.java
+++ b/java/src/IceGridGUI/Application/ReplicaGroup.java
@@ -176,29 +176,32 @@ class ReplicaGroup extends TreeNode
 		{
 		    writer.writeElement("description", _descriptor.description);
 		}
-		if(_descriptor.loadBalancing != null)
+		assert _descriptor.loadBalancing != null;
+
+		attributes.clear();
+		if(_descriptor.loadBalancing instanceof RandomLoadBalancingPolicy)
+		{
+		    attributes.add(createAttribute("type", "random")); 
+		}
+		else if(_descriptor.loadBalancing instanceof OrderedLoadBalancingPolicy)
+		{
+		    attributes.add(createAttribute("type", "ordered")); 
+		}
+		else if(_descriptor.loadBalancing instanceof RoundRobinLoadBalancingPolicy)
+		{
+		    attributes.add(createAttribute("type", "round-robin")); 
+		}
+		else if(_descriptor.loadBalancing instanceof AdaptiveLoadBalancingPolicy)
 		{
-		    attributes.clear();
-		    if(_descriptor.loadBalancing instanceof RandomLoadBalancingPolicy)
-		    {
-			attributes.add(createAttribute("type", "random")); 
-		    }
-		    else if(_descriptor.loadBalancing instanceof RoundRobinLoadBalancingPolicy)
-		    {
-			attributes.add(createAttribute("type", "round-robin")); 
-		    }
-		    else if(_descriptor.loadBalancing instanceof AdaptiveLoadBalancingPolicy)
-		    {
-			attributes.add(createAttribute("type", "adaptive"));
-			AdaptiveLoadBalancingPolicy policy = 
-			    (AdaptiveLoadBalancingPolicy)_descriptor.loadBalancing;
-			attributes.add(createAttribute("load-sample", policy.loadSample));
-		    }
-		    attributes.add(createAttribute("n-replicas", 
-						   _descriptor.loadBalancing.nReplicas));
-		    writer.writeElement("load-balancing", attributes);
-		} 
-		
+		    attributes.add(createAttribute("type", "adaptive"));
+		    AdaptiveLoadBalancingPolicy policy = 
+			(AdaptiveLoadBalancingPolicy)_descriptor.loadBalancing;
+		    attributes.add(createAttribute("load-sample", policy.loadSample));
+		}
+		attributes.add(createAttribute("n-replicas", 
+					       _descriptor.loadBalancing.nReplicas));
+		writer.writeElement("load-balancing", attributes);
+	     
 		writeObjects("object", writer, _descriptor.objects);
 		writer.writeEndTag("replica-group");
 	    }