diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-11-22 22:03:08 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-11-22 22:03:08 +0000 |
| commit | 833210856da78b28b8690bcdaaff434ee90a77ff (patch) | |
| tree | 258116d3086c8f9668aed7f29a4c9bbbeb09f392 /java/src/IceGridGUI/Application/PlainServer.java | |
| parent | fixing common.xml to send absolute path to ant task instead of relative (diff) | |
| download | ice-833210856da78b28b8690bcdaaff434ee90a77ff.tar.bz2 ice-833210856da78b28b8690bcdaaff434ee90a77ff.tar.xz ice-833210856da78b28b8690bcdaaff434ee90a77ff.zip | |
Fixed various copy/paste bugs
Diffstat (limited to 'java/src/IceGridGUI/Application/PlainServer.java')
| -rwxr-xr-x | java/src/IceGridGUI/Application/PlainServer.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index 050a63b1fe0..15f9ac930d1 100755 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -123,7 +123,10 @@ class PlainServer extends Communicator implements Server Object clipboard = getCoordinator().getClipboard(); if(clipboard != null && (clipboard instanceof ServerDescriptor - || clipboard instanceof ServerInstanceDescriptor)) + || clipboard instanceof ServerInstanceDescriptor + || (isIceBox() && (clipboard instanceof ServiceInstanceDescriptor)) + || (!isIceBox() && (clipboard instanceof AdapterDescriptor + || clipboard instanceof DbEnvDescriptor)))) { actions[PASTE] = true; } @@ -196,15 +199,13 @@ class PlainServer extends Communicator implements Server _iceboxServerIcon = Utils.getIcon("/icons/16x16/icebox_server_inactive.png"); } - boolean icebox = _descriptor instanceof IceBoxDescriptor; - if(expanded) { - _cellRenderer.setOpenIcon(icebox ? _iceboxServerIcon : _serverIcon); + _cellRenderer.setOpenIcon(isIceBox() ? _iceboxServerIcon : _serverIcon); } else { - _cellRenderer.setClosedIcon(icebox ? _iceboxServerIcon : _serverIcon); + _cellRenderer.setClosedIcon(isIceBox() ? _iceboxServerIcon : _serverIcon); } return _cellRenderer.getTreeCellRendererComponent( tree, value, sel, expanded, leaf, row, hasFocus); @@ -479,7 +480,7 @@ class PlainServer extends Communicator implements Server if(!_ephemeral) { _adapters.init(_descriptor.adapters); - if(_descriptor instanceof IceBoxDescriptor) + if(isIceBox()) { IceBoxDescriptor iceBoxDescriptor = (IceBoxDescriptor)_descriptor; _services.init(iceBoxDescriptor.services); |