diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-11 22:07:52 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-11 22:07:52 +0000 |
| commit | 3498de4cc662bf616f1e9c55fc93a66820555f0f (patch) | |
| tree | f10979e753877b27e4e8b1fc20ab459e92cf020f /java/src/IceGrid/TreeNode/Root.java | |
| parent | Ability to edit/copy applications (diff) | |
| download | ice-3498de4cc662bf616f1e9c55fc93a66820555f0f.tar.bz2 ice-3498de4cc662bf616f1e9c55fc93a66820555f0f.tar.xz ice-3498de4cc662bf616f1e9c55fc93a66820555f0f.zip | |
Cleanup + application destruction
Diffstat (limited to 'java/src/IceGrid/TreeNode/Root.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/Root.java | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/java/src/IceGrid/TreeNode/Root.java b/java/src/IceGrid/TreeNode/Root.java index 62c20fde4c8..ac42556b5db 100755 --- a/java/src/IceGrid/TreeNode/Root.java +++ b/java/src/IceGrid/TreeNode/Root.java @@ -253,34 +253,6 @@ public class Root extends Parent return _dynamicInfoMap.keySet();
}
- void tryAdd(ApplicationDescriptor ad) throws UpdateFailedException
- {
- try
- {
- Application app = new Application(true, ad, _model);
- addChild(app, true);
- }
- catch(UpdateFailedException e)
- {
- e.addParent(this);
- throw e;
- }
- }
-
- void restore(Application copy)
- {
- removeChild(copy.getId(), true);
- try
- {
- addChild(copy, true);
- }
- catch(UpdateFailedException e)
- {
- assert false; // impossible
- }
- }
-
-
ServerState registerServer(String nodeName, String serverId, Server server,
Ice.IntHolder pid)
{
@@ -424,6 +396,21 @@ public class Root extends Parent }
}
+ void tryAdd(ApplicationDescriptor ad) throws UpdateFailedException
+ {
+ try
+ {
+ Application app = new Application(true, ad, _model);
+ addChild(app, true);
+ }
+ catch(UpdateFailedException e)
+ {
+ e.addParent(this);
+ throw e;
+ }
+ }
+
+
private void newApplication(ApplicationDescriptor descriptor)
{
descriptor.name = makeNewChildId(descriptor.name);
|