diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-05-08 20:55:38 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-05-08 20:55:38 +0000 |
| commit | 8ff9dd62a9241109b599896c1f06516009275fe0 (patch) | |
| tree | d397a64aa0bb37b2496d7fa7d0b484da9d7fa73e /java/src/IceGridGUI/Application/AbstractServerEditor.java | |
| parent | Fix (diff) | |
| download | ice-8ff9dd62a9241109b599896c1f06516009275fe0.tar.bz2 ice-8ff9dd62a9241109b599896c1f06516009275fe0.tar.xz ice-8ff9dd62a9241109b599896c1f06516009275fe0.zip | |
Simplified Application view; fixed PropertySets issues
Diffstat (limited to 'java/src/IceGridGUI/Application/AbstractServerEditor.java')
| -rwxr-xr-x | java/src/IceGridGUI/Application/AbstractServerEditor.java | 56 |
1 files changed, 24 insertions, 32 deletions
diff --git a/java/src/IceGridGUI/Application/AbstractServerEditor.java b/java/src/IceGridGUI/Application/AbstractServerEditor.java index a1c0f8aeaab..afded62bc2a 100755 --- a/java/src/IceGridGUI/Application/AbstractServerEditor.java +++ b/java/src/IceGridGUI/Application/AbstractServerEditor.java @@ -49,16 +49,19 @@ abstract class AbstractServerEditor extends Editor {
Node node = (Node)_target.getParent();
writeDescriptor();
- ServerInstanceDescriptor instanceDescriptor =
- server.getInstanceDescriptor();
- ServerDescriptor serverDescriptor =
- server.getServerDescriptor();
-
+
_target.destroy(); // just removes the child
-
+
try
{
- node.tryAdd(instanceDescriptor, serverDescriptor, true);
+ if(server instanceof PlainServer)
+ {
+ node.tryAdd((ServerDescriptor)server.getDescriptor(), true);
+ }
+ else
+ {
+ node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), true);
+ }
}
catch(UpdateFailedException e)
{
@@ -86,14 +89,8 @@ abstract class AbstractServerEditor extends Editor //
// Success
//
- if(instanceDescriptor != null)
- {
- _target = (Server)node.findChildWithDescriptor(instanceDescriptor);
- }
- else
- {
- _target = (Server)node.findChildWithDescriptor(serverDescriptor);
- }
+ _target = (TreeNode)node.findChildWithDescriptor(server.getDescriptor());
+
root.updated();
root.setSelectedNode(_target);
}
@@ -108,20 +105,22 @@ abstract class AbstractServerEditor extends Editor //
// Save to be able to rollback
//
- Object savedDescriptor = ((Communicator)_target).saveDescriptor();
+ Object savedDescriptor = server.saveDescriptor();
Node node = (Node)_target.getParent();
writeDescriptor();
- ServerInstanceDescriptor instanceDescriptor =
- server.getInstanceDescriptor();
- ServerDescriptor serverDescriptor =
- server.getServerDescriptor();
-
node.removeServer(_target);
try
{
- node.tryAdd(instanceDescriptor, serverDescriptor, false);
+ if(server instanceof PlainServer)
+ {
+ node.tryAdd((ServerDescriptor)server.getDescriptor(), false);
+ }
+ else
+ {
+ node.tryAdd((ServerInstanceDescriptor)server.getDescriptor(), false);
+ }
}
catch(UpdateFailedException e)
{
@@ -136,7 +135,7 @@ abstract class AbstractServerEditor extends Editor {
assert false;
}
- ((Communicator)_target).restoreDescriptor(savedDescriptor);
+ server.restoreDescriptor(savedDescriptor);
root.setSelectedNode(_target);
JOptionPane.showMessageDialog(
@@ -150,17 +149,10 @@ abstract class AbstractServerEditor extends Editor //
// Success
//
- node.getEditable().removeElement(_target.getId(),
+ node.getEditable().removeElement(_target.getId(), server.getEditable(),
Server.class); // replaced by brand new Server
- if(instanceDescriptor != null)
- {
- _target = node.findChildWithDescriptor(instanceDescriptor);
- }
- else
- {
- _target = node.findChildWithDescriptor(serverDescriptor);
- }
+ _target = node.findChildWithDescriptor(server.getDescriptor());
root.updated();
root.setSelectedNode(_target);
}
|