diff --git a/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml b/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml index 8c99f5d9e..45c445ae0 100644 --- a/ccm-cms-types-baseAddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xml +++ b/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"> diff --git a/ccm-cms-types-baseAddress/src/ccm-cms-types-baseAddress.config b/ccm-cms-types-baseAddress/src/ccm-cms-types-baseAddress.config index 610be6c7f..6eb390cf1 100755 --- a/ccm-cms-types-baseAddress/src/ccm-cms-types-baseAddress.config +++ b/ccm-cms-types-baseAddress/src/ccm-cms-types-baseAddress.config @@ -1,4 +1,4 @@ - + diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java index 31c5a1f5b..9ed8e886c 100755 --- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddress.java +++ b/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 - = "com.arsdigita.cms.contenttypes.BaseAddress"; - - private static final BaseAddressConfig s_config = new BaseAddressConfig(); -// static { -// s_config.load(); -// } -// public static BaseAddressConfig getConfig() -// { -// return s_config; -// } - + public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.BaseAddress"; + /** * 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); } diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressConfig.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressConfig.java deleted file mode 100644 index a8b810220..000000000 --- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressConfig.java +++ /dev/null @@ -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(); - } -} - diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources.properties b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources.properties deleted file mode 100755 index b38a1563b..000000000 --- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources_de.properties b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources_de.properties deleted file mode 100644 index 4f8ded62a..000000000 --- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/BaseAddressResources_de.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/ccm-cms-types-member/src/ccm-cms-types-member.config b/ccm-cms-types-member/src/ccm-cms-types-member.config index c91bf1def..2cf5a931f 100644 --- a/ccm-cms-types-member/src/ccm-cms-types-member.config +++ b/ccm-cms-types-member/src/ccm-cms-types-member.config @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java index a7f82ecac..29fe68d58 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/Member.java +++ b/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. diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberConfig.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberConfig.java deleted file mode 100644 index 2018f47af..000000000 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/MemberConfig.java +++ /dev/null @@ -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 { - -} diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertiesStep.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertiesStep.java index 43f8aa63a..817298043 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertiesStep.java +++ b/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) { diff --git a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertyForm.java b/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertyForm.java index c096654d8..ca62f09bb 100644 --- a/ccm-cms-types-member/src/com/arsdigita/cms/contenttypes/ui/MemberPropertyForm.java +++ b/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(); diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/ChangeableSingleSelect.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/ChangeableSingleSelect.java index b1b97babc..80625e089 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/ChangeableSingleSelect.java +++ b/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 { diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java index 3086022ba..ccd4d8fff 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java +++ b/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; + + } + } diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/indexing/Indexer.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/indexing/Indexer.java index 082004d80..1c3595b29 100644 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/indexing/Indexer.java +++ b/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.