CCM NG: Some cleanup

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4518 8810af33-2d31-482b-a856-94f89814c4df

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.</p>
  *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Stanislav Freidin (stas@arsdigita.com)
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ * 
  * @see com.arsdigita.kernel.ui.ACSObjectSelectionModel
  * @see com.arsdigita.bebop.SingleSelectionModel
  */

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 <a href="mailto:jens.pelzetter@googlemail.com>Jens Pelzetter</a>
  * @author <a href="mailto:pihman@arsdigita.com">Michael Pih</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com>Jens Pelzetter</a>
  */
 public class Duration {
 

ccm-cms/src/main/java/com/arsdigita/cms/ui/BaseItemPane.java

@@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger;
 import org.librecms.CmsConstants;
 
 /**
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public abstract class BaseItemPane extends ModalPanel {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ContentSectionContextBar extends WorkspaceContextBar {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung
  * @author Michael Pih
  * @author Xixi D'Moon
  * @author Justin Ross
-
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class ContentSectionPage extends CMSPage implements ActionListener {
 

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 
+ * Migrated from the {@code DataQueryOptionPrintListener} in the old system.
- * and refactored to operate on a list.
+ * Renamed and refactored to operate on a list.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ *
  * @param <T> Type of the objects in the list.
  */
 public abstract class ListOptionPrintListener<T> implements PrintListener {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:pihman@arsdigita.com">Michael Pih</a>
  * @author <a href="mailto:umathur@arsdigita.com">Uday Mathur</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public abstract class UserAddForm extends SimpleContainer
     implements FormProcessListener {
@@ -245,8 +243,7 @@ public abstract class UserAddForm extends SimpleContainer
     }
 
     /**
-     * Generates a {@link List} that encapsulates
+     * Generates a {@link List} that encapsulates search results.
-     * search results.
      *
      * @param state The page state
      *

ccm-cms/src/main/java/com/arsdigita/cms/ui/VisibilityComponent.java

@@ -27,8 +27,8 @@ import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.security.PermissionChecker;
 
 /**
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class VisibilityComponent extends ProxyComponent {
 
@@ -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);
     }
+
 }

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author unknown
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 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);

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:stas@arsdigita.com">Stanislav Freidin</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public abstract class BasicItemForm extends FormSection
     implements FormInitListener,

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/WizardSelector.java

@@ -45,8 +45,8 @@ 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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author unknown
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class WizardSelector extends AuthoringKitSelector
     implements Resettable {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- * @author <a href="mailto:quasi@quasiweb.de">Sören Bernstein</a>
  * @author <a href="mailto:lutter@arsdigita.com">David Lutterkort</a>
+ * @author <a href="mailto:quasi@quasiweb.de">Sören Bernstein</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class FolderBrowser extends Table {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jorris@arsdigita.com">Jon Orris</a>
- *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public abstract class FolderForm extends FormSection
     implements FormInitListener,

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:tri@arsdigita.com">Tri Tran</a>
  * @author <a href="mailto:lutter@arsdigita.com">David Lutterkort</a>
- *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- * @version $Id: FolderTreeModelBuilder.java 2183 2011-06-20 00:57:18Z pboy $
  */
 public class FolderTreeModelBuilder extends LockableImpl
         implements TreeModelBuilder {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung
  * @author Xixi D'Moon
  * @author Michael Pih
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class AddPhaseForm extends CMSForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class BaseLifecycleForm extends BaseForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:flattop@arsdigita.com">Jack Chung</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class DeletePhaseForm extends CMSForm
     implements FormProcessListener, FormInitListener {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung
  * @author Xixi D'Moon
  * @author Michael Pih
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class EditPhaseForm extends CMSForm {
 
@@ -291,7 +291,8 @@ 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(
@@ -301,7 +302,8 @@ class EditPhaseForm extends CMSForm {
         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);
     }

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;

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Michael Pih
  * @author Jack Chung
  * @author <a href="mailto:xdmoon@redhat.com">Xixi D'Moon</a>
  * @author <a href="jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class LifecycleAddForm extends BaseLifecycleForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:pihman@arsdigita.com">Michael Pih</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class LifecycleAdminContainer extends SecurityContainer {
 

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 {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:pihman@arsdigita.com">Michael Pih</a>
  * @author <a href="mailto:flattop@arsdigita.com">Jack Chung</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public final class LifecycleListModelBuilder extends LockableImpl
         implements ListModelBuilder {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung
  * @author Michael Pih
  * @author Stanislav Freidin
  * @author Justin Ross &lt;jross@redhat.com&gt;
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public final class ContentTypeAdminPane extends BaseAdminPane {
 
@@ -89,7 +87,6 @@ public final class ContentTypeAdminPane extends BaseAdminPane {
 //        getBody().add(addTypeContainer);
 //        getBody().connect(addTypeLink, addTypeContainer);
 //        addTypeLink.addActionListener(addTypeContainer);
-
         setEdit(new ActionLink(new Label(gz("cms.ui.type.edit"))),
                 new EditType(m_model));
 

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 <a href="jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross &lt;jross@redhat.com&gt;
+ * @author <a href="jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 final class ContentTypeItemPane extends BaseItemPane {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Michael Pih
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class ContentTypePropertyList extends PropertyList {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung (flattop@arsdigita.com)
  * @author Michael Pih (pihman@arsdigita.com)
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class EditType extends CMSForm
     implements FormInitListener, FormProcessListener {

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Jack Chung
  * @author Michael Pih
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class SelectType extends CMSForm implements PrintListener,
                                                    FormSubmissionListener,

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public final class TypeSecurityContainer extends SecurityContainer {
 

ccm-cms/src/main/java/com/arsdigita/cms/ui/type/TypeSecurityListener.java

@@ -31,9 +31,8 @@ import org.librecms.contentsection.privileges.AdminPrivileges;
 
 /**
  * 
- * @autor <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross &lt;jross@redhat.com&gt;
-
+ * @autor <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 final class TypeSecurityListener implements FormSubmissionListener {
 

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 <a href="jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="jross@redhat.com">Justin Ross</a>
+ * @author <a href="jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class BaseTaskForm extends BaseForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Uday Mathur
  * @author Michael Pih
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class BaseWorkflowForm extends BaseForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class TaskAddForm extends BaseTaskForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Justin Ross
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class TaskEditForm extends BaseTaskForm {
 

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;

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 final class TaskItemPane extends BaseItemPane {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Uday Mathur
  * @author Michael Pih
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class WorkflowAddForm extends BaseWorkflowForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public final class WorkflowAdminPane extends BaseAdminPane {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Uday Mathur
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class WorkflowEditForm extends BaseWorkflowForm {
 

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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  * @author Michael Pih
  * @author <a href="mailto:jross@redhat.com">Justin Ross</a>
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class WorkflowListModelBuilder extends AbstractListModelBuilder {