From 41dda78fefa230f1cbd103f3f4515f73e8808006 Mon Sep 17 00:00:00 2001 From: quasi Date: Sat, 8 Jan 2011 16:35:12 +0000 Subject: [PATCH] Klasse TextPage eleminieren MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Traversal-Adapter angepaßt - Referenzen auf TextPage entfernt Authorig-Step angepaßt - Refenez auf TextPageBody angepaßt Einige Kommentare geändert git-svn-id: https://svn.libreccm.org/ccm/trunk@673 8810af33-2d31-482b-a856-94f89814c4df --- .../src/WEB-INF/content-types/edit-body-text-step.xml | 2 +- ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml | 10 +++++----- ccm-cms/src/com/arsdigita/cms/TextAsset.java | 2 +- .../com/arsdigita/cms/contenttypes/GenericArticle.java | 2 +- .../cms/installer/xml/XMLContentItemHandler.java | 2 +- .../src/com/arsdigita/cms/ui/DomainObjectRenderer.java | 2 +- .../com/arsdigita/cms/ui/authoring/TextAssetBody.java | 10 +++++----- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ccm-cms/src/WEB-INF/content-types/edit-body-text-step.xml b/ccm-cms/src/WEB-INF/content-types/edit-body-text-step.xml index 6e02ba3f8..1419412de 100755 --- a/ccm-cms/src/WEB-INF/content-types/edit-body-text-step.xml +++ b/ccm-cms/src/WEB-INF/content-types/edit-body-text-step.xml @@ -5,5 +5,5 @@ labelBundle="com.arsdigita.cms.CMSResources" descriptionKey="cms.contenttypes.shared.body_text.description" descriptionBundle="com.arsdigita.cms.CMSResources" - component="com.arsdigita.cms.ui.authoring.TextPageBody"/> + component="com.arsdigita.cms.ui.authoring.GenericArticleBody"/> diff --git a/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml b/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml index c7d3a29d4..cf8168272 100755 --- a/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml +++ b/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml @@ -67,7 +67,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/ccm-cms/src/com/arsdigita/cms/TextAsset.java b/ccm-cms/src/com/arsdigita/cms/TextAsset.java index 713bf272f..45100346c 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/TextAsset.java @@ -105,7 +105,7 @@ public class TextAsset extends Asset { //***** // NOTE: readText is no longer used (except in a test) because it // does no input validation. Processing for loading files is now done - // in TextPageBody.java. + // in GenericArticleBody.java. //***** public long readText(Reader reader) throws IOException { //this does not work since get(CONTENT) returns a null value diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericArticle.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericArticle.java index decb512db..0d842617f 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericArticle.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericArticle.java @@ -92,7 +92,7 @@ public class GenericArticle extends ContentPage { } /** - * Return the text asset for this TextPage. Could return + * Return the text asset for this GenericArticle. Could return * null if there is no text body actually associated with the page */ public TextAsset getTextAsset() { diff --git a/ccm-cms/src/com/arsdigita/cms/installer/xml/XMLContentItemHandler.java b/ccm-cms/src/com/arsdigita/cms/installer/xml/XMLContentItemHandler.java index d7217ffda..193bc291e 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/xml/XMLContentItemHandler.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/xml/XMLContentItemHandler.java @@ -56,7 +56,7 @@ import org.xml.sax.helpers.DefaultHandler; * and replicated to the specified depth --> * <ccm:content-item * clone="2" - * helperClass="com.arsdigita.cms.installer.xml.TextPageHelper"> + * helperClass="com.arsdigita.cms.installer.xml.GenericArticleHelper"> * <!-- ContentItems can be cloned but cannot have a depth. The * helperClass is used to create the object described here --> * <ccm:content-type diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java b/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java index dde764de1..0c1826f5b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java @@ -87,7 +87,7 @@ import java.util.Set; * ... * <textAsset oid="[com.arsdigita.cms.TextAsset:42]" * <content>I am the text</content> - * <parent oid="[com.arsdigita.cms.TextPage:13]" /> + * <parent oid="[com.arsdigita.cms.contenttypes.GenericPage:13]" /> * ... * </textAsset> * ... diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java index 6c1931b9f..7e32cb782 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java @@ -81,7 +81,7 @@ import com.arsdigita.util.UncheckedWrapperException; * classes should override the {@link #createTextAsset(PageState)} method * in to create a valid text asset. *

- * This component is used primarily in {@link TextPageBody} and + * This component is used primarily in {@link GenericArticleBody} and * {@link com.arsdigita.cms.ui.templates.TemplateBody} * * @author Stanislav Freidin (sfreidin@arsdigita.com) @@ -108,7 +108,7 @@ public abstract class TextAssetBody extends SecurityPropertyEditor } /** - * Construct a new TextPageBody component + * Construct a new GenericArticleBody component * * @param assetModel The {@link ItemSelectionModel} which will * be responsible for maintaining the current asset @@ -117,7 +117,7 @@ public abstract class TextAssetBody extends SecurityPropertyEditor this(assetModel,null); } /** - * Construct a new TextPageBody component + * Construct a new GenericArticleBody component * * @param assetModel The {@link ItemSelectionModel} which will * be responsible for maintaining the current asset @@ -163,7 +163,7 @@ public abstract class TextAssetBody extends SecurityPropertyEditor /** * Adds the options for the mime type select widget of - * TextPageForm and sets the default mime type. + * GenericArticleForm and sets the default mime type. **/ protected void setMimeTypeOptions(SingleSelect mimeSelect) { FileUploadSection.addMimeOptions(mimeSelect, "text"); @@ -188,7 +188,7 @@ public abstract class TextAssetBody extends SecurityPropertyEditor } // Create a text asset if it does not exist. - // This should probably be a method in TextPage ? + // This should probably be a method in GenericArticle ? protected TextAsset createOrGetTextAsset(ItemSelectionModel assetModel, PageState s) { // Get the text asset or create a new one