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/Adapter.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/Adapter.java')
| -rwxr-xr-x | java/src/IceGridGUI/Application/Adapter.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index b6aea3083ea..cd82d9ba212 100755 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -42,13 +42,16 @@ class Adapter extends TreeNode implements DescriptorHolder boolean[] actions = new boolean[ACTION_COUNT]; actions[COPY] = true; - boolean[] parentActions = ((TreeNode)_parent).getAvailableActions(); - - actions[PASTE] = parentActions[PASTE]; + Object clipboard = getCoordinator().getClipboard(); + actions[PASTE] = clipboard != null && + (clipboard instanceof AdapterDescriptor + || clipboard instanceof DbEnvDescriptor); + actions[DELETE] = true; if(!_ephemeral) { + boolean[] parentActions = ((TreeNode)_parent).getAvailableActions(); actions[SHOW_VARS] = parentActions[SHOW_VARS]; actions[SUBSTITUTE_VARS] = parentActions[SUBSTITUTE_VARS]; } @@ -58,11 +61,9 @@ class Adapter extends TreeNode implements DescriptorHolder public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); - if(((TreeNode)_parent).getAvailableActions()[PASTE]) - { - getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); - } + getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + public void paste() { ((TreeNode)_parent).paste(); |