Diverse Kleinigkeiten:

z.B.
com-ibm.icu.util.Calender durch java.util.Calender ersetzt
Unnötige Config-Dateien aus Member und baseAddress entfernt

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

ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml

@@ -14,10 +14,10 @@
 	createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
      
       <ctd:authoring-step 
-	  labelKey="baseAddress.authoring.basic_properties.title" 
+	  labelKey="address.authoring.basic_properties.title"
-	  labelBundle="com.arsdigita.cms.contenttypes.BaseAddressResources"
+	  labelBundle="com.arsdigita.cms.basetypes.BasetypesResources"
-	  descriptionKey="baseAddress.authoring.basic_properties.description" 
+	  descriptionKey="address.authoring.basic_properties.description"
-	  descriptionBundle="com.arsdigita.cms.contenttypes.BaseAddressResources"
+	  descriptionBundle="com.arsdigita.cms.basetypes.BasetypesResources"
 	  component="com.arsdigita.cms.contenttypes.ui.BaseAddressPropertiesStep" 
 	  ordering="1"/>
       

ccm-cms-types-baseAddress/src/ccm-cms-types-baseAddress.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <config class="com.arsdigita.cms.contenttypes.BaseAddressConfig" storage="ccm-cms-types-baseAddress/baseAddress.properties"/>
+  <!-- nothing yet-->
 </registry>

ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java

@@ -18,7 +18,6 @@
  */
 package com.arsdigita.cms.contenttypes;
 
-
 import com.arsdigita.globalization.LocaleNegotiator;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.basetypes.Address;
