From 4ca122b8ff02bab36e073624f7c03933946484be Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 20 Dec 2006 19:18:30 +0000 Subject: Fixed various Ice.OA issues; added iceVersion --- java/src/IceGridGUI/Application/Adapter.java | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'java/src/IceGridGUI/Application/Adapter.java') diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index 340c0452e69..b2c7455f6d4 100755 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -103,11 +103,10 @@ class Adapter extends TreeNode implements DescriptorHolder return new AdapterEditor(); } - public void destroy() { - removeProperty(_id, "Endpoints"); - removeProperty(_id, "PublishedEndpoints"); + removeProperty("Ice.OA." + _descriptor.name + ".Endpoints"); + removeProperty("Ice.OA." + _descriptor.name + ".PublishedEndpoints"); ((Communicator)_parent).getAdapters().destroyChild(this); } @@ -155,7 +154,9 @@ class Adapter extends TreeNode implements DescriptorHolder { java.util.List attributes = new java.util.LinkedList(); attributes.add(createAttribute("name", _descriptor.name)); - attributes.add(createAttribute("endpoints", getProperty("Endpoints"))); + String oaPrefix = "Ice.OA." + _descriptor.name + "."; + + attributes.add(createAttribute("endpoints", getProperty(oaPrefix + "Endpoints"))); attributes.add(createAttribute("id", _descriptor.id)); if(_descriptor.registerProcess) { @@ -197,26 +198,20 @@ class Adapter extends TreeNode implements DescriptorHolder String getProperty(String property) { - return ((Communicator)_parent).getProperty(_descriptor.name + "." + property); + return ((Communicator)_parent).getProperty(property); } String lookupPropertyValue(String val) { return ((Communicator)_parent).lookupPropertyValue(val); } - void setProperty(String name, String property, String newValue) - { - ((Communicator)_parent).setProperty(name + "." + property, newValue); - } void setProperty(String property, String newValue) { ((Communicator)_parent).setProperty(property, newValue); } - void removeProperty(String name, String property) + void removeProperty(String property) { - ((Communicator)_parent).removeProperty(name + "." + property); + ((Communicator)_parent).removeProperty(property); } - - String getDefaultAdapterId() { return getDefaultAdapterId(_id); -- cgit v1.2.3