From b3008e5f04d8f0f1f7c62261e3f0b054a45b0e12 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 16 Dec 2021 20:17:23 +0100 Subject: [PATCH] * Renamed LocalizedString#addValue to LocalizedString#putValue * Edit Steps for Multipart Article Part III --- .../assets/AbstractAssetFormController.java | 2 +- .../AbstractBinaryAssetFormController.java | 2 +- .../ui/assets/forms/AbstractBookmarkForm.java | 2 +- .../forms/AbstractBookmarkFormController.java | 2 +- .../forms/LegalMetadataFormController.java | 2 +- .../assets/forms/SideNoteFormController.java | 2 +- .../cms/ui/authoring/BasicPageForm.java | 4 +- .../cms/ui/authoring/PageCreateForm.java | 4 +- .../article/ArticlePropertyForm.java | 2 +- .../ui/authoring/article/ArticleTextBody.java | 2 +- .../relatedinfo/RelatedInfoListForm.java | 4 +- .../RelatedInfoStepController.java | 2 +- .../ui/authoring/event/EventPropertyForm.java | 12 +- .../cms/ui/authoring/event/EventTextBody.java | 2 +- .../MultiPartArticleCreateForm.java | 4 +- .../MultiPartArticleForm.java | 6 +- ...MultiPartArticleSectionStepController.java | 4 +- .../multipartarticle/SectionEditForm.java | 10 +- .../cms/ui/authoring/news/NewsController.java | 4 +- .../cms/ui/category/AddUseContextForm.java | 2 +- .../cms/ui/category/CategoryController.java | 2 +- .../cms/ui/category/CategoryEditForm.java | 2 +- .../category/CategoryLocalizationAddForm.java | 4 +- .../CategoryLocalizationEditForm.java | 4 +- .../cms/ui/folder/FolderCreateForm.java | 2 +- .../arsdigita/cms/ui/folder/FolderForm.java | 2 +- .../LifecycleAdminPaneController.java | 16 +- .../cms/ui/role/RoleAdminPaneController.java | 4 +- .../com/arsdigita/cms/ui/type/EditType.java | 4 +- .../workflow/WorkflowAdminPaneController.java | 12 +- .../cms/ui/workflow/WorkflowEditForm.java | 4 +- .../org/librecms/assets/AssetL10NManager.java | 2 +- .../librecms/contentsection/AssetManager.java | 4 +- .../AttachmentListL10NManager.java | 2 +- .../ContentItemL10NManager.java | 2 +- .../contentsection/ContentItemManager.java | 4 +- .../contentsection/ContentSectionManager.java | 6 +- .../contentsection/ContentSectionSetup.java | 8 +- .../contentsection/FolderManager.java | 4 +- .../contentsections/CategoriesController.java | 8 +- ...nfigurationContactEntryKeysController.java | 4 +- .../ConfigurationLifecyclesController.java | 20 +- .../ConfigurationRolesController.java | 4 +- .../ConfigurationWorkflowController.java | 20 +- .../DocumentFolderController.java | 8 +- .../assets/AbstractBookmarkCreateStep.java | 2 +- .../assets/AbstractMvcAssetEditStep.java | 4 +- .../assets/AudioAssetCreateStep.java | 2 +- .../assets/AudioAssetEditStep.java | 4 +- .../assets/BookmarkEditStep.java | 4 +- .../assets/FileAssetCreateStep.java | 2 +- .../assets/FileAssetEditStep.java | 4 +- .../assets/ImageCreateStep.java | 2 +- .../contentsections/assets/ImageEditStep.java | 4 +- .../assets/LegalMetadataCreateStep.java | 2 +- .../assets/LegalMetadataEditStep.java | 4 +- .../assets/SideNoteCreateStep.java | 2 +- .../assets/SideNoteEditStep.java | 4 +- .../assets/VideoAssetCreateStep.java | 2 +- .../assets/VideoAssetEditStep.java | 4 +- .../documents/media/MediaStep.java | 12 +- .../relatedinfo/RelatedInfoStep.java | 18 +- .../article/MvcArticleCreateStep.java | 4 +- .../article/MvcArticlePropertiesStep.java | 8 +- .../article/MvcArticleTextBodyStep.java | 4 +- .../ui/contenttypes/mpa/MpaSectionModel.java | 132 ++++++ .../ui/contenttypes/mpa/MvcMpaCreateStep.java | 4 +- .../mpa/MvcMpaPropertiesStep.java | 8 +- .../contenttypes/mpa/MvcMpaSectionsStep.java | 439 +++++++++++++++--- .../ui/contenttypes/mpa/create-mpa.xhtml | 83 ++++ .../ui/contenttypes/MpaStepsBundle.properties | 13 + .../contenttypes/MpaStepsBundle_de.properties | 13 + .../contentsection/AssetManagerIT.java | 2 +- .../contentsection/ContentItemManagerIT.java | 4 +- .../ContentItemRepositoryIT.java | 4 +- .../ContentSectionManagerIT.java | 6 +- .../categories/CategoryDescriptionForm.java | 2 +- .../admin/categories/CategoryTitleForm.java | 2 +- .../categories/DomainDescriptionForm.java | 2 +- .../ui/admin/categories/DomainTitleForm.java | 2 +- .../SettingEditorLocalizedString.java | 2 +- .../ui/admin/pagemodels/PageModelForm.java | 4 +- .../configuration/ExampleConfiguration.java | 4 +- .../org/libreccm/l10n/LocalizedString.java | 2 +- .../libreccm/modules/ConfigurationLoader.java | 2 +- .../libreccm/pagemodel/PageModelManager.java | 4 +- .../org/libreccm/pagemodel/rs/PageModels.java | 4 +- .../org/libreccm/security/EmailTemplates.java | 24 +- .../categories/CategoriesController.java | 8 +- .../categories/CategorySystemsController.java | 8 +- .../configuration/SettingsController.java | 2 +- .../libreccm/workflow/WorkflowManager.java | 6 +- .../org/libreccm/core/ResourceEntityTest.java | 4 +- .../security/EqualsAndHashCodeTest.java | 4 +- 94 files changed, 840 insertions(+), 272 deletions(-) create mode 100644 ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MpaSectionModel.java create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/create-mpa.xhtml diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AbstractAssetFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AbstractAssetFormController.java index f14b6fbb8..0fa230288 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AbstractAssetFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AbstractAssetFormController.java @@ -156,7 +156,7 @@ public abstract class AbstractAssetFormController implements if (data.containsKey(TITLE)) { final String title = (String) data.get(TITLE); - asset.getTitle().addValue(selectedLocale, title); + asset.getTitle().putValue(selectedLocale, title); } updateAssetProperties(asset, selectedLocale, data); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBinaryAssetFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBinaryAssetFormController.java index a2119c10a..151f6d651 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBinaryAssetFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBinaryAssetFormController.java @@ -74,7 +74,7 @@ public abstract class AbstractBinaryAssetFormController final Map data) { if (data.containsKey(DESCRIPTION)) { - asset.getDescription().addValue(selectedLocale, + asset.getDescription().putValue(selectedLocale, (String) data.get(DESCRIPTION)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkForm.java index a18ac5f22..98be1388a 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkForm.java @@ -132,7 +132,7 @@ public abstract class AbstractBookmarkForm final PageState state) { bookmark .getDescription() - .addValue(getSelectedLocale(state), + .putValue(getSelectedLocale(state), (String) description.getValue(state)); bookmark.setUrl((String) url.getValue(state)); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkFormController.java index 26d2c1cdf..db319efa8 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/AbstractBookmarkFormController.java @@ -63,7 +63,7 @@ public abstract class AbstractBookmarkFormController if (data.containsKey(DESCRIPTION)) { - asset.getDescription().addValue(selectedLocale, + asset.getDescription().putValue(selectedLocale, (String) data.get(DESCRIPTION)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/LegalMetadataFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/LegalMetadataFormController.java index 29d7c4ad6..402a19fc7 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/LegalMetadataFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/LegalMetadataFormController.java @@ -70,7 +70,7 @@ public class LegalMetadataFormController } if (data.containsKey(RIGHTS)) { - asset.getRights().addValue(selectedLocale, + asset.getRights().putValue(selectedLocale, (String) data.get(RIGHTS)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/SideNoteFormController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/SideNoteFormController.java index b060b90d3..01ccd05dc 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/SideNoteFormController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/forms/SideNoteFormController.java @@ -59,7 +59,7 @@ public class SideNoteFormController if (data.containsKey(TEXT)) { final String value = (String) data.get(TEXT); - asset.getText().addValue(selectedLocale, value); + asset.getText().putValue(selectedLocale, value); } } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicPageForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicPageForm.java index 8f26553a0..46b0ec8f7 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicPageForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicPageForm.java @@ -238,8 +238,8 @@ public abstract class BasicPageForm extends BasicItemForm { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); - item.getName().addValue(selectedLocale, (String) data.get(NAME)); - item.getTitle().addValue(selectedLocale, (String) data.get(TITLE)); + item.getName().putValue(selectedLocale, (String) data.get(NAME)); + item.getTitle().putValue(selectedLocale, (String) data.get(TITLE)); if (!CMSConfig.getConfig().isHideLaunchDate()) { item.setLaunchDate((Date) data.get(LAUNCH_DATE)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java index 350df60d8..7f54e11e2 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageCreateForm.java @@ -264,8 +264,8 @@ public class PageCreateForm locale); } -// item.getName().addValue(locale, (String) data.get(NAME)); - item.getTitle().addValue(locale, (String) data.get(TITLE)); +// item.getName().putValue(locale, (String) data.get(NAME)); + item.getTitle().putValue(locale, (String) data.get(TITLE)); final ContentItemRepository itemRepo = cdiUtil .findBean(ContentItemRepository.class); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticlePropertyForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticlePropertyForm.java index 70a9c81a5..64420f5f1 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticlePropertyForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticlePropertyForm.java @@ -178,7 +178,7 @@ public class ArticlePropertyForm extends GenericArticlePropertyForm article .getDescription() - .addValue(selectedLocale, (String) data.get(LEAD)); + .putValue(selectedLocale, (String) data.get(LEAD)); final ContentItemRepository itemRepo = CdiUtil .createCdiUtil() diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticleTextBody.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticleTextBody.java index b7b7221b7..7704c4590 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticleTextBody.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticleTextBody.java @@ -120,7 +120,7 @@ public class ArticleTextBody extends TextBody { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); - article.getText().addValue(selectedLocale, text); + article.getText().putValue(selectedLocale, text); final ContentItemRepository itemRepo = CdiUtil .createCdiUtil() diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoListForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoListForm.java index b27d9389a..fc0a223d1 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoListForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoListForm.java @@ -355,11 +355,11 @@ class RelatedInfoListForm attachmentList.setName((String) nameField.getValue(state)); attachmentList .getTitle() - .addValue(getSelectedLocale(state), + .putValue(getSelectedLocale(state), (String) titleField.getValue(state)); attachmentList .getDescription() - .addValue(getSelectedLocale(state), + .putValue(getSelectedLocale(state), (String) descriptionArea.getValue(state)); controller.saveAttachmentList(attachmentList); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoStepController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoStepController.java index 5a78c6df5..43f47f0a1 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoStepController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/assets/relatedinfo/RelatedInfoStepController.java @@ -300,7 +300,7 @@ class RelatedInfoStepController { final RelatedLink link = new RelatedLink(); link.setTargetItem(targetItem); final Locale selectedLocale = new Locale(selectedLanguage); - link.getTitle().addValue(selectedLocale, title); + link.getTitle().putValue(selectedLocale, title); final AttachmentList list = attachmentListManager .getAttachmentList(attachmentList.getListId()) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventPropertyForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventPropertyForm.java index d8f337c34..a24b99f01 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventPropertyForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventPropertyForm.java @@ -555,31 +555,31 @@ public class EventPropertyForm item.setEndDate(endDateTime); //date_description if (!eventConfig.isHideDateDescription()) { - item.getEventDate().addValue(selectedLocale, + item.getEventDate().putValue(selectedLocale, (String) data.get(EVENT_DATE)); } if (!eventConfig.isHideMainContributor()) { item .getMainContributor() - .addValue(selectedLocale, + .putValue(selectedLocale, (String) data.get(MAIN_CONTRIBUTOR)); } if (!eventConfig.isHideEventType()) { item .getEventType() - .addValue(selectedLocale, + .putValue(selectedLocale, (String) data.get(EVENT_TYPE)); } if (!eventConfig.isHideLinkToMap()) { item.setMapLink((String) data.get(MAP_LINK)); } - item.getLocation().addValue(selectedLocale, + item.getLocation().putValue(selectedLocale, (String) data.get(LOCATION)); - item.getDescription().addValue(selectedLocale, + item.getDescription().putValue(selectedLocale, (String) data.get(LEAD)); if (!eventConfig.isHideCost()) { - item.getCost().addValue(selectedLocale, + item.getCost().putValue(selectedLocale, (String) data.get(COST)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventTextBody.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventTextBody.java index 1980fa1a0..202de8a2e 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventTextBody.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/event/EventTextBody.java @@ -117,7 +117,7 @@ public class EventTextBody extends TextBody { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); - event.getText().addValue(selectedLocale, text); + event.getText().putValue(selectedLocale, text); final ContentItemRepository itemRepo = CdiUtil .createCdiUtil() .findBean(ContentItemRepository.class); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleCreateForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleCreateForm.java index 5aa16ffb2..19c964fda 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleCreateForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleCreateForm.java @@ -160,13 +160,13 @@ public class MultiPartArticleCreateForm section, folder, locale); - article.getTitle().addValue(locale, (String) data.get(TITLE)); + article.getTitle().putValue(locale, (String) data.get(TITLE)); if (!CMSConfig.getConfig().isHideLaunchDate()) { article.setLaunchDate((Date) data.get(LAUNCH_DATE)); } article .getSummary() - .addValue(locale, (String) data.get(SUMMARY)); + .putValue(locale, (String) data.get(SUMMARY)); workflowSection.applyWorkflow(state, article); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java index 2942bd035..fa373a7c4 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java @@ -267,14 +267,14 @@ public abstract class MultiPartArticleForm final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); - article.getName().addValue(selectedLocale, + article.getName().putValue(selectedLocale, (String) data.get(NAME)); - article.getTitle().addValue(selectedLocale, + article.getTitle().putValue(selectedLocale, (String) data.get(TITLE)); if (!CMSConfig.getConfig().isHideLaunchDate()) { article.setLaunchDate((Date) data.get(LAUNCH_DATE)); } - article.getSummary().addValue(selectedLocale, + article.getSummary().putValue(selectedLocale, (String) data.get(SUMMARY)); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java index bae2e3915..185fc0b63 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleSectionStepController.java @@ -201,8 +201,8 @@ class MultiPartArticleSectionStepController { ) ) ); - update.getTitle().addValue(locale, title); - update.getText().addValue(locale, title); + update.getTitle().putValue(locale, title); + update.getText().putValue(locale, title); update.setPageBreak(pageBreak); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java index 2eec3eb52..6ac5140d7 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java @@ -171,7 +171,7 @@ public class SectionEditForm extends Form { final Locale selectedLocale = SelectedLanguageUtil .selectedLocale(state, selectedLanguageParam); - section.getTitle().addValue(selectedLocale, (String) data.get(TITLE)); + section.getTitle().putValue(selectedLocale, (String) data.get(TITLE)); return section; } @@ -288,7 +288,7 @@ public class SectionEditForm extends Form { section = selectedSectionModel.getSelectedSection(state); } -// section.getTitle().addValue(selectedLocale, +// section.getTitle().putValue(selectedLocale, // (String) data.get(TITLE)); final Object[] pageBreakVal = (Object[]) data.get(PAGE_BREAK); final boolean pageBreak; @@ -307,14 +307,14 @@ public class SectionEditForm extends Form { } else { text = (String) data.get(TEXT); } -// section.getText().addValue(selectedLocale, text); +// section.getText().putValue(selectedLocale, text); // sectionRepo.save(section); if (selectedSectionModel.getSelectedKey(state) == null) { - section.getTitle().addValue(selectedLocale, + section.getTitle().putValue(selectedLocale, (String) data.get(TITLE)); section.setPageBreak(pageBreak); - section.getText().addValue(selectedLocale, text); + section.getText().putValue(selectedLocale, text); controller.addSection(article, section); } else { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsController.java index 48a52b158..716cd2a8c 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/news/NewsController.java @@ -90,7 +90,7 @@ public class NewsController { ) ); - news.getText().addValue(forLocale, text); + news.getText().putValue(forLocale, text); itemRepo.save(news); } @@ -114,7 +114,7 @@ public class NewsController { ); update.setReleaseDate(releaseDate); - update.getDescription().addValue(locale, description); + update.getDescription().putValue(locale, description); itemRepo.save(update); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java index ac7ce2dc9..13914174a 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java @@ -106,7 +106,7 @@ class AddUseContextForm extends BaseForm { final String rootName = (String) m_rootName.getValue(state); final LocalizedString rootDescription = new LocalizedString(); - rootDescription.addValue(config.getDefaultLocale(), (String) m_rootDescription.getValue(state)); + rootDescription.putValue(config.getDefaultLocale(), (String) m_rootDescription.getValue(state)); Category root = new Category(); root.setName(rootName); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryController.java index 1d2f7b3bb..cb742b7a1 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryController.java @@ -79,7 +79,7 @@ class CategoryController { final Category category = new Category(); category.setName(name); final LocalizedString localizedDescription = new LocalizedString(); - localizedDescription.addValue(kernelConfig.getDefaultLocale(), + localizedDescription.putValue(kernelConfig.getDefaultLocale(), description); category.setDescription(localizedDescription); category.setAbstractCategory(isAbstract); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryEditForm.java index a44579144..ebf470e7b 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryEditForm.java @@ -131,7 +131,7 @@ final class CategoryEditForm extends BaseCategoryForm { final LocalizedString localizedDescription = new LocalizedString(); localizedDescription - .addValue(config.getDefaultLocale(), + .putValue(config.getDefaultLocale(), (String) getDescriptionArea().getValue(state)); category.setDescription(localizedDescription); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java index 88ac54903..e3a1bc353 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java @@ -137,8 +137,8 @@ public class CategoryLocalizationAddForm extends CategoryLocalizationForm { if (permissionChecker.isPermitted( AdminPrivileges.ADMINISTER_CATEGORIES, category)) { - category.getTitle().addValue(locale, title); - category.getDescription().addValue(locale, description); + category.getTitle().putValue(locale, title); + category.getDescription().putValue(locale, description); // category.setEnabled(isEnabled.equals("yes")); categoryRepository.save(category); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java index 2a6c1f6c7..51525a0f0 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java @@ -120,8 +120,8 @@ public class CategoryLocalizationEditForm extends CategoryLocalizationForm { if (permissionChecker.isPermitted(AdminPrivileges.ADMINISTER_CATEGORIES, category)) { final Locale locale = new Locale((String) m_locale.getValue(state)); - category.getTitle().addValue(locale, (String) m_title.getValue(state)); - category.getDescription().addValue(locale, (String) m_description.getValue(state)); + category.getTitle().putValue(locale, (String) m_title.getValue(state)); + category.getDescription().putValue(locale, (String) m_description.getValue(state)); // category.setName((String) m_url.getValue(state)); // category.setEnabled("yes".equals(m_isEnabled.getValue(state))); categoryRepository.save(category); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreateForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreateForm.java index 4d1537e7f..8495d2d27 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreateForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderCreateForm.java @@ -96,7 +96,7 @@ public class FolderCreateForm extends FolderForm { KernelConfig.class); final Folder folder = folderManager.createFolder(name, parent); - folder.getTitle().addValue(kernelConfig.getDefaultLocale(), title); + folder.getTitle().putValue(kernelConfig.getDefaultLocale(), title); folderRepo.save(folder); } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderForm.java index 4ab0da44b..f78943749 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderForm.java @@ -386,7 +386,7 @@ public abstract class FolderForm extends Form implements FormInitListener, folder.setName(name); folder.setDisplayName(name); - folder.getTitle().addValue(kernelConfig.getDefaultLocale(), label); + folder.getTitle().putValue(kernelConfig.getDefaultLocale(), label); final CategoryRepository categoryRepo = cdiUtil.findBean( CategoryRepository.class); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPaneController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPaneController.java index b11197a58..6a321dd75 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPaneController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPaneController.java @@ -180,8 +180,8 @@ class LifecycleAdminPaneController { final LifecycleDefinition definition = new LifecycleDefinition(); - definition.getLabel().addValue(defaultLocale, name); - definition.getDescription().addValue(defaultLocale, description); + definition.getLabel().putValue(defaultLocale, name); + definition.getDescription().putValue(defaultLocale, description); lifecycleDefRepo.save(definition); sectionManager.addLifecycleDefinitionToContentSection(definition, @@ -220,12 +220,12 @@ class LifecycleAdminPaneController { final Locale defaultLocale = kernelConfig.getDefaultLocale(); if (!lifecycleDefinition.getLabel().getValue(defaultLocale).equals(name)) { - lifecycleDefinition.getLabel().addValue(defaultLocale, name); + lifecycleDefinition.getLabel().putValue(defaultLocale, name); } if (!lifecycleDefinition.getDescription().getValue(defaultLocale) .equals(description)) { - lifecycleDefinition.getDescription().addValue(defaultLocale, + lifecycleDefinition.getDescription().putValue(defaultLocale, description); } @@ -306,8 +306,8 @@ class LifecycleAdminPaneController { final PhaseDefinition phaseDefinition = new PhaseDefinition(); lifecycleDefinition.addPhaseDefinition(phaseDefinition); - phaseDefinition.getLabel().addValue(defaultLocale, label); - phaseDefinition.getDescription().addValue(defaultLocale, description); + phaseDefinition.getLabel().putValue(defaultLocale, label); + phaseDefinition.getDescription().putValue(defaultLocale, description); int delay = delayDays * 24 * 60 * 60; delay += delayHours * 60 * 60; delay += delayMinutes * 60; @@ -350,8 +350,8 @@ class LifecycleAdminPaneController { .findConfiguration(KernelConfig.class); final Locale defaultLocale = kernelConfig.getDefaultLocale(); - phaseDefinition.getLabel().addValue(defaultLocale, label); - phaseDefinition.getDescription().addValue(defaultLocale, description); + phaseDefinition.getLabel().putValue(defaultLocale, label); + phaseDefinition.getDescription().putValue(defaultLocale, description); int delay = delayDays * 24 * 60 * 60; delay += delayHours * 60 * 60; delay += delayMinutes * 60; diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPaneController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPaneController.java index 78942e86c..2bd4000bb 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPaneController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/role/RoleAdminPaneController.java @@ -234,7 +234,7 @@ class RoleAdminPaneController { final Locale defaultLocale = kernelConfig.getDefaultLocale(); roleToSave.setName(roleName); - roleToSave.getDescription().addValue(defaultLocale, roleDescription); + roleToSave.getDescription().putValue(defaultLocale, roleDescription); roleRepo.save(roleToSave); @@ -333,7 +333,7 @@ class RoleAdminPaneController { final Role role = new Role(); role.setName(name); - role.getDescription().addValue(defaultLocale, description); + role.getDescription().putValue(defaultLocale, description); roleRepo.save(role); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/EditType.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/EditType.java index d3c251f48..2acd84c19 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/EditType.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/EditType.java @@ -282,8 +282,8 @@ public class EditType extends CMSForm } // final KernelConfig kernelConfig = KernelConfig.getConfig(); -// type.get().getLabel().addValue(kernelConfig.getDefaultLocale(), label); -// type.get().getDescription().addValue(kernelConfig.getDefaultLocale(), +// type.get().getLabel().putValue(kernelConfig.getDefaultLocale(), label); +// type.get().getDescription().putValue(kernelConfig.getDefaultLocale(), // description); typeRepo.save(type.get()); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPaneController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPaneController.java index b0eca4a12..fad27ad70 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPaneController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPaneController.java @@ -214,8 +214,8 @@ public class WorkflowAdminPaneController { final Workflow workflowTemplate = new Workflow(); workflowTemplate.setAbstractWorkflow(true); - workflowTemplate.getName().addValue(defaultLocale, name); - workflowTemplate.getDescription().addValue(defaultLocale, desc); + workflowTemplate.getName().putValue(defaultLocale, name); + workflowTemplate.getDescription().putValue(defaultLocale, desc); workflowRepo.save(workflowTemplate); @@ -255,8 +255,8 @@ public class WorkflowAdminPaneController { workflow.getWorkflowId()))); final CmsTask task = new CmsTask(); - task.getLabel().addValue(defaultLocale, name); - task.getDescription().addValue(defaultLocale, desc); + task.getLabel().putValue(defaultLocale, name); + task.getDescription().putValue(defaultLocale, desc); task.setTaskType(type); // task.setActive(true); @@ -285,8 +285,8 @@ public class WorkflowAdminPaneController { .orElseThrow(() -> new IllegalArgumentException(String.format( "No Task with ID %d in the database. Where did that ID come from?", task.getTaskId()))); - theTask.getLabel().addValue(defaultLocale, name); - theTask.getDescription().addValue(defaultLocale, desc); + theTask.getLabel().putValue(defaultLocale, name); + theTask.getDescription().putValue(defaultLocale, desc); theTask.setTaskType(type); taskRepo.save(theTask); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java index 7dc1fcfe1..0160b73ca 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java @@ -68,9 +68,9 @@ class WorkflowEditForm extends BaseWorkflowForm { KernelConfig.class); final Locale defaultLocale = kernelConfig.getDefaultLocale(); - workflow.getName().addValue(defaultLocale, + workflow.getName().putValue(defaultLocale, (String) m_title.getValue(state)); - workflow.getDescription().addValue( + workflow.getDescription().putValue( defaultLocale, (String) m_description.getValue(state)); diff --git a/ccm-cms/src/main/java/org/librecms/assets/AssetL10NManager.java b/ccm-cms/src/main/java/org/librecms/assets/AssetL10NManager.java index 46c9f2b25..244d0681c 100644 --- a/ccm-cms/src/main/java/org/librecms/assets/AssetL10NManager.java +++ b/ccm-cms/src/main/java/org/librecms/assets/AssetL10NManager.java @@ -246,7 +246,7 @@ public class AssetL10NManager { value = findValue(localizedString); } - localizedString.addValue(locale, value); + localizedString.putValue(locale, value); } private String findValue(final LocalizedString localizedStr) { diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java index a61f4727f..dc447b72f 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java @@ -117,7 +117,7 @@ public class AssetManager { } asset.setDisplayName(name); - asset.getTitle().addValue(locale, title); + asset.getTitle().putValue(locale, title); assetRepo.save(asset); categoryManager.addObjectToCategory(asset, @@ -318,7 +318,7 @@ public class AssetManager { } source.getAvailableLocales().forEach( - locale -> target.addValue(locale, + locale -> target.putValue(locale, source.getValue(locale))); } else if (propType != null && propType.isAssignableFrom(Asset.class)) { diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentListL10NManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentListL10NManager.java index ff743f91f..013dec068 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentListL10NManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AttachmentListL10NManager.java @@ -231,7 +231,7 @@ public class AttachmentListL10NManager { value = findValue(localizedString); } - localizedString.addValue(locale, value); + localizedString.putValue(locale, value); } private String findValue(final LocalizedString localizedStr) { diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java index 357b48605..f31f15bf1 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemL10NManager.java @@ -281,7 +281,7 @@ public class ContentItemL10NManager { value = findValue(localizedString); } - localizedString.addValue(locale, value); + localizedString.putValue(locale, value); } private String findValue(final LocalizedString localizedStr) { diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java index 8cf4d7146..5e38aecca 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java @@ -326,7 +326,7 @@ public class ContentItemManager { } item.setDisplayName(name); - item.getName().addValue(locale, name); + item.getName().putValue(locale, name); item.setVersion(ContentItemVersion.DRAFT); item.setContentType(contentType.get()); @@ -813,7 +813,7 @@ public class ContentItemManager { private void copyLocalizedString(final LocalizedString source, final LocalizedString target) { for (final Locale locale : source.getAvailableLocales()) { - target.addValue(locale, source.getValue(locale)); + target.putValue(locale, source.getValue(locale)); } } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java index 70c936d25..ea0bc9704 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java @@ -125,12 +125,12 @@ public class ContentSectionManager { section.setLabel(name); section.setDisplayName(name); section.setPrimaryUrl(name); - section.getTitle().addValue(defautLocale, name); + section.getTitle().putValue(defautLocale, name); final Folder rootFolder = new Folder(); rootFolder.setName(String.format("%s_root", name)); rootFolder.setType(FolderType.DOCUMENTS_FOLDER); - rootFolder.getTitle().addValue(defautLocale, rootFolder.getName()); + rootFolder.getTitle().putValue(defautLocale, rootFolder.getName()); rootFolder.setDisplayName(rootFolder.getName()); rootFolder.setUuid(UUID.randomUUID().toString()); rootFolder.setUniqueId(rootFolder.getUuid()); @@ -140,7 +140,7 @@ public class ContentSectionManager { final Folder rootAssetFolder = new Folder(); rootAssetFolder.setName(String.format("%s_assets", name)); rootAssetFolder.setType(FolderType.ASSETS_FOLDER); - rootAssetFolder.getTitle().addValue(defautLocale, + rootAssetFolder.getTitle().putValue(defautLocale, rootAssetFolder.getName()); rootAssetFolder.setDisplayName(rootAssetFolder.getName()); rootAssetFolder.setUuid(UUID.randomUUID().toString()); diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java index 23ae695dd..1259711c1 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java @@ -128,13 +128,13 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup { rootFolder.setUuid(UUID.randomUUID().toString()); rootFolder.setUniqueId(rootFolder.getUuid()); rootFolder.setName(String.format("%s_" + ROOT, sectionName)); - rootFolder.getTitle().addValue(new Locale("en"), "/"); + rootFolder.getTitle().putValue(new Locale("en"), "/"); rootFolder.setType(FolderType.DOCUMENTS_FOLDER); rootFolder.setSection(section); final Folder rootAssetFolder = new Folder(); rootAssetFolder.setName(String.format("%s_" + ASSETS, sectionName)); - rootAssetFolder.getTitle().addValue(new Locale("en"), "/"); + rootAssetFolder.getTitle().putValue(new Locale("en"), "/"); rootAssetFolder.setUuid(UUID.randomUUID().toString()); rootAssetFolder.setUniqueId(rootAssetFolder.getUuid()); rootAssetFolder.setType(FolderType.ASSETS_FOLDER); @@ -269,12 +269,12 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup { final LifecycleDefinition lifecycleDefinition = new LifecycleDefinition(); lifecycleDefinition.setUuid(UUID.randomUUID().toString()); - lifecycleDefinition.getLabel().addValue(Locale.ENGLISH, "Standard"); + lifecycleDefinition.getLabel().putValue(Locale.ENGLISH, "Standard"); final Workflow workflow = new Workflow(); workflow.setUuid(UUID.randomUUID().toString()); workflow.setAbstractWorkflow(true); - workflow.getName().addValue(Locale.ENGLISH, "Standard"); + workflow.getName().putValue(Locale.ENGLISH, "Standard"); section.addLifecycleDefinition(lifecycleDefinition); diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java index 38843f91f..147f8fbaf 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/FolderManager.java @@ -190,7 +190,7 @@ public class FolderManager { final Folder folder = new Folder(); folder.setName(name); folder.setDisplayName(name); - folder.getTitle().addValue(kernelConfig.getDefaultLocale(), name); + folder.getTitle().putValue(kernelConfig.getDefaultLocale(), name); folder.setSection(parent.getSection()); folder.setType(parent.getType()); folderRepo.save(folder); @@ -301,7 +301,7 @@ public class FolderManager { final KernelConfig kernelConfig = confManager. findConfiguration( KernelConfig.class); - movingFolder.getTitle().addValue( + movingFolder.getTitle().putValue( kernelConfig.getDefaultLocale(), name); } categoryManager.addSubCategoryToCategory(movingFolder, diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java index 3c2d61d3a..71db5db33 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/CategoriesController.java @@ -370,7 +370,7 @@ public class CategoriesController { if (result.isSuccessful()) { final Category category = result.getResult(); final Locale locale = new Locale(localeParam); - category.getTitle().addValue(locale, value); + category.getTitle().putValue(locale, value); categoryRepo.save(category); return String.format( @@ -447,7 +447,7 @@ public class CategoriesController { if (result.isSuccessful()) { final Category category = result.getResult(); final Locale locale = new Locale(localeParam); - category.getTitle().addValue(locale, value); + category.getTitle().putValue(locale, value); categoryRepo.save(category); return String.format( @@ -598,7 +598,7 @@ public class CategoriesController { if (result.isSuccessful()) { final Category category = result.getResult(); final Locale locale = new Locale(localeParam); - category.getDescription().addValue(locale, value); + category.getDescription().putValue(locale, value); categoryRepo.save(category); return String.format( @@ -677,7 +677,7 @@ public class CategoriesController { if (result.isSuccessful()) { final Category category = result.getResult(); final Locale locale = new Locale(localeParam); - category.getDescription().addValue(locale, value); + category.getDescription().putValue(locale, value); categoryRepo.save(category); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationContactEntryKeysController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationContactEntryKeysController.java index c74da27aa..fbeb16035 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationContactEntryKeysController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationContactEntryKeysController.java @@ -309,7 +309,7 @@ public class ConfigurationContactEntryKeysController { } final ContactEntryKey contactEntryKey = contactEntryKeyResult.get(); - contactEntryKey.getLabel().addValue(new Locale(localeParam), value); + contactEntryKey.getLabel().putValue(new Locale(localeParam), value); contactEntryKeyRepo.save(contactEntryKey); return String.format( @@ -351,7 +351,7 @@ public class ConfigurationContactEntryKeysController { } final ContactEntryKey contactEntryKey = contactEntryKeyResult.get(); - contactEntryKey.getLabel().addValue(new Locale(localeParam), value); + contactEntryKey.getLabel().putValue(new Locale(localeParam), value); contactEntryKeyRepo.save(contactEntryKey); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationLifecyclesController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationLifecyclesController.java index f6379e6ee..06922e0cf 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationLifecyclesController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationLifecyclesController.java @@ -312,7 +312,7 @@ public class ConfigurationLifecyclesController { final LifecycleDefinition definition = new LifecycleDefinition(); definition .getLabel() - .addValue(globalizationHelper.getNegotiatedLocale(), label); + .putValue(globalizationHelper.getNegotiatedLocale(), label); definitionRepo.save(definition); sectionManager.addLifecycleDefinitionToContentSection( definition, section @@ -416,7 +416,7 @@ public class ConfigurationLifecyclesController { ); } final LifecycleDefinition definition = definitionResult.get(); - definition.getLabel().addValue(new Locale(localeParam), value); + definition.getLabel().putValue(new Locale(localeParam), value); definitionRepo.save(definition); return String.format( @@ -469,7 +469,7 @@ public class ConfigurationLifecyclesController { ); } final LifecycleDefinition definition = definitionResult.get(); - definition.getLabel().addValue(new Locale(localeParam), value); + definition.getLabel().putValue(new Locale(localeParam), value); definitionRepo.save(definition); return String.format( @@ -573,7 +573,7 @@ public class ConfigurationLifecyclesController { ); } final LifecycleDefinition definition = definitionResult.get(); - definition.getDescription().addValue(new Locale(localeParam), value); + definition.getDescription().putValue(new Locale(localeParam), value); definitionRepo.save(definition); return String.format( @@ -626,7 +626,7 @@ public class ConfigurationLifecyclesController { ); } final LifecycleDefinition definition = definitionResult.get(); - definition.getDescription().addValue(new Locale(localeParam), value); + definition.getDescription().putValue(new Locale(localeParam), value); definitionRepo.save(definition); return String.format( @@ -757,7 +757,7 @@ public class ConfigurationLifecyclesController { phaseDefinition .getLabel() - .addValue(globalizationHelper.getNegotiatedLocale(), label); + .putValue(globalizationHelper.getNegotiatedLocale(), label); phaseDefinititionRepo.save(phaseDefinition); lifecycleManager.addPhaseDefinition(definition, phaseDefinition); @@ -1100,7 +1100,7 @@ public class ConfigurationLifecyclesController { ); } final PhaseDefinition phaseDefinition = phaseDefinitionResult.get(); - phaseDefinition.getLabel().addValue(new Locale(localeParam), value); + phaseDefinition.getLabel().putValue(new Locale(localeParam), value); phaseDefinititionRepo.save(phaseDefinition); return String.format( @@ -1166,7 +1166,7 @@ public class ConfigurationLifecyclesController { ); } final PhaseDefinition phaseDefinition = phaseDefinitionResult.get(); - phaseDefinition.getLabel().addValue(new Locale(localeParam), value); + phaseDefinition.getLabel().putValue(new Locale(localeParam), value); phaseDefinititionRepo.save(phaseDefinition); return String.format( @@ -1298,7 +1298,7 @@ public class ConfigurationLifecyclesController { ); } final PhaseDefinition phaseDefinition = phaseDefinitionResult.get(); - phaseDefinition.getDescription().addValue( + phaseDefinition.getDescription().putValue( new Locale(localeParam), value ); phaseDefinititionRepo.save(phaseDefinition); @@ -1368,7 +1368,7 @@ public class ConfigurationLifecyclesController { ); } final PhaseDefinition phaseDefinition = phaseDefinitionResult.get(); - phaseDefinition.getDescription().addValue( + phaseDefinition.getDescription().putValue( new Locale(localeParam), value ); phaseDefinititionRepo.save(phaseDefinition); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationRolesController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationRolesController.java index 8b1d89daa..349526a4c 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationRolesController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationRolesController.java @@ -560,7 +560,7 @@ public class ConfigurationRolesController { final Role role = result.get(); final Locale locale = new Locale(localeParam); - role.getDescription().addValue(locale, value); + role.getDescription().putValue(locale, value); roleRepo.save(role); return String.format( @@ -617,7 +617,7 @@ public class ConfigurationRolesController { final Role role = result.get(); final Locale locale = new Locale(localeParam); - role.getDescription().addValue(locale, value); + role.getDescription().putValue(locale, value); roleRepo.save(role); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationWorkflowController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationWorkflowController.java index d70dcaf79..3f7375f9a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationWorkflowController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/ConfigurationWorkflowController.java @@ -329,7 +329,7 @@ public class ConfigurationWorkflowController { final Workflow template = new Workflow(); template.setAbstractWorkflow(true); - template.getName().addValue( + template.getName().putValue( globalizationHelper.getNegotiatedLocale(), label ); workflowRepo.save(template); @@ -429,7 +429,7 @@ public class ConfigurationWorkflowController { return showWorkflowTemplateNotFound(section, workflowIdentiferParam); } final Workflow workflow = workflowResult.get(); - workflow.getName().addValue(new Locale(localeParam), value); + workflow.getName().putValue(new Locale(localeParam), value); workflowRepo.save(workflow); return String.format( @@ -480,7 +480,7 @@ public class ConfigurationWorkflowController { return showWorkflowTemplateNotFound(section, workflowIdentiferParam); } final Workflow workflow = workflowResult.get(); - workflow.getName().addValue(new Locale(localeParam), value); + workflow.getName().putValue(new Locale(localeParam), value); workflowRepo.save(workflow); return String.format( @@ -581,7 +581,7 @@ public class ConfigurationWorkflowController { return showWorkflowTemplateNotFound(section, workflowIdentiferParam); } final Workflow workflow = workflowResult.get(); - workflow.getDescription().addValue(new Locale(localeParam), value); + workflow.getDescription().putValue(new Locale(localeParam), value); workflowRepo.save(workflow); return String.format( @@ -632,7 +632,7 @@ public class ConfigurationWorkflowController { return showWorkflowTemplateNotFound(section, workflowIdentiferParam); } final Workflow workflow = workflowResult.get(); - workflow.getDescription().addValue(new Locale(localeParam), value); + workflow.getDescription().putValue(new Locale(localeParam), value); workflowRepo.save(workflow); return String.format( @@ -932,7 +932,7 @@ public class ConfigurationWorkflowController { } final Workflow workflow = workflowResult.get(); final AssignableTask task = new AssignableTask(); - task.getLabel().addValue( + task.getLabel().putValue( globalizationHelper.getNegotiatedLocale(), label ); @@ -1066,7 +1066,7 @@ public class ConfigurationWorkflowController { ); } final Task task = taskResult.get(); - task.getLabel().addValue(new Locale(localeParam), value); + task.getLabel().putValue(new Locale(localeParam), value); taskRepo.save(task); return String.format( @@ -1129,7 +1129,7 @@ public class ConfigurationWorkflowController { ); } final Task task = taskResult.get(); - task.getLabel().addValue(new Locale(localeParam), value); + task.getLabel().putValue(new Locale(localeParam), value); taskRepo.save(task); return String.format( @@ -1254,7 +1254,7 @@ public class ConfigurationWorkflowController { ); } final Task task = taskResult.get(); - task.getDescription().addValue(new Locale(localeParam), value); + task.getDescription().putValue(new Locale(localeParam), value); taskRepo.save(task); return String.format( @@ -1318,7 +1318,7 @@ public class ConfigurationWorkflowController { ); } final Task task = taskResult.get(); - task.getDescription().addValue(new Locale(localeParam), value); + task.getDescription().putValue(new Locale(localeParam), value); taskRepo.save(task); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java index 9b21813b5..55f4a1375 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/DocumentFolderController.java @@ -424,8 +424,8 @@ public class DocumentFolderController { Article.class, Locale.ENGLISH ); - article.getTitle().addValue(Locale.ENGLISH, "Article 1"); - article.getTitle().addValue(Locale.GERMAN, "Artikel 1"); + article.getTitle().putValue(Locale.ENGLISH, "Article 1"); + article.getTitle().putValue(Locale.GERMAN, "Artikel 1"); itemRepo.save(article); final Folder folder2a = folderManager.createFolder( @@ -439,10 +439,10 @@ public class DocumentFolderController { Article.class, Locale.ENGLISH ); - article2.getTitle().addValue( + article2.getTitle().putValue( Locale.ENGLISH, "Article in Folder 2" ); - article2.getTitle().addValue( + article2.getTitle().putValue( Locale.GERMAN, "Artikel in Ordner 2" ); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractBookmarkCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractBookmarkCreateStep.java index 4489adb71..315820df1 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractBookmarkCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractBookmarkCreateStep.java @@ -88,7 +88,7 @@ public abstract class AbstractBookmarkCreateStep extends Abs bookmark.setUrl(url); bookmark .getDescription() - .addValue(new Locale(getInitialLocale()), bookmarkDescription); + .putValue(new Locale(getInitialLocale()), bookmarkDescription); assetRepository.save(bookmark); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractMvcAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractMvcAssetEditStep.java index 3bb2f76d6..0266aa74a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractMvcAssetEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AbstractMvcAssetEditStep.java @@ -435,7 +435,7 @@ public abstract class AbstractMvcAssetEditStep implements MvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); - getAsset().getTitle().addValue(locale, value); + getAsset().getTitle().putValue(locale, value); assetRepo.save(getAsset()); return buildRedirectPathForStep(); @@ -469,7 +469,7 @@ public abstract class AbstractMvcAssetEditStep implements MvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); - getAsset().getTitle().addValue(locale, value); + getAsset().getTitle().putValue(locale, value); assetRepo.save(getAsset()); return buildRedirectPathForStep(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetCreateStep.java index 94d334dfa..d36e4550f 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetCreateStep.java @@ -84,7 +84,7 @@ public class AudioAssetCreateStep extends AbstractMvcAssetCreateStep .filter(value -> value.length > 0) .map(value -> value[0]) .orElse(""); - asset.getDescription().addValue( + asset.getDescription().putValue( new Locale(getInitialLocale()), description ); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetEditStep.java index be827e8ff..88e94087a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/AudioAssetEditStep.java @@ -251,7 +251,7 @@ public class AudioAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final AudioAsset asset = getAudioAsset(); - asset.getDescription().addValue(locale, value); + asset.getDescription().putValue(locale, value); assetRepo.save(asset); @@ -287,7 +287,7 @@ public class AudioAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final AudioAsset asset = getAudioAsset(); - asset.getDescription().addValue(locale, value); + asset.getDescription().putValue(locale, value); assetRepo.save(asset); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/BookmarkEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/BookmarkEditStep.java index 04f302797..d86f98270 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/BookmarkEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/BookmarkEditStep.java @@ -214,7 +214,7 @@ public class BookmarkEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final Bookmark bookmark = getBookmark(); - bookmark.getDescription().addValue(locale, value); + bookmark.getDescription().putValue(locale, value); assetRepository.save(bookmark); @@ -250,7 +250,7 @@ public class BookmarkEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final Bookmark bookmark = getBookmark(); - bookmark.getDescription().addValue(locale, value); + bookmark.getDescription().putValue(locale, value); assetRepository.save(bookmark); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetCreateStep.java index dd673c9d5..c3e1bae59 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetCreateStep.java @@ -84,7 +84,7 @@ public class FileAssetCreateStep extends AbstractMvcAssetCreateStep { .filter(value -> value.length > 0) .map(value -> value[0]) .orElse(""); - asset.getDescription().addValue( + asset.getDescription().putValue( new Locale(getInitialLocale()), fileDescription ); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java index bd0f6b46f..e3c784c06 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java @@ -226,7 +226,7 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final FileAsset fileAsset = getFileAsset(); - fileAsset.getDescription().addValue(locale, value); + fileAsset.getDescription().putValue(locale, value); assetRepo.save(fileAsset); @@ -262,7 +262,7 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final FileAsset fileAsset = getFileAsset(); - fileAsset.getDescription().addValue(locale, value); + fileAsset.getDescription().putValue(locale, value); assetRepo.save(fileAsset); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageCreateStep.java index 4c8353857..a75e0fa4b 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageCreateStep.java @@ -84,7 +84,7 @@ public class ImageCreateStep extends AbstractMvcAssetCreateStep { .filter(value -> value.length > 0) .map(value -> value[0]) .orElse(""); - image.getDescription().addValue( + image.getDescription().putValue( new Locale(getInitialLocale()), description ); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageEditStep.java index 0d9bd8b10..58a38a297 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ImageEditStep.java @@ -253,7 +253,7 @@ public class ImageEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final Image image = getImage(); - image.getDescription().addValue(locale, value); + image.getDescription().putValue(locale, value); assetRepo.save(image); @@ -289,7 +289,7 @@ public class ImageEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final Image image = getImage(); - image.getDescription().addValue(locale, value); + image.getDescription().putValue(locale, value); assetRepo.save(image); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataCreateStep.java index b2d263c43..1fcd6dbba 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataCreateStep.java @@ -109,7 +109,7 @@ public class LegalMetadataCreateStep asset.setCreator(creator); asset.setPublisher(publisher); - asset.getRights().addValue(new Locale(getInitialLocale()), rights); + asset.getRights().putValue(new Locale(getInitialLocale()), rights); asset.setRightsHolder(rightsHolder); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataEditStep.java index 0c262da3f..19ed58be8 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/LegalMetadataEditStep.java @@ -222,7 +222,7 @@ public class LegalMetadataEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final LegalMetadata legalMetadata = (LegalMetadata) getAsset(); - legalMetadata.getRights().addValue(locale, value); + legalMetadata.getRights().putValue(locale, value); assetRepo.save(legalMetadata); @@ -258,7 +258,7 @@ public class LegalMetadataEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final LegalMetadata legalMetadata = (LegalMetadata) getAsset(); - legalMetadata.getRights().addValue(locale, value); + legalMetadata.getRights().putValue(locale, value); assetRepo.save(legalMetadata); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java index aff9650f8..a9f7597c5 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteCreateStep.java @@ -92,7 +92,7 @@ public class SideNoteCreateStep extends AbstractMvcAssetCreateStep { .filter(value -> value.length > 0) .map(value -> value[0]) .orElse(""); - sideNote.getText().addValue(new Locale(getInitialLocale()), text); + sideNote.getText().putValue(new Locale(getInitialLocale()), text); assetRepo.save(sideNote); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java index dbb00e9f1..fc4375e8e 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java @@ -195,7 +195,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); - getSideNote().getText().addValue(locale, ""); + getSideNote().getText().putValue(locale, ""); assetRepo.save(getSideNote()); return buildRedirectPathForStep(); @@ -229,7 +229,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); - getSideNote().getText().addValue(locale, value); + getSideNote().getText().putValue(locale, value); assetRepo.save(getSideNote()); return buildRedirectPathForStep(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetCreateStep.java index ff191bbd6..96b77b88d 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetCreateStep.java @@ -85,7 +85,7 @@ public class VideoAssetCreateStep extends AbstractMvcAssetCreateStep .filter(value -> value.length > 0) .map(value -> value[0]) .orElse(""); - asset.getDescription().addValue( + asset.getDescription().putValue( new Locale(getInitialLocale()), fileDescription ); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetEditStep.java index 0dd8b7044..d58213703 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/VideoAssetEditStep.java @@ -250,7 +250,7 @@ public class VideoAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final VideoAsset asset = getVideoAsset(); - asset.getDescription().addValue(locale, value); + asset.getDescription().putValue(locale, value); assetRepo.save(asset); @@ -286,7 +286,7 @@ public class VideoAssetEditStep extends AbstractMvcAssetEditStep { if (assetPermissionsChecker.canEditAsset(getAsset())) { final Locale locale = new Locale(localeParam); final VideoAsset asset = getVideoAsset(); - asset.getDescription().addValue(locale, value); + asset.getDescription().putValue(locale, value); assetRepo.save(asset); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java index c05ca0598..66b0866dc 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/media/MediaStep.java @@ -269,10 +269,10 @@ public class MediaStep extends AbstractMvcAuthoringStep { final AttachmentList list = listManager.createAttachmentList( document, String.join("", MEDIA_LIST_PREFIX, name) ); - list.getTitle().addValue( + list.getTitle().putValue( globalizationHelper.getNegotiatedLocale(), title ); - list.getDescription().addValue( + list.getDescription().putValue( globalizationHelper.getNegotiatedLocale(), description ); listRepo.save(list); @@ -551,7 +551,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getTitle().addValue(new Locale(localeParam), value); + list.getTitle().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -611,7 +611,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getTitle().addValue(new Locale(localeParam), value); + list.getTitle().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -729,7 +729,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getDescription().addValue(new Locale(localeParam), value); + list.getDescription().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -790,7 +790,7 @@ public class MediaStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getDescription().addValue(new Locale(localeParam), value); + list.getDescription().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/RelatedInfoStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/RelatedInfoStep.java index c7de7e58c..1a16d08de 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/RelatedInfoStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/relatedinfo/RelatedInfoStep.java @@ -290,10 +290,10 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { final AttachmentList list = listManager.createAttachmentList( document, name ); - list.getTitle().addValue( + list.getTitle().putValue( globalizationHelper.getNegotiatedLocale(), title ); - list.getDescription().addValue( + list.getDescription().putValue( globalizationHelper.getNegotiatedLocale(), description ); listRepo.save(list); @@ -572,7 +572,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getTitle().addValue(new Locale(localeParam), value); + list.getTitle().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -632,7 +632,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getTitle().addValue(new Locale(localeParam), value); + list.getTitle().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -750,7 +750,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getDescription().addValue(new Locale(localeParam), value); + list.getDescription().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -811,7 +811,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { } final AttachmentList list = listResult.get(); - list.getDescription().addValue(new Locale(localeParam), value); + list.getDescription().putValue(new Locale(localeParam), value); listRepo.save(list); return buildRedirectPathForStep( @@ -1086,7 +1086,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { // return "org/librecms/ui/contentsection/documents/target-item-not-found.xhtml"; // } final RelatedLink relatedLink = new RelatedLink(); - relatedLink.getTitle().addValue( + relatedLink.getTitle().putValue( globalizationHelper.getNegotiatedLocale(), title ); relatedLink.setDisplayName( @@ -1559,7 +1559,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { final RelatedLink link = linkResult.get(); final Locale locale = new Locale(localeParam); - link.getTitle().addValue(locale, value); + link.getTitle().putValue(locale, value); assetRepo.save(link); return buildRedirectPathForStep( @@ -1646,7 +1646,7 @@ public class RelatedInfoStep extends AbstractMvcAuthoringStep { final RelatedLink link = linkResult.get(); final Locale locale = new Locale(localeParam); - link.getTitle().addValue(locale, value); + link.getTitle().putValue(locale, value); assetRepo.save(link); return buildRedirectPathForStep( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java index c7659f0b3..5ea200093 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleCreateStep.java @@ -274,8 +274,8 @@ public class MvcArticleCreateStep locale ); - article.getTitle().addValue(locale, title); - article.getDescription().addValue(locale, summary); + article.getTitle().putValue(locale, title); + article.getDescription().putValue(locale, summary); itemRepo.save(article); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java index 6afe011e8..063226c4a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticlePropertiesStep.java @@ -349,7 +349,7 @@ public class MvcArticlePropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getTitle().addValue(locale, value); + getDocument().getTitle().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -394,7 +394,7 @@ public class MvcArticlePropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getTitle().addValue(locale, value); + getDocument().getTitle().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -483,7 +483,7 @@ public class MvcArticlePropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getDescription().addValue(locale, value); + getDocument().getDescription().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -527,7 +527,7 @@ public class MvcArticlePropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getDescription().addValue(locale, value); + getDocument().getDescription().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java index aaef37a9b..95a5d1d15 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/article/MvcArticleTextBodyStep.java @@ -201,7 +201,7 @@ public class MvcArticleTextBodyStep extends AbstractMvcAuthoringStep { ); } final Locale locale = new Locale(localeParam); - getArticle().getText().addValue(locale, value); + getArticle().getText().putValue(locale, value); itemRepo.save(getArticle()); return buildRedirectPathForStep(); @@ -310,7 +310,7 @@ public class MvcArticleTextBodyStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getArticle())) { final Locale locale = new Locale(localeParam); - getArticle().getText().addValue(locale, value); + getArticle().getText().putValue(locale, value); itemRepo.save(getArticle()); return buildRedirectPathForStep(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MpaSectionModel.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MpaSectionModel.java new file mode 100644 index 000000000..1adc85350 --- /dev/null +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MpaSectionModel.java @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2021 LibreCCM Foundation. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ +package org.librecms.ui.contenttypes.mpa; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; + +/** + * + * @author Jens Pelzetter + */ +@RequestScoped +@Named("CmsMpaSectionModel") +public class MpaSectionModel { + + private long sectionId; + + private boolean pageBreak; + + private int rank; + + private String selectedLocale; + + private Map titleValues; + + private List unusedTitleLocales; + + private Map textValues; + + private Map truncatedTextValues; + + private List unusedTextLocales; + + public long getSectionId() { + return sectionId; + } + + protected void setSectionId(final long sectionId) { + this.sectionId = sectionId; + } + + public boolean isPageBreak() { + return pageBreak; + } + + protected void setPageBreak(final boolean pageBreak) { + this.pageBreak = pageBreak; + } + + public int getRank() { + return rank; + } + + protected void setRank(int rank) { + this.rank = rank; + } + + public String getSelectedLocale() { + return selectedLocale; + } + + protected void setSelectedLocale(final String selectedLocale) { + this.selectedLocale = selectedLocale; + } + + public Map getTitleValues() { + return Collections.unmodifiableMap(titleValues); + } + + protected void setTitleValues(final Map titleValues) { + this.titleValues = new HashMap<>(titleValues); + } + + public List getUnusedTitleLocales() { + return Collections.unmodifiableList(unusedTitleLocales); + } + + protected void setUnusedTitleLocales(final List unusedTitleLocales) { + this.unusedTitleLocales = new ArrayList<>(unusedTitleLocales); + } + + public Map getTextValues() { + return Collections.unmodifiableMap(textValues); + } + + protected void setTextValues(final Map textValues) { + this.textValues = new HashMap<>(textValues); + } + + public Map getTruncatedTextValues() { + return Collections.unmodifiableMap(truncatedTextValues); + } + + protected void setTruncatedTextValues( + final Map truncatedTextValues + ) { + this.truncatedTextValues = new HashMap<>(truncatedTextValues); + } + + public List getUnusedTextLocales() { + return Collections.unmodifiableList(unusedTextLocales); + } + + protected void setUnusedTextLocales( + final List unusedTextLocales + ) { + this.unusedTextLocales = new ArrayList<>(unusedTextLocales); + } + +} diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaCreateStep.java index 920dd725e..7f3783f07 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaCreateStep.java @@ -273,8 +273,8 @@ public class MvcMpaCreateStep locale ); - article.getTitle().addValue(locale, title); - article.getDescription().addValue(locale, summary); + article.getTitle().putValue(locale, title); + article.getDescription().putValue(locale, summary); itemRepo.save(article); return String.format( diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaPropertiesStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaPropertiesStep.java index 970a000f4..8112f3a4f 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaPropertiesStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaPropertiesStep.java @@ -285,7 +285,7 @@ public class MvcMpaPropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getTitle().addValue(locale, value); + getDocument().getTitle().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -331,7 +331,7 @@ public class MvcMpaPropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getTitle().addValue(locale, value); + getDocument().getTitle().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -418,7 +418,7 @@ public class MvcMpaPropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getDescription().addValue(locale, value); + getDocument().getDescription().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); @@ -462,7 +462,7 @@ public class MvcMpaPropertiesStep extends AbstractMvcAuthoringStep { if (itemPermissionChecker.canEditItem(getDocument())) { final Locale locale = new Locale(localeParam); - getDocument().getDescription().addValue(locale, value); + getDocument().getDescription().putValue(locale, value); itemRepo.save(getDocument()); return buildRedirectPathForStep(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaSectionsStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaSectionsStep.java index 46dc39f51..41ebee299 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaSectionsStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/mpa/MvcMpaSectionsStep.java @@ -23,6 +23,7 @@ import org.libreccm.l10n.GlobalizationHelper; import org.librecms.contenttypes.MultiPartArticle; import org.librecms.contenttypes.MultiPartArticleSection; import org.librecms.contenttypes.MultiPartArticleSectionManager; +import org.librecms.contenttypes.MultiPartArticleSectionRepository; import org.librecms.ui.contentsections.ContentSectionNotFoundException; import org.librecms.ui.contentsections.ItemPermissionChecker; import org.librecms.ui.contentsections.documents.AbstractMvcAuthoringStep; @@ -33,8 +34,10 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import java.util.Comparator; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import javax.enterprise.context.RequestScoped; @@ -80,12 +83,18 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @Inject private MultiPartArticleSectionManager sectionManager; + @Inject + private MultiPartArticleSectionRepository sectionRepo; + @Inject private Models models; @Inject private MpaSectionsStepModel mpaSectionsStepModel; + @Inject + private MpaSectionModel mpaSectionModel; + @Override public Class getStepClass() { return MvcMpaSectionsStep.class; @@ -180,8 +189,8 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { final Locale initialLocale = new Locale(initialLocaleParam); - section.getText().addValue(initialLocale, text); - section.getTitle().addValue(initialLocale, title); + section.getText().putValue(initialLocale, text); + section.getTitle().putValue(initialLocale, title); sectionManager.addSectionToMultiPartArticle(section, getMpa()); @@ -215,25 +224,15 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { } if (itemPermissionChecker.canEditItem(getMpa())) { - if (!sectionIdParam.matches("[0-9]*")) { - models.put("invalidSectionId", true); - return showStep(sectionIdentifier, documentPath); - } - - final long sectionId = Long.parseLong(sectionIdParam); - - final Optional result - = getMpa() - .getSections() - .stream() - .filter(section -> section.getSectionId() == sectionId) - .findAny(); - + final Optional result = findSection( + sectionIdParam + ); if (!result.isPresent()) { - models.put("sectionNotFound", true); - return showStep(sectionIdentifier, documentPath); + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); } - final MultiPartArticleSection sectionToRemove = result.get(); sectionManager.removeSectionFromMultiPartArticle( @@ -261,8 +260,13 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @PathParam("sectionId") final String sectionIdParam ) { - // ToDo - throw new UnsupportedOperationException(); + return initSectionModel( + sectionIdentifier, + documentPath, + sectionIdParam, + "org/librecms/ui/contenttypes/mpa/mpa-section.xhtml" + ); + } @POST @@ -276,27 +280,17 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @PathParam("sectionId") final String sectionIdParam, @FormParam("locale") - final String localeParam + final String localeParam, + @FormParam("value") + final String value ) { - // ToDo - throw new UnsupportedOperationException(); - } - - @GET - @Path("/{sectionId}/title/@edit/{locale}") - @Transactional(Transactional.TxType.REQUIRED) - public String editTitleValue( - @PathParam(MvcAuthoringSteps.SECTION_IDENTIFIER_PATH_PARAM) - final String sectionIdentifier, - @PathParam(MvcAuthoringSteps.DOCUMENT_PATH_PATH_PARAM_NAME) - final String documentPath, - @PathParam("sectionId") - final String sectionIdParam, - @PathParam("locale") - final String localeParam - ) { - // ToDo - throw new UnsupportedOperationException(); + return editTitleValue( + sectionIdentifier, + documentPath, + sectionIdParam, + localeParam, + value + ); } @POST @@ -314,8 +308,38 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @FormParam("value") final String value ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + final Locale locale = new Locale(localeParam); + section.getTitle().putValue(locale, value); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @POST @@ -331,8 +355,38 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @FormParam("locale") final String localeParam ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + final Locale locale = new Locale(localeParam); + section.getTitle().removeValue(locale); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @POST @@ -348,8 +402,46 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @FormParam("locale") final String localeParam ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + final String value; + if (section.getText().getAvailableLocales().isEmpty()) { + value = ""; + } else { + value = globalizationHelper.getValueFromLocalizedString( + section.getText() + ); + } + + final Locale locale = new Locale(localeParam); + section.getText().putValue(locale, value); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @GET @@ -365,8 +457,14 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @PathParam("locale") final String localeParam ) { - // ToDo - throw new UnsupportedOperationException(); + mpaSectionModel.setSelectedLocale(localeParam); + + return initSectionModel( + sectionIdentifier, + documentPath, + sectionIdParam, + "org/librecms/ui/contenttypes/mpa/mpa-section-text.xhtml" + ); } @POST @@ -384,8 +482,38 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @FormParam("value") final String value ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + final Locale locale = new Locale(localeParam); + section.getText().putValue(locale, value); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @POST @@ -401,8 +529,38 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { @FormParam("locale") final String localeParam ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + final Locale locale = new Locale(localeParam); + section.getText().removeValue(locale); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @POST @@ -417,8 +575,37 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { final String sectionIdParam, @FormParam("pageBreak") final String pageBreakParam ) { - // ToDo - throw new UnsupportedOperationException(); + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + + } + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + section.setPageBreak(Boolean.parseBoolean(pageBreakParam)); + sectionRepo.save(section); + + return buildRedirectPathForStep(); + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } } @Override @@ -430,7 +617,15 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { mpaSectionsStepModel.setCanEdit( itemPermissionChecker.canEditItem(getMpa()) ); - // ToDo Set sections in model + mpaSectionsStepModel + .setRows( + getMpa() + .getSections() + .stream() + .map(this::buildMpaSectionsTableRow) + .sorted() + .collect(Collectors.toList()) + ); } } @@ -468,4 +663,136 @@ public class MvcMpaSectionsStep extends AbstractMvcAuthoringStep { return row; } + private Optional findSection( + final String sectionIdParam + ) { + if (!sectionIdParam.matches("[0-9]*")) { + models.put("invalidSectionId", true); + return Optional.empty(); + } + + final long sectionId = Long.parseLong(sectionIdParam); + return getMpa() + .getSections() + .stream() + .filter(section -> section.getSectionId() == sectionId) + .findAny(); + } + + private String initSectionModel( + final String sectionIdentifier, + final String documentPath, + final String sectionIdParam, + final String showView + ) { + try { + init(); + } catch (ContentSectionNotFoundException ex) { + return ex.showErrorMessage(); + } catch (DocumentNotFoundException ex) { + return ex.showErrorMessage(); + } + + if (itemPermissionChecker.canEditItem(getMpa())) { + final Optional result = findSection( + sectionIdParam + ); + if (!result.isPresent()) { + return showSectionNotFound( + sectionIdentifier, + documentPath, + sectionIdParam); + } + final MultiPartArticleSection section = result.get(); + + mpaSectionModel.setPageBreak(section.isPageBreak()); + mpaSectionModel.setRank(section.getRank()); + mpaSectionModel.setSectionId(section.getSectionId()); + mpaSectionModel.setTextValues( + section + .getText() + .getValues() + .entrySet() + .stream() + .collect( + Collectors.toMap( + entry -> entry.getKey().toString(), + Map.Entry::getValue + ) + ) + ); + mpaSectionModel.setTitleValues( + section + .getTitle() + .getValues() + .entrySet() + .stream() + .collect( + Collectors.toMap( + entry -> entry.getKey().toString(), + Map.Entry::getValue + ) + ) + ); + mpaSectionModel + .setTruncatedTextValues( + section + .getText() + .getValues() + .entrySet() + .stream() + .collect( + Collectors.toMap( + entry -> entry.getKey().toString(), + entry -> String.format( + "%s....", + StringUtils.truncate(entry.getValue(), 97) + ) + ) + ) + ); + + final Set textLocales = section + .getText() + .getAvailableLocales(); + mpaSectionModel.setUnusedTextLocales( + globalizationHelper + .getAvailableLocales() + .stream() + .filter(locale -> !textLocales.contains(locale)) + .map(Locale::toString) + .collect(Collectors.toList()) + ); + final Set titleLocales = section + .getTitle() + .getAvailableLocales(); + mpaSectionModel.setUnusedTitleLocales( + globalizationHelper + .getAvailableLocales() + .stream() + .filter(locale -> !titleLocales.contains(locale)) + .map(Locale::toString) + .collect(Collectors.toList()) + ); + + return showView; + } else { + return documentUi.showAccessDenied( + getContentSection(), + getMpa(), + mpaMessageBundle.getMessage("mpa.edit.denied") + ); + } + } + + private String showSectionNotFound( + final String sectionIdentifier, + final String documentPath, + final String sectionIdParam + ) { + models.put("sectionNotFound", true); + models.put("sectionId", sectionIdParam); + return showStep(sectionIdentifier, documentPath); + } + } diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/create-mpa.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/create-mpa.xhtml new file mode 100644 index 000000000..81e6ec361 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/mpa/create-mpa.xhtml @@ -0,0 +1,83 @@ +]> + + + + +
+