@@ -45,18 +44,8 @@ import java.util.TreeMap;
 public class BaseAddress extends Address {
 
     /** Data object type for this domain object */
-    public static final String BASE_DATA_OBJECT_TYPE
+    public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.BaseAddress";
-        = "com.arsdigita.cms.contenttypes.BaseAddress";
+    
-
-    private static final BaseAddressConfig s_config = new BaseAddressConfig();
-//    static {
-//	    s_config.load();
-//    }
-//    public static BaseAddressConfig getConfig()
-//    {
-//	    return s_config;
-//    }
-
     /**
      * Default constructor. This creates a new (empty) BaseAddress.
      **/
@@ -117,7 +106,7 @@ public class BaseAddress extends Address {
      */
     public void beforeSave() {
         super.beforeSave();
-        
+
         Assert.exists(getContentType(), ContentType.class);
     }
 

ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressConfig.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2004 Red Hat Inc. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-package com.arsdigita.cms.contenttypes;
-
-import com.arsdigita.runtime.AbstractConfig;
-import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.util.parameter.BooleanParameter;
-
-public class BaseAddressConfig extends AbstractConfig {
-
-    private final Parameter m_hideCountryCodeSelection;
-    private final Parameter m_hidePostalCode;
-
-    public BaseAddressConfig() {
-        m_hideCountryCodeSelection = new BooleanParameter(
-                "com.arsdigita.cms.contenttypes.baseaddress.hide_country_code_selection",
-                Parameter.REQUIRED,
-                new Boolean(false));
-
-        m_hidePostalCode = new BooleanParameter(
-                "com.arsdigita.cms.contenttypes.baseaddress.hide_postal_code",
-                Parameter.REQUIRED,
-                new Boolean(false));
-
-
-        register(m_hideCountryCodeSelection);
-        register(m_hidePostalCode);
-
-        loadInfo();
-    }
-
-    public final boolean getHideCountryCodeSelection() {
-        return ((Boolean) get(m_hideCountryCodeSelection)).booleanValue();
-    }
-
-    public final boolean getHidePostalCode() {
-        return ((Boolean) get(m_hidePostalCode)).booleanValue();
-    }
-}
- 

ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources.properties

@@ -1,7 +0,0 @@
-cms.contenttypes.ui.baseAddress.address=Address
-cms.contenttypes.ui.baseAddress.postal_code=Postal Code
-cms.contenttypes.ui.baseAddress.city=City
-cms.contenttypes.ui.baseAddress.state=State
-cms.contenttypes.ui.baseAddress.iso_country_code=Country
-cms.contenttypes.ui.baseAddress.error_iso_country=You must select a country
-baseAddress.authoring.basic_properties.title=Basic Properties

ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources_de.properties

@@ -1,7 +0,0 @@
-cms.contenttypes.ui.baseAddress.address=Anschrift
-cms.contenttypes.ui.baseAddress.postal_code=Postleitzahl
-cms.contenttypes.ui.baseAddress.city=Stadt
-cms.contenttypes.ui.baseAddress.state=Bundesland
-cms.contenttypes.ui.baseAddress.iso_country_code=Land
-cms.contenttypes.ui.baseAddress.error_iso_country=Bitte wählen Sie ein Land aus
-baseAddress.authoring.basic_properties.title=Eigenschaften von Adresse

ccm-cms-types-member/src/ccm-cms-types-member.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <config class="com.arsdigita.cms.contenttypes.MemberConfig"
+<!-- nothing yet -->
-	  storage="ccm-cms-types-member/member.properties"/>
 </registry>

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java

@@ -36,16 +36,6 @@ public class Member extends Person {
 
     /** Data object type for this domain object */
     public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Member";
-//    private static final MemberConfig s_config = new MemberConfig();
-
-
-//    static {
-//        s_config.load();
-//    }
-
-//    public static final MemberConfig getConfig() {
-//        return s_config;
-//    }
 
     /**
      * Default constructor. This creates a new (empty) Member.

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberConfig.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2009 Jens Pelzetter, for the Center of Social Politics of the University of Bremen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-package com.arsdigita.cms.contenttypes;
-
-import com.arsdigita.runtime.AbstractConfig;
-
-/**
- *
- * @author Jens Pelzetter
- */
-public class MemberConfig extends AbstractConfig {
-
-}

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertiesStep.java

@@ -32,9 +32,6 @@ public class MemberPropertiesStep extends PersonPropertiesStep {
 
     public MemberPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) {
         super(itemModel, parent);
-//        createEditSheet(itemModel);
-
-//        setDisplayComponent(getMemberPropertySheet(itemModel));
     }
 
     protected void createEditSheet(ItemSelectionModel itemModel) {

ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertyForm.java

@@ -66,15 +66,6 @@ public class MemberPropertyForm extends PersonPropertyForm implements FormProces
         Member member = (Member) super.initBasicWidgets(fse);
     }
 
-/*
-    public void submitted(FormSectionEvent fse) {
-        if (m_step != null
-                && getSaveCancelSection().getCancelButton().isSelected(fse.getPageState())) {
-            m_step.cancelStreamlinedCreation(fse.getPageState());
-        }
-    }
-*/
-
     public void process(FormSectionEvent fse) {
         super.process(fse);
         FormData data = fse.getFormData();

ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/ChangeableSingleSelect.java

@@ -119,11 +119,11 @@ public class ChangeableSingleSelect extends SingleSelect {
     @Override
     @SuppressWarnings("deprecation")
     public void setOptionSelected(String value) {
-        Assert.assertNotLocked(this);
+//        Assert.assertNotLocked(this);
         if (!isMultiple()) {
             // only one option may be selected
             // to this selected list better be empty
-            Assert.assertTrue(m_selected.size() == 0, TOO_MANY_OPTIONS_SELECTED);
+//            Assert.assertTrue(m_selected.size() == 0, TOO_MANY_OPTIONS_SELECTED);
             m_selected.add(value);
             getParameterModel().setDefaultValue(value);
         } else {

ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java

@@ -126,4 +126,16 @@ public class PersistentRadioGroup extends PersistentOptionGroup {
         return radio;
     }
 
+    // HACK: Quasimodo - Gibt es eine bessere Art, auf diese Methode zuzugreifen?
+    public OptionGroup createOptionGroup(String name) {
+
+        RadioGroup radio = new RadioGroup(name);
+
+        addDataToComponent(radio);
+        copyValuesToWidget(radio);
+
+        return radio;
+
+    }
+
 }

ccm-ldn-terms/src/com/arsdigita/london/terms/indexing/Indexer.java

@@ -39,7 +39,8 @@ import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.Assert;
-import com.ibm.icu.util.Calendar;
+import java.util.Calendar;
+
 
 /**
  * The domain indexer is used for keyphrase extraction of content items.