From 91ee12d24014f6d1c3d655bd7c86bc5ba6004996 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 13 Aug 2022 16:37:21 +0200 Subject: [PATCH] Create steps for Proccedings and InProceedings --- .../contenttypes/InProceedingsItem.java | 23 +++++--- .../contenttypes/ProceedingsItem.java | 16 +++++- ...rticleInCollectedVolumeItemCreateStep.java | 22 ++++---- .../InProceedingsItemCreateStep.java | 55 +++++++++++++++++++ .../ProceedingsItemCreateStep.java | 54 ++++++++++++++++++ .../PublicationAuthoringSteps.java | 4 ++ .../ui/SciPublicationsBundle.properties | 2 + .../ui/SciPublicationsBundle_de.properties | 2 + 8 files changed, 159 insertions(+), 19 deletions(-) create mode 100644 sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsItemCreateStep.java create mode 100644 sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java index 9cf8244..484f193 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java @@ -1,14 +1,14 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.scientificcms.publications.contenttypes; - import org.hibernate.envers.Audited; import org.librecms.contenttypes.ContentTypeDescription; +import org.librecms.ui.contentsections.documents.MvcAuthoringKit; import org.scientificcms.publications.InProceedings; +import org.scientificcms.publications.ui.contenttypes.InProceedingsExtendedPropertiesStep; +import org.scientificcms.publications.ui.contenttypes.InProceedingsItemCreateStep; +import org.scientificcms.publications.ui.contenttypes.InProceedingsPropertiesStep; +import org.scientificcms.publications.ui.contenttypes.PublicationAbstractStep; +import org.scientificcms.publications.ui.contenttypes.PublicationMiscStep; import javax.persistence.Entity; import javax.persistence.Table; @@ -27,6 +27,15 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; descriptionBundle = "org.scientificcms.publications.contenttypes.InProceedings" ) +@MvcAuthoringKit( + createStep = InProceedingsItemCreateStep.class, + authoringSteps = { + InProceedingsPropertiesStep.class, + InProceedingsExtendedPropertiesStep.class, + PublicationAbstractStep.class, + PublicationMiscStep.class + } +) public class InProceedingsItem extends PublicationItem { private static final long serialVersionUID = 1L; @@ -70,7 +79,7 @@ public class InProceedingsItem extends PublicationItem { return false; } final InProceedingsItem other - = (InProceedingsItem) obj; + = (InProceedingsItem) obj; // if (!other.canEqual(this)) { // return false; // } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java index 35f2773..5b901a9 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java @@ -6,7 +6,13 @@ package org.scientificcms.publications.contenttypes; import org.librecms.contenttypes.ContentTypeDescription; +import org.librecms.ui.contentsections.documents.MvcAuthoringKit; import org.scientificcms.publications.Proceedings; +import org.scientificcms.publications.ui.contenttypes.ProceedingsExtendedPropertiesStep; +import org.scientificcms.publications.ui.contenttypes.ProceedingsItemCreateStep; +import org.scientificcms.publications.ui.contenttypes.ProceedingsPropertiesStep; +import org.scientificcms.publications.ui.contenttypes.PublicationAbstractStep; +import org.scientificcms.publications.ui.contenttypes.PublicationMiscStep; import javax.persistence.Entity; import javax.persistence.Table; @@ -24,7 +30,15 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; descriptionBundle = "org.scientificcms.publications.contenttypes.Proceedings" ) - +@MvcAuthoringKit( + createStep = ProceedingsItemCreateStep.class, + authoringSteps = { + ProceedingsPropertiesStep.class, + ProceedingsExtendedPropertiesStep.class, + PublicationAbstractStep.class, + PublicationMiscStep.class + } +) public class ProceedingsItem extends PublicationWithPublisherItem { private static final long serialVersionUID = 1L; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeItemCreateStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeItemCreateStep.java index 202a51c..1627fef 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeItemCreateStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ArticleInCollectedVolumeItemCreateStep.java @@ -14,42 +14,42 @@ import javax.inject.Named; */ @RequestScoped @Named("SciPublicationsArticleInCollectedVolumeCreateStep") -public class ArticleInCollectedVolumeItemCreateStep -extends AbstractPublicationItemCreateStep{ - +public class ArticleInCollectedVolumeItemCreateStep + extends AbstractPublicationItemCreateStep { + @Inject private GlobalizationHelper globalizationHelper; - + @Override public String getDocumentType() { return ArticleInCollectedVolumeItem.class.getName(); } - + @Override public String getDescription() { return globalizationHelper .getLocalizedTextsUtil(getBundle()) .getText("articleincollectedvolumeitem.createstep.description"); } - + @Override public String showCreateStep() { return "org/scientificcms/contenttypes/ui/articleincollectedvolume/create-articleincollectedvolume.xhtml"; } - + @Override public Class getPublicationItemClass() { return ArticleInCollectedVolumeItem.class; } - - @Override + + @Override public ArticleInCollectedVolume createPublication() { return new ArticleInCollectedVolume(); } - + @Override protected String getEditStepName() { return ArticleInCollectedVolumePropertiesStep.EDIT_STEP_URL_FRAGMENT; } - + } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsItemCreateStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsItemCreateStep.java new file mode 100644 index 0000000..cb20c3b --- /dev/null +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InProceedingsItemCreateStep.java @@ -0,0 +1,55 @@ +package org.scientificcms.publications.ui.contenttypes; + +import org.libreccm.l10n.GlobalizationHelper; +import org.scientificcms.publications.InProceedings; +import org.scientificcms.publications.contenttypes.InProceedingsItem; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; + +/** + * + * @author Jens Pelzetter + */ +@RequestScoped +@Named("SciPublicationsInProceedingsCreateStep") +public class InProceedingsItemCreateStep + extends AbstractPublicationItemCreateStep { + + @Inject + private GlobalizationHelper globalizationHelper; + + @Override + public String getDocumentType() { + return InProceedingsItem.class.getName(); + } + + @Override + public String getDescription() { + return globalizationHelper + .getLocalizedTextsUtil(getBundle()) + .getText("inproceedings.createstep.description"); + } + + @Override + public String showCreateStep() { + return "org/scientificcms/contenttypes/ui/inproceedings/create-inproceedings.xhtml"; + } + + @Override + public Class getPublicationItemClass() { + return InProceedingsItem.class; + } + + @Override + public InProceedings createPublication() { + return new InProceedings(); + } + + @Override + protected String getEditStepName() { + return InProceedingsPropertiesStep.EDIT_STEP_URL_FRAGMENT; + } + +} diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java new file mode 100644 index 0000000..9ed3360 --- /dev/null +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ProceedingsItemCreateStep.java @@ -0,0 +1,54 @@ +package org.scientificcms.publications.ui.contenttypes; + +import org.libreccm.l10n.GlobalizationHelper; +import org.scientificcms.publications.Proceedings; +import org.scientificcms.publications.contenttypes.ProceedingsItem; + +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; +import javax.inject.Named; + +/** + * + * @author Jens Pelzetter + */ +@RequestScoped +@Named("SciCmsProceedingsItemCreateStep") +public class ProceedingsItemCreateStep +extends AbstractPublicationWithPublisherItemCreateStep{ + + @Inject + private GlobalizationHelper globalizationHelper; + + @Override + public String getDocumentType() { + return ProceedingsItem.class.getName(); + } + + @Override + public String getDescription() { + return globalizationHelper + .getLocalizedTextsUtil(getBundle()) + .getText("proceedings.createstep.description"); + } + + @Override + public String showCreateStep() { + return "org/scientificcms/contenttypes/ui/proceedings/create-proceedings.xhtml"; + } + + @Override + public Class getPublicationItemClass() { + return ProceedingsItem.class; + } + + @Override + public Proceedings createPublication() { + return new Proceedings(); + } + + @Override + public String getEditStepName() { + return ProceedingsPropertiesStep.EDIT_STEP_URL_FRAGMENT; + } +} diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAuthoringSteps.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAuthoringSteps.java index 9a7b7a6..6d434bd 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAuthoringSteps.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAuthoringSteps.java @@ -20,8 +20,12 @@ public class PublicationAuthoringSteps implements MvcAuthoringSteps { ArticleInCollectedVolumeExtendedPropertiesStep.class, CollectedVolumePropertiesStep.class, CollectedVolumeExtendedPropertiesStep.class, + InProceedingsPropertiesStep.class, + InProceedingsExtendedPropertiesStep.class, MonographPropertiesStep.class, MonographExtendedPropertiesStep.class, + ProceedingsPropertiesStep.class, + ProceedingsExtendedPropertiesStep.class, PublicationAbstractStep.class, PublicationMiscStep.class ); diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties index faee9cf..4814eda 100644 --- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties +++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle.properties @@ -484,3 +484,5 @@ extendedproperties.edition.remove.cancel=Cancel extendedproperties.edition.remove.submit=Remove extendedproperties.edition.remove.text=Are you sure to remove the following edition label: extendedproperties.edition.remove.title=Remove edition label +proceedings.createstep.description=Create a new Proceedings publication. +inproceedings.createstep.description=Create a new in proceedings publication. diff --git a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties index fa9cd98..92ea410 100644 --- a/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties +++ b/sci-publications/src/main/resources/org/scientificcms/publications/ui/SciPublicationsBundle_de.properties @@ -484,3 +484,5 @@ extendedproperties.edition.remove.cancel=Abbrechen extendedproperties.edition.remove.submit=Entfernen extendedproperties.edition.remove.text=Sind Sie sicher, dass Sie die folgenden Ausgaben-Bezeichnung entfernen wollen: extendedproperties.edition.remove.title=Angabe zur Ausgabe entfernen +proceedings.createstep.description=Einen neuen Tagungsband anlegen. +inproceedings.createstep.description=Einen neuen Tagungsbandbeitrag anlegen.