diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-10 19:36:18 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-10 19:36:18 +0000 |
| commit | 45dd45c2a5077196c78cabf08a48c0c2430c920e (patch) | |
| tree | de3ff59f6bb9bb9201850a8ec1f878452aba37f9 /java/src/IceGrid/TreeNode/ServerTemplates.java | |
| parent | bug 475: remove IcePack (diff) | |
| download | ice-45dd45c2a5077196c78cabf08a48c0c2430c920e.tar.bz2 ice-45dd45c2a5077196c78cabf08a48c0c2430c920e.tar.xz ice-45dd45c2a5077196c78cabf08a48c0c2430c920e.zip | |
Server creation/deletion/edit
Diffstat (limited to 'java/src/IceGrid/TreeNode/ServerTemplates.java')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServerTemplates.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/java/src/IceGrid/TreeNode/ServerTemplates.java b/java/src/IceGrid/TreeNode/ServerTemplates.java index 9d75f4d42b9..aa8ef0c778e 100755 --- a/java/src/IceGrid/TreeNode/ServerTemplates.java +++ b/java/src/IceGrid/TreeNode/ServerTemplates.java @@ -114,8 +114,9 @@ class ServerTemplates extends Templates }
}
- void getUpdates(java.util.Map updates)
+ java.util.Map getUpdates()
{
+ java.util.Map updates = new java.util.HashMap();
java.util.Iterator p = _children.iterator();
while(p.hasNext())
{
@@ -125,6 +126,7 @@ class ServerTemplates extends Templates updates.put(t.getId(), t.getDescriptor());
}
}
+ return updates;
}
void update() throws UpdateFailedException
@@ -220,7 +222,16 @@ class ServerTemplates extends Templates }
catch(UpdateFailedException e)
{
- assert false; // impossible
+ e.addParent(this);
+
+ JOptionPane.showMessageDialog(
+ _model.getMainFrame(),
+ e.toString(),
+ "Apply failed",
+ JOptionPane.ERROR_MESSAGE);
+
+ removeDescriptor(newId);
+ return false;
}
return true;
}
|