MID-2587 appender multiselection component is fixed

Evolveum · Nov 19, 2015 · 19d8d00 · 19d8d00
1 parent de3b167
commit 19d8d00
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/...java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java b/...java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
@@ -16,10 +16,7 @@
 
 package com.evolveum.midpoint.web.page.admin.configuration.component;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
@@ -373,6 +370,9 @@ protected String load() {
             @Override
             protected InputPanel createInputPanel(String componentId, IModel<LoggerConfiguration> model) {
                 IModel<Map<String, String>> options = new Model(null);
+                Map<String, String> optionsMap = new HashMap<String, String>();
+                optionsMap.put("nonSelectedText", createStringResource("LoggingConfigPanel.appenders.Inherit").getString());
+                options.setObject(optionsMap);
                 ListMultipleChoicePanel panel = new ListMultipleChoicePanel<>(componentId,
                         new PropertyModel<List<String>>(model, getPropertyExpression()),
                         createNewLoggerAppendersListModel(), new IChoiceRenderer<String>() {
@@ -415,11 +415,8 @@ public List<String> getObject() {
 
                 LoggingDto dto = getModel().getObject();
 
-                for(AppenderConfiguration appender: dto.getAppenders()){
-
-                    if(!appender.getName().equals(dto.getRootAppender())){
-                        list.add(appender.getName());
-                    }
+                for (AppenderConfiguration appender : dto.getAppenders()) {
+                    list.add(appender.getName());
                 }
 
                 return list;