diff options
Diffstat (limited to 'java/src')
6 files changed, 46 insertions, 9 deletions
diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index a3ef527f8f9..ca5d8512a6a 100755 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -164,7 +164,9 @@ class Adapter extends TreeNode implements DescriptorHolder attributes.add(createAttribute("wait-for-activation", "false"));
}
- if(_descriptor.description.length() == 0 && _descriptor.objects.isEmpty())
+ if(_descriptor.description.length() == 0
+ && _descriptor.objects.isEmpty()
+ && _descriptor.allocatables.isEmpty())
{
writer.writeElement("adapter", attributes);
}
@@ -176,7 +178,8 @@ class Adapter extends TreeNode implements DescriptorHolder {
writer.writeElement("description", _descriptor.description);
}
- writeObjects(writer, _descriptor.objects);
+ writeObjects("object", writer, _descriptor.objects);
+ writeObjects("allocatable", writer, _descriptor.allocatables);
writer.writeEndTag("adapter");
}
}
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java index 621494cc8e3..adfee9b1922 100755 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/Application/AdapterEditor.java @@ -36,7 +36,8 @@ class AdapterEditor extends CommunicatorChildEditor AdapterEditor()
{
_objects = new MapField(this, "Identity", "Type", true);
-
+ _allocatables = new MapField(this, "Identity", "Type", true);
+
//
// Create buttons
//
@@ -188,6 +189,7 @@ class AdapterEditor extends CommunicatorChildEditor descriptor.registerProcess = _registerProcess.isSelected();
descriptor.waitForActivation = _waitForActivation.isSelected();
descriptor.objects = mapToObjectDescriptorSeq(_objects.get());
+ descriptor.allocatables = mapToObjectDescriptorSeq(_allocatables.get());
}
boolean isSimpleUpdate()
@@ -241,7 +243,7 @@ class AdapterEditor extends CommunicatorChildEditor builder.append("", _waitForActivation);
builder.nextLine();
- builder.append("Registered Objects");
+ builder.append("Well-known Objects");
builder.nextLine();
builder.append("");
builder.nextLine();
@@ -254,6 +256,20 @@ class AdapterEditor extends CommunicatorChildEditor cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
builder.nextRow(6);
builder.nextLine();
+
+ builder.append("Allocatable Objects");
+ builder.nextLine();
+ builder.append("");
+ builder.nextLine();
+ builder.append("");
+ builder.nextLine();
+ builder.append("");
+ builder.nextRow(-6);
+ scrollPane = new JScrollPane(_allocatables);
+ builder.add(scrollPane,
+ cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+ builder.nextRow(6);
+ builder.nextLine();
}
protected void buildPropertiesPanel()
@@ -475,6 +491,7 @@ class AdapterEditor extends CommunicatorChildEditor // Objects
//
_objects.set(objectDescriptorSeqToMap(descriptor.objects), resolver, isEditable);
+ _allocatables.set(objectDescriptorSeqToMap(descriptor.allocatables), resolver, isEditable);
_registerProcess.setSelected(descriptor.registerProcess);
_registerProcess.setEnabled(isEditable);
@@ -551,6 +568,7 @@ class AdapterEditor extends CommunicatorChildEditor private JCheckBox _waitForActivation;
private MapField _objects;
+ private MapField _allocatables;
static private final Object PUBLISH_ACTUAL = new Object()
{
diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/Application/ReplicaGroup.java index b7de274fd03..555d97c2034 100755 --- a/java/src/IceGridGUI/Application/ReplicaGroup.java +++ b/java/src/IceGridGUI/Application/ReplicaGroup.java @@ -199,7 +199,7 @@ class ReplicaGroup extends TreeNode writer.writeElement("load-balancing", attributes);
}
- writeObjects(writer, _descriptor.objects);
+ writeObjects("object", writer, _descriptor.objects);
writer.writeEndTag("replica-group");
}
}
diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java index 02c14f027bd..b935967c004 100755 --- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java @@ -277,7 +277,7 @@ class ReplicaGroupEditor extends Editor builder.nextRow(2);
builder.nextLine();
- builder.append("Registered Objects");
+ builder.append("Well-known Objects");
builder.nextLine();
builder.append("");
builder.nextLine();
diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java index 2a11e9a4183..4971dac326d 100755 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/Application/TreeNode.java @@ -209,7 +209,7 @@ public abstract class TreeNode extends TreeNodeBase }
}
- static void writeObjects(XMLWriter writer, java.util.List objects)
+ static void writeObjects(String elt, XMLWriter writer, java.util.List objects)
throws java.io.IOException
{
java.util.Iterator p = objects.iterator();
@@ -222,7 +222,7 @@ public abstract class TreeNode extends TreeNodeBase {
attributes.add(createAttribute("type", od.type));
}
- writer.writeElement("object", attributes);
+ writer.writeElement(elt, attributes);
}
}
diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index 9a02f20a22e..a518ae02cbb 100755 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -84,6 +84,7 @@ class AdapterEditor extends Editor _waitForActivation.setSelected(descriptor.waitForActivation);
_objects.setObjects(descriptor.objects, resolver);
+ _allocatables.setObjects(descriptor.allocatables, resolver);
}
protected void appendProperties(DefaultFormBuilder builder)
@@ -132,7 +133,7 @@ class AdapterEditor extends Editor builder.append("", _waitForActivation);
builder.nextLine();
- builder.append("Registered Objects");
+ builder.append("Well-known Objects");
builder.nextLine();
builder.append("");
builder.nextLine();
@@ -145,6 +146,20 @@ class AdapterEditor extends Editor cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
builder.nextRow(6);
builder.nextLine();
+
+ builder.append("Allocatable Objects");
+ builder.nextLine();
+ builder.append("");
+ builder.nextLine();
+ builder.append("");
+ builder.nextLine();
+ builder.append("");
+ builder.nextRow(-6);
+ scrollPane = new JScrollPane(_allocatables);
+ builder.add(scrollPane,
+ cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+ builder.nextRow(6);
+ builder.nextLine();
}
protected void buildPropertiesPanel()
@@ -166,4 +181,5 @@ class AdapterEditor extends Editor private JCheckBox _waitForActivation = new JCheckBox("Wait for Activation");
private TableField _objects = new TableField("Identity", "Type");
+ private TableField _allocatables = new TableField("Identity", "Type");
}
|