diff options
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/Model.java | 2 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Adapter.java | 2 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Adapters.java | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java index 93434b72c70..a9b7019f1f7 100755 --- a/java/src/IceGrid/Model.java +++ b/java/src/IceGrid/Model.java @@ -802,7 +802,7 @@ public class Model CommonBase toSelect = null;
if(parent != null)
{
- int index = parent.getIndex(this);
+ int index = parent.getIndex(currentNode);
toSelect = (CommonBase)parent.getChildAt(index + 1);
if(toSelect == null)
{
diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java index c793e1aa79b..be910062b2e 100755 --- a/java/src/IceGrid/TreeNode/Adapter.java +++ b/java/src/IceGrid/TreeNode/Adapter.java @@ -600,6 +600,8 @@ class Adapter extends Leaf public boolean destroy()
{
+ System.err.println("Destroying " + _id);
+
if(_parent != null && (isEphemeral() || isEditable() && _model.canUpdate()))
{
Adapters adapters = (Adapters)getParent();
diff --git a/java/src/IceGrid/TreeNode/Adapters.java b/java/src/IceGrid/TreeNode/Adapters.java index f58fab0c29d..32fced62561 100755 --- a/java/src/IceGrid/TreeNode/Adapters.java +++ b/java/src/IceGrid/TreeNode/Adapters.java @@ -112,7 +112,7 @@ class Adapters extends Parent //
// Generate a unique child name; ignore substitution for simplicity
//
- String baseName = descriptor == null ? "NewInstance" : descriptor.name;
+ String baseName = descriptor == null ? "NewAdapter" : descriptor.name;
String name = baseName;
int i = 0;
@@ -128,7 +128,7 @@ class Adapters extends Parent "${server}.${service}." + name : "${server}." + name;
descriptor = new AdapterDescriptor(
- "NewAdapter",
+ name,
defaultId,
false,
true,
|