From 112b1d40e384c31eb9afa8420ab5e886e03aa4ec Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 13 Jan 2017 13:47:57 +0000 Subject: [PATCH] CCM NG: Some cleanup git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4518 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: 39aaa674ac40fe66d6a31866a63944c857cf6da7 --- .../com/arsdigita/cms/ItemSelectionModel.java | 3 ++- .../com/arsdigita/cms/lifecycle/Duration.java | 2 +- .../com/arsdigita/cms/ui/BaseItemPane.java | 2 +- .../cms/ui/ContentSectionContextBar.java | 2 +- .../arsdigita/cms/ui/ContentSectionPage.java | 11 +--------- .../cms/ui/ListOptionPrintListener.java | 7 +++--- .../com/arsdigita/cms/ui/UserAddForm.java | 7 ++---- .../arsdigita/cms/ui/VisibilityComponent.java | 10 +++++---- .../ui/authoring/AuthoringKitSelector.java | 6 +---- .../cms/ui/authoring/BasicItemForm.java | 2 +- .../cms/ui/authoring/WizardSelector.java | 4 ++-- .../cms/ui/folder/FolderBrowser.java | 22 +++++++++---------- .../arsdigita/cms/ui/folder/FolderForm.java | 6 ++--- .../cms/ui/folder/FolderTreeModelBuilder.java | 4 +--- .../cms/ui/lifecycle/AddPhaseForm.java | 5 +---- .../cms/ui/lifecycle/BaseLifecycleForm.java | 2 +- .../cms/ui/lifecycle/DeletePhaseForm.java | 5 +---- .../cms/ui/lifecycle/EditPhaseForm.java | 14 +++++++----- .../lifecycle/ItemPhaseTableModelBuilder.java | 2 -- .../cms/ui/lifecycle/LifecycleAddForm.java | 2 +- .../ui/lifecycle/LifecycleAdminContainer.java | 4 +--- .../cms/ui/lifecycle/LifecycleEditForm.java | 1 - .../lifecycle/LifecycleListModelBuilder.java | 2 +- .../cms/ui/type/ContentTypeAdminPane.java | 7 ++---- .../cms/ui/type/ContentTypeItemPane.java | 8 +++---- .../cms/ui/type/ContentTypePropertyList.java | 2 +- .../com/arsdigita/cms/ui/type/EditType.java | 2 +- .../com/arsdigita/cms/ui/type/SelectType.java | 8 +------ .../cms/ui/type/TypeSecurityContainer.java | 4 +--- .../cms/ui/type/TypeSecurityListener.java | 3 +-- .../cms/ui/workflow/BaseTaskForm.java | 4 +--- .../cms/ui/workflow/BaseWorkflowForm.java | 3 +-- .../cms/ui/workflow/TaskAddForm.java | 2 +- .../cms/ui/workflow/TaskEditForm.java | 2 +- .../cms/ui/workflow/TaskFinishForm.java | 2 -- .../cms/ui/workflow/TaskItemPane.java | 5 +---- .../cms/ui/workflow/WorkflowAddForm.java | 2 +- .../cms/ui/workflow/WorkflowAdminPane.java | 3 +-- .../cms/ui/workflow/WorkflowEditForm.java | 2 +- .../ui/workflow/WorkflowListModelBuilder.java | 2 +- 40 files changed, 70 insertions(+), 116 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ItemSelectionModel.java b/ccm-cms/src/main/java/com/arsdigita/cms/ItemSelectionModel.java index 35b9a2f27..4d6310300 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ItemSelectionModel.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ItemSelectionModel.java @@ -43,8 +43,9 @@ import java.math.BigDecimal; * model will only instantiate items that are of the specified content type, or * one of it subclasses.

