From 470b1628e94cc4f34300d456ef5b73cf4af052ed Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 14 Dec 2021 19:23:58 +0100 Subject: [PATCH] Moved Java classes for authoring steps of article to separate package. --- .../src/main/java/org/librecms/contenttypes/Article.java | 6 +++--- .../ui/contentsections/documents/CmsMvcAuthoringSteps.java | 6 +++--- .../ui/contenttypes/{ => article}/ArticleMessageBundle.java | 2 +- .../contenttypes/{ => article}/ArticleStepsConstants.java | 2 +- .../ui/contenttypes/{ => article}/MvcArticleCreateStep.java | 2 +- .../{ => article}/MvcArticlePropertiesStep.java | 2 +- .../{ => article}/MvcArticlePropertiesStepModel.java | 2 +- .../contenttypes/{ => article}/MvcArticleTextBodyStep.java | 2 +- .../{ => article}/MvcArticleTextBodyStepModel.java | 2 +- .../{ => article}/MvcArticleTextBodyStepResources.java | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/ArticleMessageBundle.java (96%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/ArticleStepsConstants.java (96%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticleCreateStep.java (99%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticlePropertiesStep.java (99%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticlePropertiesStepModel.java (98%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticleTextBodyStep.java (99%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticleTextBodyStepModel.java (98%) rename ccm-cms/src/main/java/org/librecms/ui/contenttypes/{ => article}/MvcArticleTextBodyStepResources.java (99%) diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java index 85c20347d..9a5c10dcb 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java @@ -39,9 +39,9 @@ import org.librecms.CmsConstants; import static org.librecms.CmsConstants.*; import org.librecms.contentsection.ContentItem; -import org.librecms.ui.contenttypes.MvcArticleCreateStep; -import org.librecms.ui.contenttypes.MvcArticlePropertiesStep; -import org.librecms.ui.contenttypes.MvcArticleTextBodyStep; +import org.librecms.ui.contenttypes.article.MvcArticleCreateStep; +import org.librecms.ui.contenttypes.article.MvcArticlePropertiesStep; +import org.librecms.ui.contenttypes.article.MvcArticleTextBodyStep; import org.librecms.ui.contentsections.documents.MvcAuthoringKit; import javax.xml.bind.annotation.XmlRootElement; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CmsMvcAuthoringSteps.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CmsMvcAuthoringSteps.java index 178ecd970..5285892b0 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CmsMvcAuthoringSteps.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/CmsMvcAuthoringSteps.java @@ -22,9 +22,9 @@ import org.librecms.ui.contentsections.documents.media.MediaStep; import org.librecms.ui.contentsections.documents.media.MediaStepService; import org.librecms.ui.contentsections.documents.relatedinfo.RelatedInfoStep; import org.librecms.ui.contentsections.documents.relatedinfo.RelatedInfoStepService; -import org.librecms.ui.contenttypes.MvcArticlePropertiesStep; -import org.librecms.ui.contenttypes.MvcArticleTextBodyStep; -import org.librecms.ui.contenttypes.MvcArticleTextBodyStepResources; +import org.librecms.ui.contenttypes.article.MvcArticlePropertiesStep; +import org.librecms.ui.contenttypes.article.MvcArticleTextBodyStep; +import org.librecms.ui.contenttypes.article.MvcArticleTextBodyStepResources; import java.util.Set; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleMessageBundle.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleMessageBundle.java similarity index 96% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleMessageBundle.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleMessageBundle.java index 86c9a172a..188f4b747 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleMessageBundle.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleMessageBundle.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import org.libreccm.ui.AbstractMessagesBean; import org.librecms.contenttypes.Article; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleStepsConstants.java similarity index 96% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleStepsConstants.java index 552cf117a..abe8367b6 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/ArticleStepsConstants.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/ArticleStepsConstants.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; /** * Constants for the authoring steps for editing an {@link Article}. diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java similarity index 99% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleCreateStep.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java index eb53fddbc..d782cb225 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.l10n.LocalizedString; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java similarity index 99% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java index cd669cdca..329a5d469 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import org.libreccm.l10n.GlobalizationHelper; import org.libreccm.l10n.LocalizedString; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStepModel.java similarity index 98% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStepModel.java index 392a82ecb..fc5733316 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStepModel.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import java.util.ArrayList; import java.util.Collections; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java similarity index 99% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java index 3583f779a..fac3b101f 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import com.arsdigita.kernel.KernelConfig; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepModel.java similarity index 98% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepModel.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepModel.java index 7163725a5..e0262d403 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepModel.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import org.librecms.ui.contentsections.documents.CmsEditorLocaleVariantRow; diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepResources.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepResources.java similarity index 99% rename from ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepResources.java rename to ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepResources.java index 876f3d1ab..551eaa4a9 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepResources.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStepResources.java @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ -package org.librecms.ui.contenttypes; +package org.librecms.ui.contenttypes.article; import org.jsoup.Jsoup; import org.jsoup.nodes.Document;