diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java index 14567ff1b..0c511bf8c 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/GenericArticlePropertiesStep.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.PropertyEditor; import com.arsdigita.bebop.parameters.StringParameter; @@ -78,7 +77,7 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { editSheet.getSaveCancelSection().getCancelButton()); } - protected void setDisplayComponent(ItemSelectionModel itemModel) { + protected void setDisplayComponent(final ItemSelectionModel itemModel) { setDisplayComponent(getGenericArticlePropertySheet(itemModel)); } @@ -97,8 +96,9 @@ public class GenericArticlePropertiesStep extends SimpleEditStep { * release */ public static Component getGenericArticlePropertySheet( - ItemSelectionModel itemModel) { - DomainObjectPropertySheet sheet = new DomainObjectPropertySheet( + final ItemSelectionModel itemModel) { + + final DomainObjectPropertySheet sheet = new DomainObjectPropertySheet( itemModel); sheet.add(new GlobalizedMessage("cms.contenttypes.ui.title", diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertiesStep.java b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java similarity index 97% rename from ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertiesStep.java rename to ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java index 3c68500ed..7ccd32d8f 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertiesStep.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java @@ -57,14 +57,14 @@ import java.util.Optional; * @see com.arsdigita.cms.contenttypes.NewsItem * */ -public class NewsItemPropertiesStep extends SimpleEditStep { +public class NewsPropertiesStep extends SimpleEditStep { /** * The name of the editing sheet added to this step */ public static String EDIT_SHEET_NAME = "edit"; - public NewsItemPropertiesStep(final ItemSelectionModel itemModel, + public NewsPropertiesStep(final ItemSelectionModel itemModel, final AuthoringKitWizard parent, final StringParameter selectedLanguageParam) { @@ -73,7 +73,7 @@ public class NewsItemPropertiesStep extends SimpleEditStep { setDefaultEditKey(EDIT_SHEET_NAME); BasicPageForm editSheet; - editSheet = new NewsItemPropertyForm(itemModel, this); + editSheet = new NewsPropertyForm(itemModel, this); add(EDIT_SHEET_NAME, new GlobalizedMessage("cms.ui.edit", CmsConstants.CMS_BUNDLE), new WorkflowLockedComponentAccess(editSheet, itemModel), diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertyForm.java similarity index 92% rename from ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java rename to ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertyForm.java index 342ce43d2..e1e08374e 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertyForm.java @@ -47,16 +47,16 @@ import java.util.GregorianCalendar; /** * Form to edit the basic properties of a {@link News} item. These are name, - * title, item date and reference code. Used by {@link NewsItemPropertiesStep} + * title, item date and reference code. Used by {@link NewsPropertiesStep} * authoring kit step. * * This form can be extended to create forms for NewsItem subclasses. * */ -public class NewsItemPropertyForm extends BasicPageForm +public class NewsPropertyForm extends BasicPageForm implements FormProcessListener, FormInitListener, FormSubmissionListener { - private NewsItemPropertiesStep propertiesStep; + private NewsPropertiesStep propertiesStep; /** * lead parameter name */ @@ -80,7 +80,7 @@ public class NewsItemPropertyForm extends BasicPageForm * @param itemSelectionModel The ItemSelectionModel to use to obtain the * NewsItem to work on */ - public NewsItemPropertyForm(final ItemSelectionModel itemSelectionModel) { + public NewsPropertyForm(final ItemSelectionModel itemSelectionModel) { this(itemSelectionModel, null); } @@ -90,11 +90,11 @@ public class NewsItemPropertyForm extends BasicPageForm * * @param itemSelectionModel The ItemSelectionModel to use to obtain the * NewsItem to work on - * @param propertiesStep The NewsItemPropertiesStep which controls this - * form. + * @param propertiesStep The NewsPropertiesStep which controls this + form. */ - public NewsItemPropertyForm(final ItemSelectionModel itemSelectionModel, - final NewsItemPropertiesStep propertiesStep) { + public NewsPropertyForm(final ItemSelectionModel itemSelectionModel, + final NewsPropertiesStep propertiesStep) { super(ID, itemSelectionModel); this.propertiesStep = propertiesStep; addSubmissionListener(this); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/ApplyWorkflowFormSection.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/ApplyWorkflowFormSection.java index da6b8cc88..0a3bdc916 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/ApplyWorkflowFormSection.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/ApplyWorkflowFormSection.java @@ -219,13 +219,15 @@ public class ApplyWorkflowFormSection final Long workflowTemplateId = (Long) radioGroup.getValue(state); final Folder folder = creationSelector.getFolder(state); - + final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final ApplyWorkflowController controller = cdiUtil .findBean(ApplyWorkflowController.class); - - controller.applyWorkflow(item, folder, workflowTemplateId); - + + if (workflowTemplateId != null) { + controller.applyWorkflow(item, folder, workflowTemplateId); + } + // final WorkflowTemplate template; // // final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); @@ -268,7 +270,6 @@ public class ApplyWorkflowFormSection // } // } // } - } private class ApplyWorkflowPrintListener diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/SimpleEditStep.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/SimpleEditStep.java index 0673eb5ba..66089b2be 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/SimpleEditStep.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/SimpleEditStep.java @@ -124,6 +124,7 @@ public class SimpleEditStep extends SecurityPropertyEditor * component may use the wizard's methods, such as * stepForward and stepBack, in its process * listener. + * @param selectedLanguageParam * * @param parameterSuffix Additional global parameter name suffix if * there are multiple SimpleEditStep instances in diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/templates/ItemTemplates.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/templates/ItemTemplates.java index 544b0f95a..4cf85a0f8 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/templates/ItemTemplates.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/templates/ItemTemplates.java @@ -75,9 +75,10 @@ public class ItemTemplates extends SecurityPropertyEditor { // ToDo // ItemTemplatesListingImpl l = new ItemTemplatesListingImpl(model); // -// final LayoutPanel layout = new LayoutPanel(); -// setDisplayComponent(layout); -// + final LayoutPanel layout = new LayoutPanel(); + setDisplayComponent(layout); + +// ToDo // SegmentedPanel st = new SegmentedPanel(); // layout.setBody(st); // diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java index 820d114f0..b819e6b2a 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java @@ -18,6 +18,7 @@ */ package org.librecms.contenttypes; +import com.arsdigita.cms.contenttypes.ui.EventPropertiesStep; import com.arsdigita.cms.ui.contenttypes.EventCreateForm; import java.io.Serializable; @@ -53,8 +54,18 @@ import static org.librecms.CmsConstants.*; @Table(name = "EVENTS", schema = DB_SCHEMA) @ContentTypeDescription(labelBundle = "org.librecms.contenttypes.Event", descriptionBundle = "org.librecms.contenttypes.Event") -@AuthoringKit(createComponent = EventCreateForm.class, - steps = {}) +@AuthoringKit( + createComponent = EventCreateForm.class, + steps = { + @AuthoringStep( + component = EventPropertiesStep.class, + labelBundle = "org.librecms.CmsResources", + labelKey = "cms.contenttypes.shared.basic_properties.title", + descriptionBundle = "org.librecms.CmsResources", + descriptionKey = "cms.contenttypes.shared.basic_properties" + + ".description", + order = 1) + }) public class Event extends ContentItem implements Serializable { private static final long serialVersionUID = -9104886733503414635L; diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java index 5e2df87f6..9ae7137dc 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java @@ -19,6 +19,8 @@ package org.librecms.contenttypes; import com.arsdigita.cms.contenttypes.ui.mparticle.MultiPartArticleCreateForm; +import com.arsdigita.cms.contenttypes.ui.mparticle.MultiPartArticleEdit; + import org.hibernate.envers.Audited; import org.libreccm.l10n.LocalizedString; import org.librecms.contentsection.ContentItem; @@ -46,10 +48,22 @@ import static org.librecms.CmsConstants.*; @Entity @Audited @Table(name = "MULTIPART_ARTICLES", schema = DB_SCHEMA) -@ContentTypeDescription(labelBundle = "org.librecms.contenttypes.MultiPartArticle", - descriptionBundle = "org.librecms.contenttypes.MultiPartArticle") -@AuthoringKit(createComponent = MultiPartArticleCreateForm.class, - steps = {}) +@ContentTypeDescription(labelBundle + = "org.librecms.contenttypes.MultiPartArticle", + descriptionBundle + = "org.librecms.contenttypes.MultiPartArticle") +@AuthoringKit( + createComponent = MultiPartArticleCreateForm.class, + steps = { + @AuthoringStep( + component = MultiPartArticleEdit.class, + labelBundle = "org.librecms.CmsResources", + labelKey = "cms.contenttypes.shared.basic_properties.title", + descriptionBundle = "org.librecms.CmsResources", + descriptionKey = "cms.contenttypes.shared.basic_properties" + + ".description", + order = 1) + }) public class MultiPartArticle extends ContentItem implements Serializable { private static final long serialVersionUID = -587374085831420868L; diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java index d5a6f836d..f5fb3972f 100644 --- a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java +++ b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java @@ -18,6 +18,7 @@ */ package org.librecms.contenttypes; +import com.arsdigita.cms.contenttypes.ui.NewsPropertiesStep; import com.arsdigita.cms.ui.contenttypes.NewsCreateForm; import org.hibernate.envers.Audited; @@ -50,8 +51,18 @@ import static org.librecms.CmsConstants.*; @Table(name = "NEWS", schema = DB_SCHEMA) @ContentTypeDescription(labelBundle = "org.librecms.contenttypes.News", descriptionBundle = "org.librecms.contenttypes.News") -@AuthoringKit(createComponent = NewsCreateForm.class, - steps = {}) +@AuthoringKit( + createComponent = NewsCreateForm.class, + steps = { + @AuthoringStep( + component = NewsPropertiesStep.class, + labelBundle = "org.librecms.CmsResources", + labelKey = "cms.contenttypes.shared.basic_properties.title", + descriptionBundle = "org.librecms.CmsResources", + descriptionKey = "cms.contenttypes.shared.basic_properties" + + ".description", + order = 1) + }) public class News extends ContentItem implements Serializable { private static final long serialVersionUID = -4939565845920227974L; @@ -61,12 +72,12 @@ public class News extends ContentItem implements Serializable { */ @Embedded @AssociationOverride( - name = "values", - joinTable = @JoinTable(name = "NEWS_TEXTS", - schema = DB_SCHEMA, - joinColumns = { - @JoinColumn(name = "OBJECT_ID")} - )) + name = "values", + joinTable = @JoinTable(name = "NEWS_TEXTS", + schema = DB_SCHEMA, + joinColumns = { + @JoinColumn(name = "OBJECT_ID")} + )) private LocalizedString text; /** @@ -152,11 +163,12 @@ public class News extends ContentItem implements Serializable { @Override public String toString(final String data) { return super.toString(String.format(", text = %s, " - + "releaseDate = %tF % de.jpdigital - hibernate5-ddl-maven-plugin - 1.0.1-hibernate-5.2.4.Final + hibernate50-ddl-maven-plugin + 2.0.4 org.jacoco