* - * @author Jens Pelzetter * @author Stanislav Freidin (stas@arsdigita.com) + * @author Jens Pelzetter + * * @see com.arsdigita.kernel.ui.ACSObjectSelectionModel * @see com.arsdigita.bebop.SingleSelectionModel */ diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/lifecycle/Duration.java b/ccm-cms/src/main/java/com/arsdigita/cms/lifecycle/Duration.java index a29421061..4ece2dcfe 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/lifecycle/Duration.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/lifecycle/Duration.java @@ -23,8 +23,8 @@ import com.arsdigita.util.Assert; /** * Utility methods for lifecycle durations. * - * @author Michael Pih + * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ public abstract class BaseItemPane extends ModalPanel { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionContextBar.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionContextBar.java index d1bcc71ef..ebaec6d78 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionContextBar.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionContextBar.java @@ -39,8 +39,8 @@ import org.apache.logging.log4j.Logger; /** * The context bar of the content section UI. * - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ public class ContentSectionContextBar extends WorkspaceContextBar { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java index 380ca212c..a28e042af 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java @@ -45,21 +45,13 @@ import com.arsdigita.cms.ui.workflow.WorkflowAdminPane; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.toolbox.ui.LayoutPanel; import com.arsdigita.util.Assert; -import com.arsdigita.web.Web; - -import org.apache.logging.log4j.LogManager; import javax.servlet.http.HttpServletRequest; -import org.apache.logging.log4j.Logger; import org.arsdigita.cms.CMSConfig; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.PermissionChecker; import org.librecms.CmsConstants; -import org.librecms.contentsection.ContentItemManager; -import org.librecms.contentsection.ContentItemRepository; -import org.librecms.contentsection.ContentItemVersion; -import org.librecms.contentsection.ContentSectionConfig; import org.librecms.contentsection.privileges.AdminPrivileges; /** @@ -69,12 +61,11 @@ import org.librecms.contentsection.privileges.AdminPrivileges; * replaced by the newer servlet based model. @see * c.ad.cms.ui.contentsection.MainPage (currently not active). * - * @author Jens Pelzetter * @author Jack Chung * @author Michael Pih * @author Xixi D'Moon * @author Justin Ross - + * @author Jens Pelzetter */ public class ContentSectionPage extends CMSPage implements ActionListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ListOptionPrintListener.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ListOptionPrintListener.java index bbf4de74f..e15192cbe 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/ListOptionPrintListener.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/ListOptionPrintListener.java @@ -27,10 +27,11 @@ import com.arsdigita.bebop.form.OptionGroup; import java.util.List; /** - * Migrated from the {@code DataQueryOptionPrintListener} in the old system. Renamed - * and refactored to operate on a list. - * + * Migrated from the {@code DataQueryOptionPrintListener} in the old system. + * Renamed and refactored to operate on a list. + * * @author Jens Pelzetter + * * @param Type of the objects in the list. */ public abstract class ListOptionPrintListener implements PrintListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/UserAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/UserAddForm.java index 58c621218..8969a7737 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/UserAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/UserAddForm.java @@ -38,22 +38,20 @@ import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.form.Widget; import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; import org.libreccm.security.User; import org.librecms.CmsConstants; -import java.math.BigDecimal; import java.util.List; import java.util.TooManyListenersException; /** * Form for adding multiple users to a role. * - * @author Jens Pelzetter * @author Michael Pih * @author Uday Mathur + * @author Jens Pelzetter */ public abstract class UserAddForm extends SimpleContainer implements FormProcessListener { @@ -245,8 +243,7 @@ public abstract class UserAddForm extends SimpleContainer } /** - * Generates a {@link List} that encapsulates - * search results. + * Generates a {@link List} that encapsulates search results. * * @param state The page state * diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/VisibilityComponent.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/VisibilityComponent.java index 5e834faff..db0375357 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/VisibilityComponent.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/VisibilityComponent.java @@ -27,11 +27,11 @@ import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.PermissionChecker; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ public class VisibilityComponent extends ProxyComponent { - + private final String m_action; public VisibilityComponent(final Component child, final String action) { @@ -49,8 +49,10 @@ public class VisibilityComponent extends ProxyComponent { Assert.exists(m_action, String.class); final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final PermissionChecker permissionChecker = cdiUtil.findBean(PermissionChecker.class); - + final PermissionChecker permissionChecker = cdiUtil.findBean( + PermissionChecker.class); + return permissionChecker.isPermitted(m_action); } + } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java index 9ca65ca9d..8368b2adf 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java @@ -25,7 +25,6 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.SingleSelectionModel; - import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.xml.Element; @@ -36,7 +35,6 @@ import java.util.Map; import org.apache.logging.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; -import org.librecms.contentsection.ContentType; import org.librecms.contenttypes.AuthoringKitInfo; import org.librecms.contenttypes.ContentTypeInfo; import org.librecms.contenttypes.ContentTypesManager; @@ -48,8 +46,8 @@ import java.util.Objects; * Selects a component based on content type. Helper class for {@link * com.arsdigita.cms.ui.authoring.WizardSelector}. * - * @author Jens Pelzetter * @author unknown + * @author Jens Pelzetter */ public abstract class AuthoringKitSelector extends SimpleContainer { @@ -74,8 +72,6 @@ public abstract class AuthoringKitSelector extends SimpleContainer { components = new HashMap<>(); selectionModel = new MapComponentSelectionModel<>(model, components); - - final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final ContentTypesManager typesManager = cdiUtil.findBean( ContentTypesManager.class); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicItemForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicItemForm.java index 8ed8c3a9a..c5c76ca73 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicItemForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicItemForm.java @@ -46,8 +46,8 @@ import org.librecms.CmsConstants; * A form for editing subclasses of ContentItem. This is just a convenience * class. * - * @author Jens Pelzetter * @author Stanislav Freidin + * @author Jens Pelzetter */ public abstract class BasicItemForm extends FormSection implements FormInitListener, diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/WizardSelector.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/WizardSelector.java index 71afe564a..df2221184 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/WizardSelector.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/WizardSelector.java @@ -44,9 +44,9 @@ import org.librecms.contenttypes.ContentTypeInfo; * * Essentially, this component is a hack which is used to get around the fact * that we cannot instantiate stateful components dynamically. - * - * @author Jens Pelzetter + * * @author unknown + * @author Jens Pelzetter */ public class WizardSelector extends AuthoringKitSelector implements Resettable { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java index dc3051c29..c11f8ae71 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowser.java @@ -85,9 +85,9 @@ import java.util.Date; * selection model is updated. If the user clicks on any other item, an separate * item selection model is updated. * - * @author Jens Pelzetter - * @author Sören Bernstein * @author David Lutterkort + * @author Sören Bernstein + * @author Jens Pelzetter */ public class FolderBrowser extends Table { @@ -325,15 +325,15 @@ public class FolderBrowser extends Table { ((String) state. getValue( m_aToZfilter)). - toLowerCase( - defaultLocale)))); + toLowerCase( + defaultLocale)))); filters.add(criteriaBuilder.like(criteriaBuilder.lower( root.get("Categorization.categoriziedObject.name.value")), String.format("%s%%", (String) state. - getValue( - m_aToZfilter)) - .toLowerCase(defaultLocale))); + getValue( + m_aToZfilter)) + .toLowerCase(defaultLocale))); } if (state.getValue(m_filter) != null) { @@ -341,14 +341,14 @@ public class FolderBrowser extends Table { root.get("Categorization.categorizedObject.displayName")), String.format("%s%%", ((String) state. - getValue( - m_filter))))); + getValue( + m_filter))))); filters.add(criteriaBuilder.like(criteriaBuilder.lower( root.get("Categorization.categorizedObject.name.value")), String.format("%s%%", ((String) state. - getValue( - m_filter))))); + getValue( + m_filter))))); } final Predicate filtersPredicate = criteriaBuilder.or(filters. 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 f5339af7d..13966bb7d 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 @@ -35,7 +35,6 @@ import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.TrimmedStringParameter; import com.arsdigita.bebop.parameters.URLTokenValidationListener; -import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.Assert; @@ -59,9 +58,8 @@ import org.librecms.CmsConstants; * {@link BasicItemForm}. Therefore it is possible that comments etc still refer * to {@link BasicItemForm}. * - * @author Jens Pelzetter * @author Jon Orris - * + * @author Jens Pelzetter */ public abstract class FolderForm extends FormSection implements FormInitListener, @@ -390,7 +388,7 @@ public abstract class FolderForm extends FormSection .getSelectedObject(state); return folder; } - + final protected FolderSelectionModel getFolderSelectionModel() { return currentFolder; } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java index fa180c008..c7b402abb 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java @@ -36,11 +36,9 @@ import org.libreccm.categorization.Category; * containing the folder structure underneath a root folder. The root folder can * be changed by overriding {@link #getRoot getRoot}. * - * @author Jens Pelzetter * @author Tri Tran * @author David Lutterkort - * - * @version $Id: FolderTreeModelBuilder.java 2183 2011-06-20 00:57:18Z pboy $ + * @author Jens Pelzetter */ public class FolderTreeModelBuilder extends LockableImpl implements TreeModelBuilder { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java index 95bc322f4..2b1d35526 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java @@ -47,7 +47,6 @@ import com.arsdigita.cms.ui.CMSForm; import com.arsdigita.cms.ui.FormSecurityListener; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.KernelConfig; -import com.arsdigita.util.UncheckedWrapperException; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.configuration.ConfigurationManager; @@ -56,18 +55,16 @@ import org.librecms.contentsection.privileges.AdminPrivileges; import org.librecms.lifecycle.LifecycleDefinitionRepository; import org.librecms.lifecycle.PhaseDefinititionRepository; -import java.math.BigDecimal; -import java.sql.SQLException; import java.util.List; import java.util.Locale; /** * This class contains a form component to add a lifecycle phase definition. * - * @author Jens Pelzetter * @author Jack Chung * @author Xixi D'Moon * @author Michael Pih + * @author Jens Pelzetter */ class AddPhaseForm extends CMSForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java index e063e2036..5d7b80279 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java @@ -44,8 +44,8 @@ import org.librecms.lifecycle.LifecycleDefinition; import java.util.Locale; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ class BaseLifecycleForm extends BaseForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java index fc3116363..cf067bb21 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.ui.lifecycle; import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.ColumnPanel; -import com.arsdigita.bebop.Form; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.PageState; @@ -38,17 +37,15 @@ import com.arsdigita.cms.ui.CMSForm; import com.arsdigita.cms.ui.FormSecurityListener; import org.libreccm.cdi.utils.CdiUtil; -import org.librecms.CmsConstants; import org.librecms.contentsection.privileges.AdminPrivileges; import org.librecms.lifecycle.PhaseDefinititionRepository; -import java.math.BigDecimal; /** * This class handles the deleting of a phase definition. * - * @author Jens Pelzetter * @author Jack Chung + * @author Jens Pelzetter */ class DeletePhaseForm extends CMSForm implements FormProcessListener, FormInitListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java index f93d07dad..2271e199c 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java @@ -56,10 +56,10 @@ import java.util.Locale; /** * This class contains a form component to edit a lifecycle phase definition. * - * @author Jens Pelzetter * @author Jack Chung * @author Xixi D'Moon * @author Michael Pih + * @author Jens Pelzetter */ class EditPhaseForm extends CMSForm { @@ -280,7 +280,7 @@ class EditPhaseForm extends CMSForm { */ private void updatePhaseDefinition(final PageState state) throws FormProcessException { - + final String label = (String) m_label.getValue(state); final String description = (String) m_description.getValue(state); final Integer delayDays = (Integer) m_delayDays.getValue(state); @@ -291,17 +291,19 @@ class EditPhaseForm extends CMSForm { final Integer durMinutes = (Integer) m_durMinutes.getValue(state); final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); - final ConfigurationManager confManager = cdiUtil.findBean(ConfigurationManager.class); + final ConfigurationManager confManager = cdiUtil.findBean( + ConfigurationManager.class); final PhaseDefinititionRepository phaseDefRepo = cdiUtil.findBean( PhaseDefinititionRepository.class); final KernelConfig kernelConfig = confManager.findConfiguration( KernelConfig.class); final Locale defaultLocale = kernelConfig.getDefaultLocale(); - + final PhaseDefinition phaseDefinition = m_phase.getPhase(state); phaseDefinition.getLabel().addValue(defaultLocale, label); phaseDefinition.getDescription().addValue(defaultLocale, description); - phaseDefinition.setDefaultDelay(delayDays * delayHours * delayMinutes * 60); + phaseDefinition.setDefaultDelay(delayDays * delayHours * delayMinutes + * 60); phaseDefinition.setDefaultDuration(durDays * durHours * durMinutes * 60); phaseDefRepo.save(phaseDefinition); } @@ -376,7 +378,7 @@ class EditPhaseForm extends CMSForm { if ((days + hours + minutes) == 0) { throw new FormProcessException(new GlobalizedMessage( "cms.ui.phase.duration_negative", - CmsConstants.CMS_BUNDLE)); + CmsConstants.CMS_BUNDLE)); } } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java index 69292517a..2ab902c32 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java @@ -28,8 +28,6 @@ import org.arsdigita.cms.CMSConfig; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.l10n.GlobalizationHelper; import org.librecms.CmsConstants; -import org.librecms.contentsection.ContentSection; -import org.librecms.contentsection.ContentSectionConfig; import org.librecms.lifecycle.Phase; import java.text.DateFormat; diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java index 6e2a8495e..4b06c44be 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java @@ -38,11 +38,11 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository; import java.util.Locale; /** - * @author Jens Pelzetter * @author Michael Pih * @author Jack Chung * @author Xixi D'Moon * @author Justin Ross + * @author Jens Pelzetter */ class LifecycleAddForm extends BaseLifecycleForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java index 529439176..151ad4491 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.ui.lifecycle; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; -import com.arsdigita.cms.dispatcher.Utilities; import org.libreccm.security.Party; @@ -28,15 +27,14 @@ import com.arsdigita.toolbox.ui.SecurityContainer; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.PermissionChecker; -import org.librecms.CmsConstants; import org.librecms.contentsection.privileges.AdminPrivileges; /** * Security container that wraps the canAdministerLifecycles access check around * its components. * - * @author Jens Pelzetter * @author Michael Pih + * @author Jens Pelzetter */ public class LifecycleAdminContainer extends SecurityContainer { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java index ddd4f2a81..45f1c3ad1 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java @@ -40,7 +40,6 @@ import java.util.Locale; * @author Jack Chung * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id$ */ class LifecycleEditForm extends BaseLifecycleForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java index 05f44522e..e8fc8763e 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java @@ -33,9 +33,9 @@ import org.librecms.lifecycle.LifecycleDefinition; * Loads all the current lifecycles from the database so that they may be * displayed in a list. * - * @author Jens Pelzetter * @author Michael Pih * @author Jack Chung + * @author Jens Pelzetter */ public final class LifecycleListModelBuilder extends LockableImpl implements ListModelBuilder { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java index 13a6a7a27..b236efe73 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java @@ -38,7 +38,6 @@ import com.arsdigita.cms.ui.BaseDeleteForm; import com.arsdigita.globalization.GlobalizedMessage; //ToDo insert later import com.arsdigita.cms.ui.ContentSectionPage; - import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.toolbox.ui.ActionGroup; import com.arsdigita.toolbox.ui.Cancellable; @@ -49,16 +48,15 @@ import org.librecms.CmsConstants; import org.librecms.contentsection.ContentSectionManager; import org.librecms.contentsection.ContentTypeManager; - /** * This class contains the split pane for the ContentType administration * interface. * - * @author Jens Pelzetter * @author Jack Chung * @author Michael Pih * @author Stanislav Freidin * @author Justin Ross <jross@redhat.com> + * @author Jens Pelzetter */ public final class ContentTypeAdminPane extends BaseAdminPane { @@ -83,13 +81,12 @@ public final class ContentTypeAdminPane extends BaseAdminPane { m_type = new SelectionRequestLocal(); ActionLink addTypeLink - = new ActionLink(new Label(gz("cms.ui.type.add"))); + = new ActionLink(new Label(gz("cms.ui.type.add"))); // AddTypeContainer addTypeContainer = new AddTypeContainer(); // getBody().add(addTypeContainer); // getBody().connect(addTypeLink, addTypeContainer); // addTypeLink.addActionListener(addTypeContainer); - setEdit(new ActionLink(new Label(gz("cms.ui.type.edit"))), new EditType(m_model)); diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeItemPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeItemPane.java index 890b0f996..2b176ad52 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeItemPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeItemPane.java @@ -26,13 +26,13 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.bebop.form.Submit; import com.arsdigita.cms.CMS; + import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentType; -import com.arsdigita.cms.dispatcher.Utilities; + import com.arsdigita.cms.ui.BaseItemPane; import com.arsdigita.cms.ui.ContentSectionRequestLocal; //ToDo import com.arsdigita.cms.ui.templates.SectionTemplatesListing; @@ -42,7 +42,7 @@ import com.arsdigita.toolbox.ui.ActionGroup; import com.arsdigita.toolbox.ui.Cancellable; import com.arsdigita.toolbox.ui.Section; import com.arsdigita.util.UncheckedWrapperException; -import java.util.logging.Level; + import org.apache.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.PermissionChecker; @@ -52,8 +52,8 @@ import org.librecms.contentsection.privileges.AdminPrivileges; /** * - * @authro Jens Pelzetter * @author Justin Ross <jross@redhat.com> + * @author Jens Pelzetter */ final class ContentTypeItemPane extends BaseItemPane { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypePropertyList.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypePropertyList.java index 7c2ebd20e..7b1c06550 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypePropertyList.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypePropertyList.java @@ -44,9 +44,9 @@ import java.util.List; * label, description, default lifecycle definition, default workflow * template * - * @author Jens Pelzetter * @author Michael Pih * @author Justin Ross + * @author Jens Pelzetter */ class ContentTypePropertyList extends PropertyList { 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 a832c40c9..dd96b2e85 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 @@ -70,9 +70,9 @@ import javax.persistence.NoResultException; /** * This class contains a form component to edit a content type * - * @author Jens Pelzetter * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) + * @author Jens Pelzetter */ public class EditType extends CMSForm implements FormInitListener, FormProcessListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/SelectType.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/SelectType.java index d6ddb8c48..b3862e189 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/SelectType.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/SelectType.java @@ -35,7 +35,6 @@ import com.arsdigita.bebop.form.Submit; import com.arsdigita.cms.CMS; import org.librecms.contentsection.ContentSection; -import org.librecms.contentsection.ContentType; import com.arsdigita.cms.ui.CMSForm; import com.arsdigita.globalization.GlobalizedMessage; @@ -43,18 +42,13 @@ import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; import org.libreccm.cdi.utils.CdiUtil; -import org.libreccm.l10n.GlobalizationHelper; import org.librecms.CmsConstants; -import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentSectionManager; import org.librecms.contentsection.ContentTypeManager; import org.librecms.contenttypes.ContentTypeInfo; import org.librecms.contenttypes.ContentTypesManager; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; -import java.util.ResourceBundle; import java.util.TooManyListenersException; import java.util.stream.Collectors; @@ -62,9 +56,9 @@ import java.util.stream.Collectors; * This class contains a form component to that allows adding already-existing * content type to a content section. * - * @author Jens Pelzetter * @author Jack Chung * @author Michael Pih + * @author Jens Pelzetter */ public class SelectType extends CMSForm implements PrintListener, FormSubmissionListener, diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityContainer.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityContainer.java index c7d185e3f..5d5a8e64e 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityContainer.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityContainer.java @@ -21,13 +21,11 @@ package com.arsdigita.cms.ui.type; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.PageState; import com.arsdigita.cms.CMS; -import com.arsdigita.cms.dispatcher.Utilities; import org.libreccm.security.Party; import com.arsdigita.toolbox.ui.SecurityContainer; -import org.apache.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.security.PermissionChecker; import org.librecms.contentsection.ContentSection; @@ -35,8 +33,8 @@ import org.librecms.contentsection.privileges.AdminPrivileges; /** * - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ public final class TypeSecurityContainer extends SecurityContainer { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityListener.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityListener.java index 941742d36..7a163f192 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityListener.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityListener.java @@ -31,9 +31,8 @@ import org.librecms.contentsection.privileges.AdminPrivileges; /** * - * @autor Jens Pelzetter * @author Justin Ross <jross@redhat.com> - + * @autor Jens Pelzetter */ final class TypeSecurityListener implements FormSubmissionListener { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseTaskForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseTaskForm.java index 6aabc1d5e..91c87ba80 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseTaskForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseTaskForm.java @@ -32,9 +32,7 @@ import com.arsdigita.cms.ui.BaseForm; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.UncheckedWrapperException; -import org.apache.logging.log4j.LogManager; import org.libreccm.workflow.Task; -import org.apache.logging.log4j.Logger; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.workflow.CircularTaskDependencyException; import org.libreccm.workflow.TaskManager; @@ -50,8 +48,8 @@ import java.util.TooManyListenersException; import java.util.stream.Collectors; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ class BaseTaskForm extends BaseForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java index ab71db370..775d5accd 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java @@ -24,14 +24,13 @@ import com.arsdigita.bebop.event.FormValidationListener; import com.arsdigita.cms.ui.BaseForm; import com.arsdigita.globalization.GlobalizedMessage; -import org.librecms.CmsConstants; import org.librecms.contentsection.privileges.AdminPrivileges; /** - * @author Jens Pelzetter * @author Uday Mathur * @author Michael Pih * @author Justin Ross + * @author Jens Pelzetter */ class BaseWorkflowForm extends BaseForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskAddForm.java index 0a1ea4058..a0604edcf 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskAddForm.java @@ -47,8 +47,8 @@ import java.util.Locale; import java.util.TooManyListenersException; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ class TaskAddForm extends BaseTaskForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskEditForm.java index e2d998526..905a33e9f 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskEditForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskEditForm.java @@ -45,8 +45,8 @@ import java.util.TooManyListenersException; import java.util.stream.Collectors; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ class TaskEditForm extends BaseTaskForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskFinishForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskFinishForm.java index 3aa639925..aa3c5983a 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskFinishForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskFinishForm.java @@ -49,8 +49,6 @@ import org.arsdigita.cms.CMSConfig; import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.configuration.ConfigurationManager; import org.libreccm.security.PermissionChecker; -import org.libreccm.security.Shiro; -import org.libreccm.security.User; import org.libreccm.workflow.AssignableTask; import org.libreccm.workflow.AssignableTaskManager; import org.libreccm.workflow.TaskManager; diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskItemPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskItemPane.java index ec5b8d833..ecc1baab2 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskItemPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskItemPane.java @@ -52,18 +52,15 @@ import org.libreccm.security.Shiro; import org.libreccm.workflow.Task; import org.libreccm.workflow.AssignableTask; import org.libreccm.workflow.AssignableTaskManager; -import org.libreccm.workflow.WorkflowManager; -import org.librecms.CmsConstants; import org.librecms.contentsection.privileges.AdminPrivileges; -import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ final class TaskItemPane extends BaseItemPane { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java index e88acc074..42c5a18d0 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java @@ -36,10 +36,10 @@ import org.librecms.contentsection.ContentSectionManager; import java.util.Locale; /** - * @author Jens Pelzetter * @author Uday Mathur * @author Michael Pih * @author Justin Ross + * @author Jens Pelzetter */ class WorkflowAddForm extends BaseWorkflowForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java index f8d3065a9..fb0663d18 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java @@ -30,13 +30,12 @@ import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.workflow.Workflow; import org.libreccm.workflow.WorkflowRepository; import org.libreccm.workflow.WorkflowTemplateRepository; -import org.librecms.CmsConstants; import org.librecms.contentsection.privileges.AdminPrivileges; /** - * @author Jens Pelzetter * @author Justin Ross + * @author Jens Pelzetter */ public final class WorkflowAdminPane extends BaseAdminPane { 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 20b099a25..910be169c 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 @@ -33,9 +33,9 @@ import org.libreccm.workflow.WorkflowRepository; import java.util.Locale; /** - * @author Jens Pelzetter * @author Uday Mathur * @author Justin Ross + * @author Jens Pelzetter */ class WorkflowEditForm extends BaseWorkflowForm { diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java index cdcd7b56b..629db9fb1 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java @@ -35,9 +35,9 @@ import java.util.Locale; * Builds a list of workflow templates registered to the current content * section. * - * @author Jens Pelzetter * @author Michael Pih * @author Justin Ross + * @author Jens Pelzetter */ class WorkflowListModelBuilder extends AbstractListModelBuilder {