summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/AdapterEditor.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2006-12-20 19:18:30 +0000
committerBernard Normier <bernard@zeroc.com>2006-12-20 19:18:30 +0000
commit4ca122b8ff02bab36e073624f7c03933946484be (patch)
treedd433534031789f06c7d9685fb51d26ccb66bfdd /java/src/IceGridGUI/Application/AdapterEditor.java
parentDon't add again IceBox adapter proeprties if they already exist. (diff)
downloadice-4ca122b8ff02bab36e073624f7c03933946484be.tar.bz2
ice-4ca122b8ff02bab36e073624f7c03933946484be.tar.xz
ice-4ca122b8ff02bab36e073624f7c03933946484be.zip
Fixed various Ice.OA issues; added iceVersion
Diffstat (limited to 'java/src/IceGridGUI/Application/AdapterEditor.java')
-rwxr-xr-xjava/src/IceGridGUI/Application/AdapterEditor.java16
1 files changed, 9 insertions, 7 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 96ed449a240..c3359bc9876 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -298,21 +298,21 @@ class AdapterEditor extends CommunicatorChildEditor
Adapter adapter = getAdapter();
if(!name.equals(_oldName))
{
- adapter.removeProperty("Ice.OA." + _oldName, "Endpoints");
- adapter.removeProperty("Ice.OA." + _oldName, "PublishedEndpoints");
+ adapter.removeProperty("Ice.OA." + _oldName + ".Endpoints");
+ adapter.removeProperty("Ice.OA." + _oldName + ".PublishedEndpoints");
_oldName = name;
}
- adapter.setProperty("Ice.OA." + name, "Endpoints", _endpoints.getText().trim());
+ adapter.setProperty("Ice.OA." + name + ".Endpoints", _endpoints.getText().trim());
Object published = _publishedEndpoints.getSelectedItem();
if(published == PUBLISH_ACTUAL)
{
- adapter.removeProperty("Ice.OA." + name, "PublishedEndpoints");
+ adapter.removeProperty("Ice.OA." + name + ".PublishedEndpoints");
}
else
{
- adapter.setProperty("Ice.OA." + name, "PublishedEndpoints",
+ adapter.setProperty("Ice.OA." + name + ".PublishedEndpoints",
published.toString().trim());
}
@@ -437,6 +437,8 @@ class AdapterEditor extends CommunicatorChildEditor
_name.setText(Utils.substitute(descriptor.name, resolver));
_name.setEditable(isEditable);
+ String oaPrefix = "Ice.OA." + descriptor.name + ".";
+
_description.setText(
Utils.substitute(descriptor.description, resolver));
_description.setEditable(isEditable);
@@ -501,14 +503,14 @@ class AdapterEditor extends CommunicatorChildEditor
}
else
{
- _endpoints.setText(Utils.substitute(adapter.getProperty("Endpoints"), resolver));
+ _endpoints.setText(Utils.substitute(adapter.getProperty(oaPrefix + "Endpoints"), resolver));
}
_endpoints.setEditable(isEditable);
_publishedEndpoints.setEnabled(true);
_publishedEndpoints.setEditable(true);
String published =
- Utils.substitute(adapter.getProperty("PublishedEndpoints"), resolver);
+ Utils.substitute(adapter.getProperty(oaPrefix + "PublishedEndpoints"), resolver);
if(published == null || published.equals(""))
{
_publishedEndpoints.setSelectedItem(PUBLISH_ACTUAL);