From 8fde211ebaedf4b5abc4c6ac7ea78f2cd7644885 Mon Sep 17 00:00:00 2001 From: quasi Date: Wed, 26 May 2010 06:50:36 +0000 Subject: [PATCH] CT Address MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Verwendet nun ausschließlich die UI von basetypes.Address CT fertig git-svn-id: https://svn.libreccm.org/ccm/trunk@439 8810af33-2d31-482b-a856-94f89814c4df --- ccm-cms-types-address/application.xml | 42 +++--- .../arsdigita/cms/contenttypes/Address.xml | 46 +++---- .../arsdigita/cms/contenttypes/Address.java | 5 +- .../cms/contenttypes/AddressInitializer.java | 9 +- .../cms/contenttypes/AddressLoader.java | 1 - .../ui/AddressPropertiesStep.java | 47 ------- .../contenttypes/ui/AddressPropertyForm.java | 64 ---------- .../arsdigita/cms/contenttypes/Address.xsl | 120 +++++++++--------- 8 files changed, 109 insertions(+), 225 deletions(-) delete mode 100644 ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java delete mode 100644 ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java diff --git a/ccm-cms-types-address/application.xml b/ccm-cms-types-address/application.xml index 29979d282..3808efa46 100755 --- a/ccm-cms-types-address/application.xml +++ b/ccm-cms-types-address/application.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - The Address Content Type for the Red Hat CCM CMS. - + name="ccm-cms-types-address" + prettyName="Red Hat CCM Content Types" + version="6.6.0" + release="1" + webapp="ROOT"> + + + + + + + + + + + + + + + The Address Content Type for the Red Hat CCM CMS. + diff --git a/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml b/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml index f4e6e2c68..c66a475cb 100644 --- a/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml +++ b/ccm-cms-types-address/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml @@ -1,28 +1,28 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> - - - - - - - - - - + + + + + + + + + + diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java index fbf08914f..50f280a58 100755 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java +++ b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/Address.java @@ -18,15 +18,12 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.globalization.LocaleNegotiator; import com.arsdigita.cms.ContentType; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.util.Assert; import java.math.BigDecimal; -import java.util.Locale; -import java.util.TreeMap; /** *

DomainObject class to represent address ContentType @@ -44,7 +41,7 @@ public class Address extends com.arsdigita.cms.basetypes.Address { /** Data object type for this domain object */ public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.contenttypes.Address"; - + /** * Default constructor. This creates a new (empty) Address. **/ diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java index 96e459dbc..e5f87991c 100755 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java +++ b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressInitializer.java @@ -12,14 +12,13 @@ public class AddressInitializer extends ContentTypeInitializer { public AddressInitializer() { super("ccm-cms-types-address.pdl.mf", - Address.BASE_DATA_OBJECT_TYPE); + Address.BASE_DATA_OBJECT_TYPE); } @Override public String[] getStylesheets() { - return new String[] { - "/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" - }; + return new String[]{ + "/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" + }; } - } diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java index a95a3571a..a2bc7ed03 100755 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java +++ b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/AddressLoader.java @@ -13,5 +13,4 @@ public class AddressLoader extends AbstractContentTypeLoader { public String[] getTypes() { return TYPES; } - } diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java deleted file mode 100644 index e097fbe5e..000000000 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertiesStep.java +++ /dev/null @@ -1,47 +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.ui; - -import com.arsdigita.bebop.Component; -import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; -import com.arsdigita.cms.ui.authoring.BasicPageForm; -import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; - - -public class AddressPropertiesStep extends com.arsdigita.cms.basetypes.ui.AddressPropertiesStep { - - public static final String EDIT_SHEET_NAME = "edit"; - - public AddressPropertiesStep(ItemSelectionModel itemModel, - AuthoringKitWizard parent) { - super(itemModel, parent); - } - - @Override - protected void createEditSheet(ItemSelectionModel itemModel) { - BasicPageForm editSheet; - editSheet = new AddressPropertyForm(itemModel, this); - add(EDIT_SHEET_NAME, "Edit", new WorkflowLockedComponentAccess(editSheet, itemModel), editSheet.getSaveCancelSection().getCancelButton()); - } - - public static Component getAddressPropertySheet(ItemSelectionModel itemModel) { - return com.arsdigita.cms.basetypes.ui.AddressPropertiesStep.getAddressPropertySheet(itemModel); - } -} diff --git a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java b/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java deleted file mode 100644 index 23c5fe03f..000000000 --- a/ccm-cms-types-address/src/com/arsdigita/cms/contenttypes/ui/AddressPropertyForm.java +++ /dev/null @@ -1,64 +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.ui; - -import com.arsdigita.bebop.event.FormInitListener; -import com.arsdigita.bebop.event.FormProcessListener; -import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.bebop.event.FormSubmissionListener; -import com.arsdigita.cms.ItemSelectionModel; -import org.apache.log4j.Logger; - -/** - * Form to edit the properties of an address. - * - * @author: Jens Pelzetter - * @author: Sören Bernstein - */ -public class AddressPropertyForm extends com.arsdigita.cms.basetypes.ui.AddressPropertyForm implements FormProcessListener, FormInitListener, FormSubmissionListener { - - private static final Logger s_log = Logger.getLogger(AddressPropertyForm.class); - private AddressPropertiesStep m_step; - public static final String ID = "Address_edit"; - - public AddressPropertyForm(ItemSelectionModel itemModel) { - this(itemModel, null); - } - - public AddressPropertyForm(ItemSelectionModel itemModel, AddressPropertiesStep step) { - super(itemModel, step); - m_step = step; - addSubmissionListener(this); - } - - @Override - protected void addWidgets() { - super.addWidgets(); - } - - @Override - public void init(FormSectionEvent fse) { - super.init(fse); - } - - @Override - public void process(FormSectionEvent fse) { - super.process(fse); - } -} diff --git a/ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl b/ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl index 6a5061f77..808406f34 100644 --- a/ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl +++ b/ccm-cms-types-address/web/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl @@ -6,66 +6,66 @@ xmlns:cms="http://www.arsdigita.com/cms/1.0" version="1.0"> - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Address:
Postal Code:
City:
Country:
-
- + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Address:
Postal Code:
City:
Country:
+
+ - -

- - Address -
- - - Postal Code -
- - - City -
- - - Country -
- - + +

+ + Address +
+ + + Postal Code +
+ + + City +
+ + + Country +
+ +