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/AbstractServerEditor.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/AbstractServerEditor.java')
-rwxr-xr-x | java/src/IceGridGUI/Application/AbstractServerEditor.java | 268 |
1 files changed, 134 insertions, 134 deletions
diff --git a/java/src/IceGridGUI/Application/AbstractServerEditor.java b/java/src/IceGridGUI/Application/AbstractServerEditor.java index 2bead3feac9..f46a40838c3 100755 --- a/java/src/IceGridGUI/Application/AbstractServerEditor.java +++ b/java/src/IceGridGUI/Application/AbstractServerEditor.java @@ -33,148 +33,148 @@ abstract class AbstractServerEditor extends Editor protected void buildPropertiesPanel() { - super.buildPropertiesPanel(); - _propertiesPanel.setName("Server Properties"); + super.buildPropertiesPanel(); + _propertiesPanel.setName("Server Properties"); } protected boolean applyUpdate(boolean refresh) { - Root root = _target.getRoot(); - Server server = (Server)_target; + Root root = _target.getRoot(); + Server server = (Server)_target; - root.disableSelectionListener(); - try - { - if(_target.isEphemeral()) - { - Node node = (Node)_target.getParent(); - writeDescriptor(); + root.disableSelectionListener(); + try + { + if(_target.isEphemeral()) + { + Node node = (Node)_target.getParent(); + writeDescriptor(); - _target.destroy(); // just removes the child + _target.destroy(); // just removes the child - try - { - if(server instanceof PlainServer) - { - node.tryAdd((ServerDescriptor)server.getDescriptor(), true); - } - else - { - node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), true); - } - } - catch(UpdateFailedException e) - { - // - // Add back ephemeral child - // - try - { - node.insertServer(_target, true); - } - catch(UpdateFailedException die) - { - assert false; - } - root.setSelectedNode(_target); + try + { + if(server instanceof PlainServer) + { + node.tryAdd((ServerDescriptor)server.getDescriptor(), true); + } + else + { + node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), true); + } + } + catch(UpdateFailedException e) + { + // + // Add back ephemeral child + // + try + { + node.insertServer(_target, true); + } + catch(UpdateFailedException die) + { + assert false; + } + root.setSelectedNode(_target); - JOptionPane.showMessageDialog( - root.getCoordinator().getMainFrame(), - e.toString(), - "Apply failed", - JOptionPane.ERROR_MESSAGE); - return false; - } + JOptionPane.showMessageDialog( + root.getCoordinator().getMainFrame(), + e.toString(), + "Apply failed", + JOptionPane.ERROR_MESSAGE); + return false; + } - // - // Success - // - _target = (TreeNode)node.findChildWithDescriptor(server.getDescriptor()); - root.updated(); - - if(refresh) - { - root.setSelectedNode(_target); - } - - } - else if(isSimpleUpdate()) - { - writeDescriptor(); - root.updated(); - server.getEditable().markModified(); - } - else - { - // - // Save to be able to rollback - // - Object savedDescriptor = server.saveDescriptor(); - Node node = (Node)_target.getParent(); - writeDescriptor(); - - node.removeServer(_target); - - try - { - if(server instanceof PlainServer) - { - node.tryAdd((ServerDescriptor)server.getDescriptor(), false); - } - else - { - node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), false); - } - } - catch(UpdateFailedException e) - { - // - // Restore - // - try - { - node.insertServer(_target, true); - } - catch(UpdateFailedException die) - { - assert false; - } - server.restoreDescriptor(savedDescriptor); - root.setSelectedNode(_target); - - JOptionPane.showMessageDialog( - root.getCoordinator().getMainFrame(), - e.toString(), - "Apply failed", - JOptionPane.ERROR_MESSAGE); - return false; - } - - // - // Success - // - node.getEditable().removeElement(_target.getId(), server.getEditable(), - Server.class); // replaced by brand new Server - - _target = node.findChildWithDescriptor(server.getDescriptor()); - root.updated(); - if(refresh) - { - root.setSelectedNode(_target); - } - } - - if(refresh) - { - root.getCoordinator().getCurrentTab().showNode(_target); - } - _applyButton.setEnabled(false); - _discardButton.setEnabled(false); - return true; - } - finally - { - root.enableSelectionListener(); - } + // + // Success + // + _target = (TreeNode)node.findChildWithDescriptor(server.getDescriptor()); + root.updated(); + + if(refresh) + { + root.setSelectedNode(_target); + } + + } + else if(isSimpleUpdate()) + { + writeDescriptor(); + root.updated(); + server.getEditable().markModified(); + } + else + { + // + // Save to be able to rollback + // + Object savedDescriptor = server.saveDescriptor(); + Node node = (Node)_target.getParent(); + writeDescriptor(); + + node.removeServer(_target); + + try + { + if(server instanceof PlainServer) + { + node.tryAdd((ServerDescriptor)server.getDescriptor(), false); + } + else + { + node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), false); + } + } + catch(UpdateFailedException e) + { + // + // Restore + // + try + { + node.insertServer(_target, true); + } + catch(UpdateFailedException die) + { + assert false; + } + server.restoreDescriptor(savedDescriptor); + root.setSelectedNode(_target); + + JOptionPane.showMessageDialog( + root.getCoordinator().getMainFrame(), + e.toString(), + "Apply failed", + JOptionPane.ERROR_MESSAGE); + return false; + } + + // + // Success + // + node.getEditable().removeElement(_target.getId(), server.getEditable(), + Server.class); // replaced by brand new Server + + _target = node.findChildWithDescriptor(server.getDescriptor()); + root.updated(); + if(refresh) + { + root.setSelectedNode(_target); + } + } + + if(refresh) + { + root.getCoordinator().getCurrentTab().showNode(_target); + } + _applyButton.setEnabled(false); + _discardButton.setEnabled(false); + return true; + } + finally + { + root.enableSelectionListener(); + } } } |