CCM NG: Some fixes for the new Configuration system

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3780 8810af33-2d31-482b-a856-94f89814c4df

ccm-core/src/main/java/org/libreccm/configuration/EnumSetting.java

@@ -55,7 +55,7 @@ public class EnumSetting
         if (value == null) {
             return null;
         } else {
-            return Collections.unmodifiableSet(value);
+            return value;
         }
     }
 

ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java

@@ -161,9 +161,9 @@ public class ConfigurationManagerTest {
         assertThat(configuration.getItemsPerPage(), is(20L));
         assertThat(configuration.getHelpUrl(),
                    is(equalTo("http://www.example.org")));
-//        assertThat(configuration.getLanguages().size(), is(2));
-//        assertThat(configuration.getLanguages(), hasItem("de")); 
-//        assertThat(configuration.getLanguages(), hasItem("en")); 
+        assertThat(configuration.getLanguages().size(), is(2));
+        assertThat(configuration.getLanguages(), hasItem("de")); 
+        assertThat(configuration.getLanguages(), hasItem("en")); 
     }
 
     @Test
@@ -179,6 +179,7 @@ public class ConfigurationManagerTest {
 
         configuration.setPrice(new BigDecimal("109.99"));
         configuration.setItemsPerPage(30L);
+        configuration.addLanguage("es");
 
         configurationManager.saveConfiguration(configuration);
     }

ccm-core/src/test/java/org/libreccm/configuration/ExampleConfiguration.java

@@ -19,6 +19,7 @@
 package org.libreccm.configuration;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -43,8 +44,8 @@ public class ExampleConfiguration {
     @Setting
     private String helpUrl;
     
-//    @Setting
-//    private Set<String> languages;
+    @Setting
+    private Set<String> languages;
 
     public BigDecimal getPrice() {
         return price;
@@ -86,11 +87,19 @@ public class ExampleConfiguration {
         this.helpUrl = helpUrl;
     }
     
-//    public Set<String> getLanguages() {
-//        return languages;
-//    }
-//    
-//    private void setLanguages(final Set<String> languages) {
-//        this.languages = languages;
-//    }
+    public Set<String> getLanguages() {
+        return Collections.unmodifiableSet(languages);
+    }
+    
+    private void setLanguages(final Set<String> languages) {
+        this.languages = languages;
+    }
+    
+    public void addLanguage(final String language) {
+        languages.add(language);
+    }
+    
+    public void removeLanguage(final String language) {
+        languages.remove(language);
+    }
 }

ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml

@@ -21,6 +21,8 @@ ccm_core.ccm_objects:
       display_name: itemsPerPage
     - object_id: -3500
       display_name: helpUri
+    - object_id: -3600
+      display_name: languages
 
 ccm_core.categories:
     - object_id: -2000
@@ -100,6 +102,12 @@ ccm_core.categorizations:
       category_order: 1
       object_order: 5
       category_index: false
+    - categorization_id: -10600
+      category_id: -2400
+      object_id: -3600
+      category_order: 1
+      object_order: 6
+      category_index: false
 
 ccm_core.settings:
     - object_id: -3100
@@ -112,6 +120,8 @@ ccm_core.settings:
       name: itemsPerPage
     - object_id: -3500
       name: helpUrl
+    - object_id: -3600
+      name: languages
 
 ccm_core.settings_big_decimal:
     - object_id: -3100
@@ -132,4 +142,14 @@ ccm_core.settings_long:
 ccm_core.settings_string:
     - object_id: -3500
       setting_value: http://www.example.org
+      
+ccm_core.settings_enum:
+    - object_id: -3600
 
+ccm_core.settings_enum_values:
+    - enum_id: -3600
+      value: de
+    - enum_id: -3600
+      value: en
+    - enum_id: -3600
+      value: es

ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml

@@ -21,6 +21,8 @@ ccm_core.ccm_objects:
       display_name: itemsPerPage
     - object_id: -3500
       display_name: helpUri
+    - object_id: -3600
+      display_name: languages
     - object_id: 1
       display_name: com
     - object_id: 2
@@ -131,6 +133,12 @@ ccm_core.categorizations:
       category_order: 1
       object_order: 1
       category_index: false
+    - categorization_id: -10600
+      category_id: -2400
+      object_id: -3600
+      category_order: 1
+      object_order: 6
+      category_index: false
     - categorization_id: 4
       category_id: 3
       object_id: 5
@@ -145,6 +153,8 @@ ccm_core.categorizations:
       category_index: false
 
 ccm_core.settings:
+    - object_id: -3600
+      name: languages
     - object_id: -3500
       name: helpUrl
     - object_id: -3300
@@ -183,4 +193,12 @@ ccm_core.settings_long:
 ccm_core.settings_string:
     - object_id: -3500
       setting_value: http://www.example.org
+      
+ccm_core.settings_enum:
+    - object_id: -3600
 
+ccm_core.settings_enum_values:
+    - enum_id: -3600
+      value: de
+    - enum_id: -3600
+      value: en

ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml

@@ -21,6 +21,8 @@ ccm_core.ccm_objects:
       display_name: itemsPerPage
     - object_id: -3500
       display_name: helpUri
+    - object_id: -3600
+      display_name: languages
 
 ccm_core.categories:
     - object_id: -2000
@@ -100,6 +102,12 @@ ccm_core.categorizations:
       category_order: 1
       object_order: 5
       category_index: false
+    - categorization_id: -10600
+      category_id: -2400
+      object_id: -3600
+      category_order: 1
+      object_order: 6
+      category_index: false
 
 ccm_core.settings:
     - object_id: -3100
@@ -112,6 +120,8 @@ ccm_core.settings:
       name: itemsPerPage
     - object_id: -3500
       name: helpUrl
+    - object_id: -3600
+      name: languages
 
 ccm_core.settings_big_decimal:
     - object_id: -3100
@@ -136,7 +146,7 @@ ccm_core.settings_string:
 ccm_core.settings_enum:
     - object_id: -3600
 
-ccm_core.settings_values:
+ccm_core.settings_enum_values:
     - enum_id: -3600
       value: de
     - enum_id: -3600