From 31c97fcda834787343f59bb08bd7606713ef31f5 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 2 Jun 2009 09:41:56 +0000 Subject: [PATCH] =?UTF-8?q?Aktueller=20Stand,=20GenericOrgnization,=20ein?= =?UTF-8?q?=20paar=20=C3=84nderungen=20in=20MultipartArticle=20(=C3=BCberf?= =?UTF-8?q?l=C3=BCssige=20Casts=20entfernt)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@187 8810af33-2d31-482b-a856-94f89814c4df --- .../content-types/GenericOrganization.pdl | 47 ++----------------- .../cms/contenttypes/ArticleSection.java | 6 +-- .../cms/contenttypes/MultiPartArticle.java | 33 +++++++------ .../ui/mparticle/MultiPartArticleCreate.java | 1 + .../mparticle/MultiPartArticleEditForm.java | 7 ++- .../ui/mparticle/SectionTable.java | 16 +++++-- 6 files changed, 40 insertions(+), 70 deletions(-) diff --git a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl index 177348225..cc549d0d2 100644 --- a/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl +++ b/ccm-cms-types-genericorganization/pdl/com/arsdigita/content-types/GenericOrganization.pdl @@ -28,51 +28,10 @@ object type GenericOrganization extends ContentPage { String[0..1] organizationnameaddendum = ct_genericorganizations.organizationnameaddendum VARCHAR(512); String[0..1] description = ct_genericorganizations.description VARCHAR(2000); - component OrganizationFunction[0..n] functions = join ct_genericorganizations.organization_id to ct_organizationfunctions.function_id; - reference key (ct_genericorganizations.organization_id); } -object type OrganizationFunction extends ContentItem { - - String[1..1] functionname = ct_organizationfunctions.functionname VARCHAR(256); - - reference key ( ct_organizationfunctions.function_id ); -} - association { - GenericOrganization[0..1] associatedOrganizationForItem = - join cms_items.item_id to genericorganization_content_item_map.item_id, - join genericorganization_content_item_map.organization_id to ct_genericorganizations.organization_id; - - ContentItem[0..n] associatedContentItemsForOrganization = - join ct_genericorganizations.organization_id to genericorganization_content_item_map.organization_id, - join genericorganization_content_item_map.item_id to cms_items.item_id; -} - -// As mentioned in ccm-cms-types-contact/Contact.pdl (orginal version) an association of the above pattern -// does not work when removing items from the association. Instead of this, an data operation has to be used. - -data operation removeGenericOrganizationFromContentItemAssociation { - do { - delete from genericorganization_content_item_map where item_id = :itemID - } -} - -data operation removeGenericOrganizationFromAllAssociations { - do { - delete from genericorganization_content_item_map where organization_id = :organizationID; - } -} - -query getGenericOrganizationForItem { - BigDecimal genericOrganizationID; - BigDecimal itemID; - - do { - select genericorganization_id, item_id from genericorganization_content_item_map where item_id = :itemID - } map { - genericOrganizationID = genericorganization_id; - itemID = item_id; - } -} + composite GenericOrganization[1..1] orga = join ct_genericorganization_roles.organization_id to ct_genericorganizations.organization_id; + composite OrganizationRole[0..n] roles = join ct_genericorganizations.organization_id to ct_genericorganization_roles.organization_id; +} \ No newline at end of file diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java index 0c288d286..850b4f5b1 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSection.java @@ -63,8 +63,7 @@ public class ArticleSection extends ContentPage { * * @param id the id of the object to retrieve */ - public ArticleSection(BigDecimal id) - throws DataObjectNotFoundException { + public ArticleSection(BigDecimal id) throws DataObjectNotFoundException { this(new OID(BASE_DATA_OBJECT_TYPE, id)); } @@ -73,8 +72,7 @@ public class ArticleSection extends ContentPage { * * @param id the id of the object to retrieve */ - public ArticleSection(OID id) - throws DataObjectNotFoundException { + public ArticleSection(OID id) throws DataObjectNotFoundException { super(id); } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticle.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticle.java index e152922dc..c623f4b13 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticle.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticle.java @@ -29,14 +29,14 @@ import com.arsdigita.persistence.OID; import org.apache.log4j.Logger; import java.math.BigDecimal; -import java.util.Collection; -import java.util.HashSet; +import java.util.Collection; +import java.util.HashSet; /** * CMS content type that represents a multi-part article. * * @author Dave Turner - * @version $Id: MultiPartArticle.java 1500 2007-03-20 09:25:45Z chrisgilbert23 $ + * @version $Id: MultiPartArticle.java 1500 2007-03-20 09:25:45Z chrisgilbert23 $ */ public class MultiPartArticle extends ContentPage { @@ -60,18 +60,17 @@ public class MultiPartArticle extends ContentPage { public static final String RANK = "rank"; public static final String ARTICLE = "article"; public static final String SECTION = "section"; + + private static MultiPartArticleConfig s_config = new MultiPartArticleConfig(); + + static { + s_config.load(); + } + + public static MultiPartArticleConfig getConfig() { + return s_config; + } - - - private static MultiPartArticleConfig s_config = new MultiPartArticleConfig(); - - static { - s_config.load(); - } - - public static MultiPartArticleConfig getConfig() { - return s_config; - } /** Default constructor. */ public MultiPartArticle() { super(BASE_DATA_OBJECT_TYPE); @@ -156,7 +155,7 @@ public class MultiPartArticle extends ContentPage { addSection(section, new Integer(rank)); } - public ArticleSectionCollection getSections(boolean asc) { + public ArticleSectionCollection getSections(boolean asc) { DataAssociationCursor dac = ((DataAssociation) get(SECTIONS)).cursor(); String direction = asc ? " asc" : " desc"; dac.addOrder(RANK + direction); @@ -290,6 +289,6 @@ public class MultiPartArticle extends ContentPage { (summary, SUMMARY_LENGTH, true); } } - - + + } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleCreate.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleCreate.java index b3535df14..7e5d8b844 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleCreate.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleCreate.java @@ -67,6 +67,7 @@ public class MultiPartArticleCreate extends MultiPartArticleForm getSaveCancelSection().getSaveButton().setButtonLabel("Create"); } + @Override protected void addWidgets() { m_workflowSection = new ApplyWorkflowFormSection(); add(m_workflowSection, ColumnPanel.INSERT); diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java index 71e319f86..98b16a846 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleEditForm.java @@ -41,7 +41,9 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm public MultiPartArticleEditForm(ItemSelectionModel itemModel, SimpleEditStep step) { - super("MutliPartArticleEditForm", itemModel); + //I assume this was a typo, so I corrected it: + //super("MutliPartArticleEditForm", itemModel); + super("MultiPartArticleEditForm", itemModel); addSubmissionListener(this); m_step = step; } @@ -60,7 +62,7 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm public void process(FormSectionEvent e) throws FormProcessException { PageState state = e.getPageState(); - MultiPartArticle article = (MultiPartArticle)processBasicWidgets(e); + MultiPartArticle article = processBasicWidgets(e); m_step.maybeForwardToNextStep(e.getPageState()); } @@ -98,4 +100,5 @@ public class MultiPartArticleEditForm extends MultiPartArticleForm return (Folder) parent; } + } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java index de8187f47..25b0046fc 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/SectionTable.java @@ -55,8 +55,12 @@ import java.math.BigDecimal; */ public class SectionTable extends Table { - private static final Logger log = - Logger.getLogger(SectionTable.class.getName()); + /** + * The class has already a logger (s_log), so I removed this. + * Jens Pelzetter 2009-05-29 + */ + /*private static final Logger log = + Logger.getLogger(SectionTable.class.getName());*/ // column headings public static final String COL_TITLE = "Section"; @@ -75,6 +79,7 @@ public class SectionTable extends Table * * @param selArticle a selection model that returns the MultiPartArticle * which holds the sections to display. + * @param moveSection */ public SectionTable ( ItemSelectionModel selArticle, ItemSelectionModel moveSection ) { super(); @@ -194,7 +199,12 @@ public class SectionTable extends Table private ArticleSection m_section; - /** Constructor. */ + /** Constructor. + * @param table + * @param state + * @param article + * @param moveSection + */ public SectionTableModel ( Table table, PageState state, MultiPartArticle article, ItemSelectionModel moveSection ) { m_colModel = table.getColumnModel();