You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2012/09/06 00:33:10 UTC
svn commit: r1381425 -
/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
Author: ldywicki
Date: Wed Sep 5 22:33:10 2012
New Revision: 1381425
URL: http://svn.apache.org/viewvc?rev=1381425&view=rev
Log:
KARAF-1793 Fix configuration edit form (file missed in previous commit).
Signed-off-by: Lukasz Dywicki <lu...@code-house.org>
Modified:
karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
Modified: karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java?rev=1381425&r1=1381424&r2=1381425&view=diff
==============================================================================
--- karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java (original)
+++ karaf/webconsole/trunk/osgi/config/src/main/java/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.java Wed Sep 5 22:33:10 2012
@@ -53,20 +53,20 @@ public class ConfigurationEditPage exten
pid = params.get("pid").toString();
add(new Label("pid", pid));
- Configuration configuration = new ConfigurationModel(pid, configurationAdmin).getObject();
+ ConfigurationModel configuration = new ConfigurationModel(pid, configurationAdmin);
+ setDefaultModel(configuration);
@SuppressWarnings("unchecked")
- Map<String, String> properties = DictionaryUtils.map(configuration.getProperties());
+ Map<String, String> properties = DictionaryUtils.map(configuration.getObject().getProperties());
Map<String, String> system = ConfigurationFilterUtil.filter(properties);
- CompoundPropertyModel<Map<String, String>> formModel = new CompoundPropertyModel<Map<String, String>>(properties);
- MapEditForm<String, String> mapEditForm = new MapEditForm<String, String>("edit", formModel) {
+ MapEditForm<String, String> mapEditForm = new MapEditForm<String, String>("edit", new CompoundPropertyModel<Map<String, String>>(properties)) {
@Override
protected void onSubmit() {
Map<String, String> map = getModelObject();
+ Configuration configuration = (Configuration) ConfigurationEditPage.this.getDefaultModelObject();
try {
- Configuration configuration = new ConfigurationModel(pid, configurationAdmin).getObject();
if (configuration.getBundleLocation() != null) {
configuration.setBundleLocation(null);
}
@@ -75,7 +75,7 @@ public class ConfigurationEditPage exten
Session.get().info("Configuration " + pid + " updated.");
RequestCycle.get().setResponsePage(ConfigurationsPage.class);
} catch (IOException e) {
- e.printStackTrace();
+ error("Unable to update configuration " + e.getMessage());
}
}
};