diff options
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Adapter.java | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java index 13a566807d3..b4172ac4315 100755 --- a/java/src/IceGrid/TreeNode/Adapter.java +++ b/java/src/IceGrid/TreeNode/Adapter.java @@ -598,25 +598,18 @@ class Adapter extends Leaf {
assert !_brandNew;
- if(_model.canUpdate())
+ if(isEditable() && _model.canUpdate())
{
_model.disableDisplay();
Adapters adapters = (Adapters)getParent();
-
- //
- // Will keep current selection unless it points to me!
- //
- CommonBase toSelect = _model.getSelectedNode();
- if(toSelect == this)
+
+ CommonBase toSelect = (CommonBase)adapters.getChildAt(adapters.getIndex(this) + 1);
+ if(toSelect == null)
{
- toSelect = (CommonBase)adapters.getChildAt(adapters.getIndex(this) + 1);
- if(toSelect == null)
- {
- System.err.println("Can't find next child");
- toSelect = adapters;
- }
+ toSelect = adapters;
}
+
adapters.removeDescriptor(_descriptor);
getEditable().markModified();
getApplication().applySafeUpdate();
|