#{CmsMpaMessageBundle['createform.title']}

+ + + + + +
+ + + + + + + + + + + + #{CmsMpaMessageBundle['createform.cancel']} + + + + +
+ + + + diff --git a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle.properties index bf65e5a08..cf0facdd5 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle.properties @@ -12,3 +12,16 @@ createstep.workflow.none_selected=The selected workflow is not available. createstep.workflow.error.not_available=The selected workflow is not available. mpa.edit.denied=You have not been granted the required permissions to edit the article. authoringsteps.sections.description=Manage the sections of a multipart article. +createform.title=Create a new Multipart Article +createform.name.help=The name of the article. Only the letters a to z, A to Z, numbers, and dash and the underscore are permitted. +createform.name.label=Name +createform.initial_locale.help=The initial language of the article. Localizable values provided in this form will be added to the article for this language. +createform.initial_locale.label=Initial Locale +createform.title.help=The title of the article. +createform.title.label=Title +createform.summary.help=A short summary of the article. +createform.summary.label=Summary +createform.workflow.help=The workflow to use for the article. +createform.workflow.label=Workflow +createform.cancel=Cancel +createform.submit=Create Article diff --git a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle_de.properties index 931da3890..488081ed2 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/contenttypes/MpaStepsBundle_de.properties @@ -12,3 +12,16 @@ createstep.workflow.none_selected=Der ausgew\u00e4hlte Arbeitsablauf ist nicht v createstep.workflow.error.not_available=Der ausgew\u00e4hlte Arbeitsablauf ist nicht verf\u00fcgbar. mpa.edit.denied=Ihnen wurden nicht die erforderlichen Berechtigungen erteilt, um diesen Artikel zu bearbeiten. authoringsteps.sections.description=Die Sektionen eines mehrteiligen Artikels verwalten. +createform.title=Einen neuen mehrteiligen Artikel erstellen +createform.name.help=Der Name des Artikels. Darf nur die Buchstaben A bis Z und a bis z, Zahlen, den Bindestrich und den Unterstrich enthalten. +createform.name.label=Name +createform.initial_locale.help=Die initiale Sprache des Artikels. Lokaliserbare Eigenschaften, die in diesem Formualar angegeben werden, werden f\u00fcr diese Sprache dem Artikel hinzugef\u00fcgt. +createform.initial_locale.label=Initiale Sprache +createform.title.help=Der Titel des Artikels. +createform.title.label=Titel +createform.summary.help=Eine kurze Zusammenfassung des Artikels. +createform.summary.label=Zusammenfassung +createform.workflow.help=Der f\u00fcr den Artikel zu verwendende Arbeitsablauf. +createform.workflow.label=Arbeitsablauf +createform.cancel=Abbrechen +createform.submit=Artikel anlegen diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerIT.java index 6cfa15c73..6dc0740a0 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerIT.java @@ -187,7 +187,7 @@ public class AssetManagerIT { file.setDisplayName("datasheet.pdf"); file.setFileName("datasheet.pdf"); file.setMimeType(new MimeType("application/pdf")); - file.getTitle().addValue(Locale.ENGLISH, "datasheet.pdf"); + file.getTitle().putValue(Locale.ENGLISH, "datasheet.pdf"); assetRepo.save(file); assetManager.shareAsset(file, folder); diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerIT.java index 2d1aa75b0..af69587b0 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerIT.java @@ -1006,9 +1006,9 @@ public class ContentItemManagerIT { final Optional item = itemRepo.findById(10200L); assertThat(item.isPresent(), is(true)); - item.get().getName().addValue(Locale.ENGLISH, "article2-edited"); + item.get().getName().putValue(Locale.ENGLISH, "article2-edited"); item.get().getTitle() - .addValue(Locale.ENGLISH, "Article has been edited"); + .putValue(Locale.ENGLISH, "Article has been edited"); itemRepo.save(item.get()); final Optional draft = itemRepo.findById(10200L); diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryIT.java index d4e0a4155..20b220db1 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryIT.java @@ -406,8 +406,8 @@ public class ContentItemRepositoryIT { assertThat(item.isPresent(), is(true)); - item.get().getName().addValue(Locale.ENGLISH, "first-article"); - item.get().getTitle().addValue(Locale.ENGLISH, "First Article"); + item.get().getName().putValue(Locale.ENGLISH, "first-article"); + item.get().getTitle().putValue(Locale.ENGLISH, "First Article"); itemRepo.save(item.get()); } diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerIT.java index c4b6e231b..53e772d57 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerIT.java @@ -213,17 +213,17 @@ public class ContentSectionManagerIT { final Locale defaultLocale = new Locale(kernelConfig .getDefaultLanguage()); - section.getTitle().addValue(defaultLocale, "content"); + section.getTitle().putValue(defaultLocale, "content"); repository.save(section); section.getRootDocumentsFolder().setName("content_root"); section.getRootDocumentsFolder().setDisplayName("content_root"); - section.getRootDocumentsFolder().getTitle().addValue( + section.getRootDocumentsFolder().getTitle().putValue( defaultLocale, "content_root"); section.getRootAssetsFolder().setName("content_assets"); section.getRootAssetsFolder().setDisplayName("content_assets"); - section.getRootAssetsFolder().getTitle().addValue( + section.getRootAssetsFolder().getTitle().putValue( defaultLocale, "content_assets"); categoryRepo.save(section.getRootDocumentsFolder()); diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryDescriptionForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryDescriptionForm.java index 1f687a655..b450bfabf 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryDescriptionForm.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryDescriptionForm.java @@ -161,7 +161,7 @@ public class CategoryDescriptionForm extends Form { final String titleData = e.getFormData().getString( LOCALIZED_CATEGORY_DESC); - selectedCategory.getDescription().addValue(selectedLocale, + selectedCategory.getDescription().putValue(selectedLocale, titleData); categoryRepository.save(selectedCategory); } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryTitleForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryTitleForm.java index 7768aa158..ab4edac5a 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryTitleForm.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/CategoryTitleForm.java @@ -155,7 +155,7 @@ public class CategoryTitleForm extends Form { final String titleData = e.getFormData().getString( LOCALIZED_CATEGORY_TITLE); - selectedCategory.getTitle().addValue(selectedLocale, titleData); + selectedCategory.getTitle().putValue(selectedLocale, titleData); categoryRepository.save(selectedCategory); } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainDescriptionForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainDescriptionForm.java index f7d08fff1..02cc677a1 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainDescriptionForm.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainDescriptionForm.java @@ -159,7 +159,7 @@ class DomainDescriptionForm extends Form { final String titleData = e.getFormData().getString( LOCALIZED_DOMAIN_DESC); - selectedDomain.getDescription().addValue(selectedLocale, + selectedDomain.getDescription().putValue(selectedLocale, titleData); domainRepository.save(selectedDomain); } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainTitleForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainTitleForm.java index 5451bba74..06a511584 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainTitleForm.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/categories/DomainTitleForm.java @@ -157,7 +157,7 @@ class DomainTitleForm extends Form { final String titleData = e.getFormData().getString( LOCALIZED_DOMAIN_TITLE); - selectedDomain.getTitle().addValue(selectedLocale, titleData); + selectedDomain.getTitle().putValue(selectedLocale, titleData); domainRepository.save(selectedDomain); } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/configuration/SettingEditorLocalizedString.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/configuration/SettingEditorLocalizedString.java index 50b02e34d..ff3bff15a 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/configuration/SettingEditorLocalizedString.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/configuration/SettingEditorLocalizedString.java @@ -556,7 +556,7 @@ public class SettingEditorLocalizedString extends BoxPanel { final Locale locale = new Locale(data.getString( LOCALE_SELECT)); final String valueData = data.getString(VALUE); - localizedStr.addValue(locale, valueData); + localizedStr.putValue(locale, valueData); confManager.saveConfiguration(config); } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelForm.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelForm.java index 8ba4ed747..b92565a4c 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelForm.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/pagemodels/PageModelForm.java @@ -358,8 +358,8 @@ class PageModelForm extends Form { pageModel.setName(nameValue); - pageModel.getTitle().addValue(defaultLocale, titleValue); - pageModel.getDescription().addValue(defaultLocale, descValue); + pageModel.getTitle().putValue(defaultLocale, titleValue); + pageModel.getDescription().putValue(defaultLocale, descValue); pageModel.setApplication(application); diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java b/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java index 966697b28..a7fc4287f 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/ExampleConfiguration.java @@ -60,8 +60,8 @@ public final class ExampleConfiguration { new String[]{"en", "de"})); public ExampleConfiguration() { - title.addValue(Locale.GERMAN, "Dies ist ein Test"); - title.addValue(Locale.ENGLISH, "This is a test"); + title.putValue(Locale.GERMAN, "Dies ist ein Test"); + title.putValue(Locale.ENGLISH, "This is a test"); } public boolean isEnabled() { diff --git a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java index 79056815a..b1ba3ffc2 100644 --- a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java +++ b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java @@ -139,7 +139,7 @@ public class LocalizedString implements Serializable { * @param locale The locale of the provided value. * @param value The localised value for the provided locale. */ - public void addValue(final Locale locale, final String value) { + public void putValue(final Locale locale, final String value) { values.put(locale, value); } diff --git a/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java b/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java index 82a95e35c..9b7239dd2 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java +++ b/ccm-core/src/main/java/org/libreccm/modules/ConfigurationLoader.java @@ -211,7 +211,7 @@ class ConfigurationLoader { confName, settingName, token); continue; } - l10nSetting.getValue().addValue(new Locale(parts[0]), parts[1]); + l10nSetting.getValue().putValue(new Locale(parts[0]), parts[1]); } setting = l10nSetting; } else if (Long.class.getName().equals(settingType) diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java index 31c0fb7f3..24329cd9a 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/PageModelManager.java @@ -300,12 +300,12 @@ public class PageModelManager { for (Map.Entry entry : draftModel.getTitle().getValues() .entrySet()) { - liveModel.getTitle().addValue(entry.getKey(), entry.getValue()); + liveModel.getTitle().putValue(entry.getKey(), entry.getValue()); } for (Map.Entry entry : draftModel.getDescription() .getValues().entrySet()) { - liveModel.getDescription().addValue(entry.getKey(), + liveModel.getDescription().putValue(entry.getKey(), entry.getValue()); } diff --git a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java index 909cb78db..3abf7c548 100644 --- a/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java +++ b/ccm-core/src/main/java/org/libreccm/pagemodel/rs/PageModels.java @@ -229,13 +229,13 @@ public class PageModels { pageModel = pageModelManager.createPageModel(pageModelName, app); } if (pageModelData.containsKey("title")) { - pageModel.getTitle().addValue(kernelConfig.getDefaultLocale(), + pageModel.getTitle().putValue(kernelConfig.getDefaultLocale(), pageModelData.getString("title")); } if (pageModelData.containsKey("description")) { pageModel .getDescription() - .addValue(kernelConfig.getDefaultLocale(), + .putValue(kernelConfig.getDefaultLocale(), pageModelData.getString("description")); } diff --git a/ccm-core/src/main/java/org/libreccm/security/EmailTemplates.java b/ccm-core/src/main/java/org/libreccm/security/EmailTemplates.java index bc7a2e3d2..a633005a0 100644 --- a/ccm-core/src/main/java/org/libreccm/security/EmailTemplates.java +++ b/ccm-core/src/main/java/org/libreccm/security/EmailTemplates.java @@ -55,14 +55,14 @@ public final class EmailTemplates { public EmailTemplates() { emailVerificationSubject = new LocalizedStringSetting(); emailVerificationSubject.setValue(new LocalizedString()); - emailVerificationSubject.getValue().addValue( + emailVerificationSubject.getValue().putValue( Locale.ENGLISH, "Email verification"); - emailVerificationSubject.getValue().addValue( + emailVerificationSubject.getValue().putValue( Locale.GERMAN, "Prüfung ihrer E-Mail-Adresse"); emailVerificationMail = new LocalizedStringSetting(); emailVerificationMail.setValue(new LocalizedString()); - emailVerificationMail.getValue().addValue( + emailVerificationMail.getValue().putValue( Locale.ENGLISH, "Please follow the following link to finish the email verfication " + "process:\n" @@ -80,7 +80,7 @@ public final class EmailTemplates { + "\n" + "Please be aware that your verification token expires " + "at ${expires_date}."); - emailVerificationMail.getValue().addValue( + emailVerificationMail.getValue().putValue( Locale.GERMAN, "Bitte folgen Sie dem folgenden Link, um die Überprüfung ihrer E-" + "Mail-Adresse abzuschließen:\n" @@ -101,14 +101,14 @@ public final class EmailTemplates { passwordRecoverSubject = new LocalizedStringSetting(); passwordRecoverSubject.setValue(new LocalizedString()); - passwordRecoverSubject.getValue().addValue( + passwordRecoverSubject.getValue().putValue( Locale.ENGLISH, "Information regarding your password"); - passwordRecoverSubject.getValue().addValue( + passwordRecoverSubject.getValue().putValue( Locale.GERMAN, "Zurücksetzen ihres Passwortes"); passwordRecoverMail = new LocalizedStringSetting(); passwordRecoverMail.setValue(new LocalizedString()); - passwordRecoverMail.getValue().addValue( + passwordRecoverMail.getValue().putValue( Locale.ENGLISH, "Please follow the following link to complete the password recover " + "process:\n" @@ -124,7 +124,7 @@ public final class EmailTemplates { + "\n" + "Please be aware that you must complete the process until " + "${expires_date}."); - passwordRecoverMail.getValue().addValue( + passwordRecoverMail.getValue().putValue( Locale.GERMAN, "Bitte folgen Sie dem folgenden Link um ein neues Passwort " + "einzugeben:\n" @@ -145,14 +145,14 @@ public final class EmailTemplates { accountActivationSubject = new LocalizedStringSetting(); accountActivationSubject.setValue(new LocalizedString()); - accountActivationSubject.getValue().addValue( + accountActivationSubject.getValue().putValue( Locale.ENGLISH, "Activate your account"); - accountActivationSubject.getValue().addValue( + accountActivationSubject.getValue().putValue( Locale.GERMAN, "Aktivieren Sie Ihr Benutzerkonto"); accountActivationMail = new LocalizedStringSetting(); accountActivationMail.setValue(new LocalizedString()); - accountActivationMail.getValue().addValue( + accountActivationMail.getValue().putValue( Locale.ENGLISH, "Please follow the following link to enable your new account:\n" + "\n" @@ -168,7 +168,7 @@ public final class EmailTemplates { + "\n" + "Please be aware that you must activate your account before " + "${expires_date}."); - accountActivationMail.getValue().addValue( + accountActivationMail.getValue().putValue( Locale.GERMAN, "Bitte folgen Sie den folgendem Link, um ihr Benutzerkonto zu " + "aktivieren:\n" diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java index 8354f914d..b591ced51 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategoriesController.java @@ -418,7 +418,7 @@ public class CategoriesController { final Category category = result.get(); final Locale locale = new Locale(localeParam); - category.getTitle().addValue(locale, value); + category.getTitle().putValue(locale, value); categoryRepository.save(category); return String.format( "redirect:categorymanager/categories/ID-%d", @@ -476,7 +476,7 @@ public class CategoriesController { final Category category = result.get(); final Locale locale = new Locale(localeParam); - category.getTitle().addValue(locale, value); + category.getTitle().putValue(locale, value); categoryRepository.save(category); return String.format( "redirect:categorymanager/categories/ID-%d", @@ -591,7 +591,7 @@ public class CategoriesController { final Category category = result.get(); final Locale locale = new Locale(localeParam); - category.getDescription().addValue(locale, value); + category.getDescription().putValue(locale, value); categoryRepository.save(category); return String.format( "redirect:categorymanager/categories/ID-%d", @@ -650,7 +650,7 @@ public class CategoriesController { final Category category = result.get(); final Locale locale = new Locale(localeParam); - category.getDescription().addValue(locale, value); + category.getDescription().putValue(locale, value); categoryRepository.save(category); return String.format( "redirect:categorymanager/categories/ID-%d", diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java index 6e3f6ff7a..947949a49 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/categories/CategorySystemsController.java @@ -324,7 +324,7 @@ public class CategorySystemsController { final Domain domain = result.get(); final Locale locale = new Locale(localeParam); - domain.getTitle().addValue(locale, value); + domain.getTitle().putValue(locale, value); domainRepository.save(domain); return String.format( "redirect:categorymanager/categorysystems/ID-%d/details", @@ -389,7 +389,7 @@ public class CategorySystemsController { final Domain domain = result.get(); final Locale locale = new Locale(localeParam); - domain.getTitle().addValue(locale, value); + domain.getTitle().putValue(locale, value); domainRepository.save(domain); return String.format( "redirect:categorymanager/categorysystems/ID-%d/details", @@ -522,7 +522,7 @@ public class CategorySystemsController { final Domain domain = result.get(); final Locale locale = new Locale(localeParam); - domain.getDescription().addValue(locale, value); + domain.getDescription().putValue(locale, value); domainRepository.save(domain); return String.format( "redirect:categorymanager/categorysystems/ID-%d/details", @@ -589,7 +589,7 @@ public class CategorySystemsController { final Domain domain = result.get(); final Locale locale = new Locale(localeParam); - domain.getDescription().addValue(locale, value); + domain.getDescription().putValue(locale, value); domainRepository.save(domain); return String.format( "redirect:categorymanager/categorysystems/ID-%d/details", diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java index 04b17048b..bf0c1c001 100644 --- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java +++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java @@ -466,7 +466,7 @@ public class SettingsController { } final Locale locale = new Locale(tokens[0]); final String localeValue = tokens[1].trim(); - value.addValue(locale, localeValue); + value.putValue(locale, localeValue); } return updateSetting( configurationClassName, diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowManager.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowManager.java index 96ca169ef..3c43d040d 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowManager.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowManager.java @@ -146,14 +146,14 @@ public class WorkflowManager implements Serializable { template .getName() .getValues() - .forEach((locale, str) -> name.addValue(locale, str)); + .forEach((locale, str) -> name.putValue(locale, str)); workflow.setName(name); final LocalizedString description = new LocalizedString(); template .getDescription() .getValues() - .forEach((locale, str) -> description.addValue(locale, str)); + .forEach((locale, str) -> description.putValue(locale, str)); workflow.setDescription(description); workflowRepo.save(workflow); @@ -259,7 +259,7 @@ public class WorkflowManager implements Serializable { localized .getValues() - .forEach((locale, str) -> copy.addValue(locale, str)); + .forEach((locale, str) -> copy.putValue(locale, str)); writeMethod.invoke(task, copy); } else { diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java index a75375a2c..d7f457dab 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java @@ -59,12 +59,12 @@ public class ResourceEntityTest extends EqualsVerifier { final Resource resource1 = new Resource(); final LocalizedString title1 = new LocalizedString(); - title1.addValue(Locale.ENGLISH, "Resource 1"); + title1.putValue(Locale.ENGLISH, "Resource 1"); resource1.setTitle(title1); final Resource resource2 = new Resource(); final LocalizedString title2 = new LocalizedString(); - title2.addValue(Locale.ENGLISH, "Resource 2"); + title2.putValue(Locale.ENGLISH, "Resource 2"); resource2.setTitle(title2); final CcmObject ccmObject1 = new CcmObject(); diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java index 75eb1b7ec..719c60a36 100644 --- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java @@ -89,10 +89,10 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { ccmObject1.setDisplayName("Object 2"); final AssignableTask task1 = new AssignableTask(); - task1.getLabel().addValue(Locale.ENGLISH, "Task 1"); + task1.getLabel().putValue(Locale.ENGLISH, "Task 1"); final AssignableTask task2 = new AssignableTask(); - task2.getLabel().addValue(Locale.ENGLISH, "Task 2"); + task2.getLabel().putValue(Locale.ENGLISH, "Task 2"); verifier .withPrefabValues(Group.class, group1, group2)