diff options
author | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2007-02-01 17:09:49 +0000 |
commit | abada90e3f84dc703b8ddc9efcbed8a946fadead (patch) | |
tree | 2c6f9dccd510ea97cb927a7bd635422efaae547a /java/src/IceGridGUI/Application/CommunicatorChildEditor.java | |
parent | removing trace message (diff) | |
download | ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.bz2 ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.tar.xz ice-abada90e3f84dc703b8ddc9efcbed8a946fadead.zip |
Expanded tabs into spaces
Diffstat (limited to 'java/src/IceGridGUI/Application/CommunicatorChildEditor.java')
-rwxr-xr-x | java/src/IceGridGUI/Application/CommunicatorChildEditor.java | 206 |
1 files changed, 103 insertions, 103 deletions
diff --git a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java index ee3ffe13935..041a9a72826 100755 --- a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java +++ b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java @@ -23,109 +23,109 @@ abstract class CommunicatorChildEditor extends Editor protected boolean applyUpdate(boolean refresh) { - Root root = _target.getRoot(); - root.disableSelectionListener(); - try - { - if(_target.isEphemeral()) - { - Communicator.ChildList childList = getChildList(); - - writeDescriptor(); - Object descriptor = _target.getDescriptor(); - _target.destroy(); // just removes the child - - try - { - childList.tryAdd(descriptor); - } - catch(UpdateFailedException e) - { - // - // Restore ephemeral - // - try - { - childList.addChild(_target, true); - } - catch(UpdateFailedException die) - { - assert false; - } - - JOptionPane.showMessageDialog( - root.getCoordinator().getMainFrame(), - e.toString(), - "Apply failed", - JOptionPane.ERROR_MESSAGE); - - root.setSelectedNode(_target); - return false; - } - - // - // Success - // - _target = childList.findChildWithDescriptor(descriptor); - root.updated(); - if(refresh) - { - root.setSelectedNode(_target); - } - } - else if(isSimpleUpdate()) - { - writeDescriptor(); - root.updated(); - ((Communicator)_target.getParent()).getEnclosingEditable().markModified(); - } - else - { - // - // Save to be able to rollback - // - Object savedDescriptor = ((DescriptorHolder)_target).saveDescriptor(); - Communicator.ChildList childList = getChildList(); - writeDescriptor(); - try - { - childList.tryUpdate(_target); - } - catch(UpdateFailedException e) - { - ((DescriptorHolder)_target).restoreDescriptor(savedDescriptor); - JOptionPane.showMessageDialog( - root.getCoordinator().getMainFrame(), - e.toString(), - "Apply failed", - JOptionPane.ERROR_MESSAGE); - return false; - } - - // - // Success - // - _target = childList.findChildWithDescriptor(_target.getDescriptor()); - root.updated(); - if(refresh) - { - root.setSelectedNode(_target); - } - } - - postUpdate(); + Root root = _target.getRoot(); + root.disableSelectionListener(); + try + { + if(_target.isEphemeral()) + { + Communicator.ChildList childList = getChildList(); + + writeDescriptor(); + Object descriptor = _target.getDescriptor(); + _target.destroy(); // just removes the child + + try + { + childList.tryAdd(descriptor); + } + catch(UpdateFailedException e) + { + // + // Restore ephemeral + // + try + { + childList.addChild(_target, true); + } + catch(UpdateFailedException die) + { + assert false; + } + + JOptionPane.showMessageDialog( + root.getCoordinator().getMainFrame(), + e.toString(), + "Apply failed", + JOptionPane.ERROR_MESSAGE); + + root.setSelectedNode(_target); + return false; + } + + // + // Success + // + _target = childList.findChildWithDescriptor(descriptor); + root.updated(); + if(refresh) + { + root.setSelectedNode(_target); + } + } + else if(isSimpleUpdate()) + { + writeDescriptor(); + root.updated(); + ((Communicator)_target.getParent()).getEnclosingEditable().markModified(); + } + else + { + // + // Save to be able to rollback + // + Object savedDescriptor = ((DescriptorHolder)_target).saveDescriptor(); + Communicator.ChildList childList = getChildList(); + writeDescriptor(); + try + { + childList.tryUpdate(_target); + } + catch(UpdateFailedException e) + { + ((DescriptorHolder)_target).restoreDescriptor(savedDescriptor); + JOptionPane.showMessageDialog( + root.getCoordinator().getMainFrame(), + e.toString(), + "Apply failed", + JOptionPane.ERROR_MESSAGE); + return false; + } + + // + // Success + // + _target = childList.findChildWithDescriptor(_target.getDescriptor()); + root.updated(); + if(refresh) + { + root.setSelectedNode(_target); + } + } + + postUpdate(); - if(refresh) - { - root.getCoordinator().getCurrentTab().showNode(_target); - } - _applyButton.setEnabled(false); - _discardButton.setEnabled(false); - return true; - } - finally - { - root.enableSelectionListener(); - } + if(refresh) + { + root.getCoordinator().getCurrentTab().showNode(_target); + } + _applyButton.setEnabled(false); + _discardButton.setEnabled(false); + return true; + } + finally + { + root.enableSelectionListener(); + } } } |