From b15a2e772bb2cd39f31345fe0f9fdde52798e869 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Thu, 2 Jul 2015 16:13:03 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 107413: Merged DEV to 5.0.N (5.0.3) 106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Cleaning of Javadoc, 107565: MNT-13545 Fix compilation after merge of Javadoc git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../WebClientPortletAuthenticatorFactory.java | 4 +- .../WebClientAuthenticatorFactory.java | 4 +- .../bean/admin/ConfigAdminConsoleBean.java | 2 +- .../web/bean/ajax/PresenceProxyBean.java | 2 - .../categories/EditNodeCategoriesDialog.java | 2 +- .../web/bean/coci/EditOfflineDialog.java | 2 +- .../web/bean/groups/GroupsDialog.java | 2 +- .../web/bean/ml/MultilingualUtils.java | 24 +++--- .../web/bean/ml/SingleEditionBean.java | 2 +- .../web/bean/repository/Repository.java | 2 +- .../admin/RepoAdminConsoleBean.java | 2 +- .../tenant/TenantAdminConsoleBean.java | 2 +- .../alfresco/web/bean/rules/RulesDialog.java | 2 +- .../web/bean/users/CreateUserWizard.java | 6 +- .../web/bean/users/UsersBeanProperties.java | 2 +- .../alfresco/web/bean/users/UsersDialog.java | 2 +- .../web/bean/wizard/NewUserWizard.java | 80 +++++++++---------- .../web/config/ActionsConfigElement.java | 2 +- .../web/config/ClientConfigElement.java | 12 +-- .../web/config/DashboardsConfigElement.java | 2 +- .../web/config/DashboardsElementReader.java | 12 +-- .../web/ui/common/ReportedException.java | 1 - .../org/alfresco/web/ui/common/Utils.java | 4 +- .../web/ui/common/component/UISelectList.java | 2 +- .../ui/common/component/data/UIRichList.java | 2 +- .../common/renderer/ActionLinkRenderer.java | 24 +++--- .../web/ui/repo/component/UIActions.java | 7 +- .../web/ui/repo/component/UINavigator.java | 2 +- 28 files changed, 108 insertions(+), 104 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java index b5bb5e0509..bc7382d774 100644 --- a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java @@ -60,8 +60,8 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato /** * Construct * - * @param req - * @param res + * @param req RenderRequest + * @param res RenderResponse */ public WebClientPortletAuthenticator(RenderRequest req, RenderResponse res) { diff --git a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java index e9bac0b211..6c6965212b 100644 --- a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java @@ -89,8 +89,8 @@ public class WebClientAuthenticatorFactory implements ServletAuthenticatorFactor /** * Construct * - * @param req - * @param res + * @param req WebScriptServletRequest + * @param res WebScriptServletResponse */ public WebClientAuthenticator(WebScriptServletRequest req, WebScriptServletResponse res) { diff --git a/source/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java b/source/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java index c496afdb5c..94607d2660 100644 --- a/source/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java +++ b/source/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java @@ -64,7 +64,7 @@ public class ConfigAdminConsoleBean /** * Sets the command result * - * @param result + * @param result String */ public void setResult(String result) { diff --git a/source/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java b/source/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java index 75c989696e..2ac522a954 100644 --- a/source/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java +++ b/source/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java @@ -69,8 +69,6 @@ public class PresenceProxyBean implements Serializable /** * Perform request - * - * @throws IOException */ public String getUrlResponse(String requestUrl) { diff --git a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java index 5a7301a417..d4d850c4a3 100644 --- a/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java +++ b/source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java @@ -148,7 +148,7 @@ public class EditNodeCategoriesDialog extends BaseDialogBean /** * Sets the categories Map * - * @param categories + * @param categories List */ public void setCategories(List categories) { diff --git a/source/java/org/alfresco/web/bean/coci/EditOfflineDialog.java b/source/java/org/alfresco/web/bean/coci/EditOfflineDialog.java index 3a311275b4..d6e4357612 100644 --- a/source/java/org/alfresco/web/bean/coci/EditOfflineDialog.java +++ b/source/java/org/alfresco/web/bean/coci/EditOfflineDialog.java @@ -211,7 +211,7 @@ public class EditOfflineDialog extends CheckinCheckoutDialog } /** - * @param continueCountdown + * @param continueCountdown boolean */ public void setContinueCountdown(boolean continueCountdown) { diff --git a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java index 0ae0bae8d3..977f1f6333 100644 --- a/source/java/org/alfresco/web/bean/groups/GroupsDialog.java +++ b/source/java/org/alfresco/web/bean/groups/GroupsDialog.java @@ -592,7 +592,7 @@ public class GroupsDialog extends BaseDialogBean /** * Simple setter * - * @param groupsSearchCriteria + * @param groupsSearchCriteria String */ public void setGroupsSearchCriteria(String groupsSearchCriteria) { diff --git a/source/java/org/alfresco/web/bean/ml/MultilingualUtils.java b/source/java/org/alfresco/web/bean/ml/MultilingualUtils.java index d8a4972aae..b03520d7fc 100644 --- a/source/java/org/alfresco/web/bean/ml/MultilingualUtils.java +++ b/source/java/org/alfresco/web/bean/ml/MultilingualUtils.java @@ -46,9 +46,9 @@ public class MultilingualUtils implements Serializable * Returns true if the current user has enough right to add a content to the space * where the pivot translation is located in. * - * @param multlingualDocument - * @param fc - * @return + * @param multlingualDocument Node + * @param fc FacesContext + * @return boolean */ public static boolean canAddChildrenToPivotSpace(Node multlingualDocument, FacesContext fc) { @@ -66,9 +66,9 @@ public class MultilingualUtils implements Serializable /** * Returns true if the current user can delete each translation of the mlContainer of the given node * - * @param multlingualDocument - * @param fc - * @return + * @param multlingualDocument Node + * @param fc FacesContext + * @return boolean */ public static boolean canDeleteEachTranslation(Node multlingualDocument, FacesContext fc) { @@ -97,9 +97,9 @@ public class MultilingualUtils implements Serializable /** * Returns true if the current user can move each translation of the mlContainer of the given node * - * @param multlingualDocument - * @param fc - * @return + * @param multlingualDocument Node + * @param fc FacesContext + * @return boolean */ public static boolean canMoveEachTranslation(Node multlingualDocument, FacesContext fc) { @@ -126,9 +126,9 @@ public class MultilingualUtils implements Serializable * Returns true if the current user can delete each translation and create * * a new content in the space * - * @param multlingualDocument - * @param fc - * @return + * @param multlingualDocument Node + * @param fc FacesContext + * @return boolean */ public static boolean canStartNewEditon(Node multlingualDocument, FacesContext fc) { diff --git a/source/java/org/alfresco/web/bean/ml/SingleEditionBean.java b/source/java/org/alfresco/web/bean/ml/SingleEditionBean.java index 5a1678c835..1623038aef 100644 --- a/source/java/org/alfresco/web/bean/ml/SingleEditionBean.java +++ b/source/java/org/alfresco/web/bean/ml/SingleEditionBean.java @@ -40,7 +40,7 @@ public class SingleEditionBean implements Serializable private List translations = null; /** - * @return + * @return String */ public String getEditionLabel() { diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java index ab61e19444..60c02c9a7a 100644 --- a/source/java/org/alfresco/web/bean/repository/Repository.java +++ b/source/java/org/alfresco/web/bean/repository/Repository.java @@ -234,7 +234,7 @@ public final class Repository /** * Helper to get the display name path for a category node. * - * @param nodeService + * @param nodeService NodeService * @param ref the category node ref * @return display name string for the specified category node. */ diff --git a/source/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java b/source/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java index e2c53aef52..f278d96ce4 100644 --- a/source/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java +++ b/source/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java @@ -83,7 +83,7 @@ public class RepoAdminConsoleBean implements Serializable /** * Sets the command result * - * @param result + * @param result String */ public void setResult(String result) { diff --git a/source/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java b/source/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java index 7f65f0fcb0..ad46ad2d38 100644 --- a/source/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java +++ b/source/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java @@ -83,7 +83,7 @@ public class TenantAdminConsoleBean implements Serializable /** * Sets the command result * - * @param result + * @param result String */ public void setResult(String result) { diff --git a/source/java/org/alfresco/web/bean/rules/RulesDialog.java b/source/java/org/alfresco/web/bean/rules/RulesDialog.java index dc036678e1..c700cbd6ad 100644 --- a/source/java/org/alfresco/web/bean/rules/RulesDialog.java +++ b/source/java/org/alfresco/web/bean/rules/RulesDialog.java @@ -168,7 +168,7 @@ public class RulesDialog extends BaseDialogBean implements IContextListener, Fil /** * Reapply the currently defines rules to the - * @param event + * @param event ActionEvent */ public void reapplyRules(ActionEvent event) { diff --git a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java index 9496477c52..254c3b7548 100644 --- a/source/java/org/alfresco/web/bean/users/CreateUserWizard.java +++ b/source/java/org/alfresco/web/bean/users/CreateUserWizard.java @@ -626,9 +626,9 @@ public class CreateUserWizard extends BaseWizardBean /** * Validate Email field data is acceptable * - * @param context - * @param component - * @param value + * @param context FacesContext + * @param component UIComponent + * @param value Object * @throws ValidatorException */ public void validateEmail(FacesContext context, UIComponent component, Object value) throws ValidatorException diff --git a/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java b/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java index a05cb57ac4..30e7282d48 100644 --- a/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java +++ b/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java @@ -210,7 +210,7 @@ public class UsersBeanProperties implements Serializable } /** - * @param userRegistrySynchronizer + * @param userRegistrySynchronizer UserRegistrySynchronizer */ public void setUserRegistrySynchronizer(UserRegistrySynchronizer userRegistrySynchronizer) { diff --git a/source/java/org/alfresco/web/bean/users/UsersDialog.java b/source/java/org/alfresco/web/bean/users/UsersDialog.java index 956c039a2f..e149f422f3 100644 --- a/source/java/org/alfresco/web/bean/users/UsersDialog.java +++ b/source/java/org/alfresco/web/bean/users/UsersDialog.java @@ -169,7 +169,7 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha * Called in preparation for actions that need to setup a Person context on * the Users bean before an action page is called. * - * @param personId + * @param personId String */ public void setupUserAction(String personId) { diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java index 5c91c8e986..dea2942e87 100644 --- a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. - * - * This file is part of Alfresco - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License + * Copyright (C) 2005-2011 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . */ package org.alfresco.web.bean.wizard; @@ -78,8 +78,8 @@ public class NewUserWizard extends AbstractWizardBean private static final String STEP2_TITLE_ID = "new_user_step2_title"; private static final String STEP2_DESCRIPTION_ID = "new_user_step2_desc"; private static final String FINISH_INSTRUCTION_ID = "new_user_finish_instruction"; - private static final String ERROR = "error_person"; - private static final String MSG_ERROR_MAIL_NOT_VALID = "email_format_is_not_valid"; + private static final String ERROR = "error_person"; + private static final String MSG_ERROR_MAIL_NOT_VALID = "email_format_is_not_valid"; /** form variables */ private String firstName = null; @@ -252,7 +252,7 @@ public class NewUserWizard extends AbstractWizardBean this.homeSpaceLocation = null; // default to Company root space this.homeSpaceName = ""; // default to none set below root NodeRef homeFolderRef = (NodeRef) props.get("homeFolder"); - if (homeFolderRef != null && this.getNodeService().exists(homeFolderRef) == true) + if (homeFolderRef != null && this.getNodeService().exists(homeFolderRef) == true) { ChildAssociationRef childAssocRef = this.getNodeService().getPrimaryParent(homeFolderRef); NodeRef parentRef = childAssocRef.getParentRef(); @@ -807,11 +807,11 @@ public class NewUserWizard extends AbstractWizardBean */ public void setUserName(String userName) { - if (userName != null) - { - userName = userName.trim(); - } - + if (userName != null) + { + userName = userName.trim(); + } + this.userName = userName; } @@ -916,23 +916,23 @@ public class NewUserWizard extends AbstractWizardBean } } - /** - * Validate Email field data is acceptable - * - * @param context - * @param component - * @param value - * @throws ValidatorException - */ - public void validateEmail(FacesContext context, UIComponent component, Object value) throws ValidatorException - { - EmailValidator emailValidator = EmailValidator.getInstance(); - if (!emailValidator.isValid((String) value)) - { - String err =Application.getMessage(context, MSG_ERROR_MAIL_NOT_VALID); - throw new ValidatorException(new FacesMessage(err)); - } - } + /** + * Validate Email field data is acceptable + * + * @param context FacesContext + * @param component UIComponent + * @param value Object + * @throws ValidatorException + */ + public void validateEmail(FacesContext context, UIComponent component, Object value) throws ValidatorException + { + EmailValidator emailValidator = EmailValidator.getInstance(); + if (!emailValidator.isValid((String) value)) + { + String err =Application.getMessage(context, MSG_ERROR_MAIL_NOT_VALID); + throw new ValidatorException(new FacesMessage(err)); + } + } // ------------------------------------------------------------------------------ // Helper methods diff --git a/source/java/org/alfresco/web/config/ActionsConfigElement.java b/source/java/org/alfresco/web/config/ActionsConfigElement.java index 5949f6f83f..317b6bfb14 100644 --- a/source/java/org/alfresco/web/config/ActionsConfigElement.java +++ b/source/java/org/alfresco/web/config/ActionsConfigElement.java @@ -55,7 +55,7 @@ public class ActionsConfigElement extends ConfigElementAdapter } /** - * @param name + * @param name String */ public ActionsConfigElement(String name) { diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java index a25919aa01..101300adb6 100644 --- a/source/java/org/alfresco/web/config/ClientConfigElement.java +++ b/source/java/org/alfresco/web/config/ClientConfigElement.java @@ -520,7 +520,7 @@ public class ClientConfigElement extends ConfigElementAdapter * Set if the the result set from a search will be of limited size. * If negative it is unlimited, by convention, this is set to -1. * - * @param searchMaxResults + * @param searchMaxResults int */ /*package*/ void setSearchMaxResults(int searchMaxResults) { @@ -543,7 +543,7 @@ public class ClientConfigElement extends ConfigElementAdapter * will be of limited size. If negative it is unlimited, by default, * this is set to 500. * - * @param selectorsSearchMaxResults + * @param selectorsSearchMaxResults int */ /*package*/ void setSelectorsSearchMaxResults(int selectorsSearchMaxResults) { @@ -566,7 +566,7 @@ public class ClientConfigElement extends ConfigElementAdapter * will be of limited size. If negative it is unlimited, by default, * this is set to 500. * - * @param inviteUsersMaxResults + * @param inviteUsersMaxResults int */ /*package*/ void setInviteUsersMaxResults(int inviteUsersMaxResults) { @@ -588,7 +588,7 @@ public class ClientConfigElement extends ConfigElementAdapter * Set if the the number of completed tasks displayed shall be limited. * If negative it is unlimited, by default, this is set to 100. * - * @param tasksCompletedMaxResults + * @param tasksCompletedMaxResults int */ /*package*/ void setTasksCompletedMaxResults(int tasksCompletedMaxResults) { @@ -638,7 +638,7 @@ public class ClientConfigElement extends ConfigElementAdapter /** * Sets whether AJAX support is enabled in the client * - * @param ajaxEnabled + * @param ajaxEnabled boolean */ /*package*/ void setNodeSummaryEnabled(boolean ajaxEnabled) { @@ -917,7 +917,7 @@ public class ClientConfigElement extends ConfigElementAdapter } /** - * @param isBulkFetchEnabled + * @param isBulkFetchEnabled boolean */ /*package*/ void setBulkFetchEnabled(boolean isBulkFetchEnabled) { diff --git a/source/java/org/alfresco/web/config/DashboardsConfigElement.java b/source/java/org/alfresco/web/config/DashboardsConfigElement.java index d4021624d1..c89fd52a07 100644 --- a/source/java/org/alfresco/web/config/DashboardsConfigElement.java +++ b/source/java/org/alfresco/web/config/DashboardsConfigElement.java @@ -53,7 +53,7 @@ public class DashboardsConfigElement extends ConfigElementAdapter } /** - * @param name + * @param name String */ public DashboardsConfigElement(String name) { diff --git a/source/java/org/alfresco/web/config/DashboardsElementReader.java b/source/java/org/alfresco/web/config/DashboardsElementReader.java index 50e626c292..f3624cd80b 100644 --- a/source/java/org/alfresco/web/config/DashboardsElementReader.java +++ b/source/java/org/alfresco/web/config/DashboardsElementReader.java @@ -115,7 +115,7 @@ public class DashboardsElementReader implements ConfigElementReader /** * Parse a single Layout definition from config. * - * @param config + * @param config Element * * @return LayoutDefinition for the specified config element. */ @@ -154,8 +154,8 @@ public class DashboardsElementReader implements ConfigElementReader /** * Return a mandatory layout attribute layout. Throw an exception if the value is not found. * - * @param config - * @param attr + * @param config Element + * @param attr String * * @return String value */ @@ -172,7 +172,7 @@ public class DashboardsElementReader implements ConfigElementReader /** * Parse a single Dashlet definition from config. * - * @param config + * @param config Element * * @return DashletDefinition for the specified config element. */ @@ -212,8 +212,8 @@ public class DashboardsElementReader implements ConfigElementReader /** * Return a mandatory dashlet attribute layout. Throw an exception if the value is not found. * - * @param config - * @param attr + * @param config Element + * @param attr String * * @return String value */ diff --git a/source/java/org/alfresco/web/ui/common/ReportedException.java b/source/java/org/alfresco/web/ui/common/ReportedException.java index b2b16dce18..06685d8733 100644 --- a/source/java/org/alfresco/web/ui/common/ReportedException.java +++ b/source/java/org/alfresco/web/ui/common/ReportedException.java @@ -44,7 +44,6 @@ public class ReportedException extends RuntimeException * the transaction to rollback. * * @param error The error to be thrown - * @throws Throwable */ public static void throwIfNecessary(Throwable error) { diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java index 64a98f51fc..47d927bc98 100644 --- a/source/java/org/alfresco/web/ui/common/Utils.java +++ b/source/java/org/alfresco/web/ui/common/Utils.java @@ -981,7 +981,7 @@ public final class Utils extends StringUtils /** * Parse XML format date YYYY-MM-DDTHH:MM:SS - * @param isoDate + * @param isoDate String * @return Date or null if failed to parse */ public static Date parseXMLDateFormat(String isoDate) @@ -1184,7 +1184,7 @@ public final class Utils extends StringUtils *

* "C-3PO" becomes null. * - * @param nameFilter + * @param nameFilter String * @return A Pair if the String is valid, else null. */ private static Pair tokeniseName(String nameFilter) diff --git a/source/java/org/alfresco/web/ui/common/component/UISelectList.java b/source/java/org/alfresco/web/ui/common/component/UISelectList.java index cc6a17f80e..798944a6a6 100644 --- a/source/java/org/alfresco/web/ui/common/component/UISelectList.java +++ b/source/java/org/alfresco/web/ui/common/component/UISelectList.java @@ -464,7 +464,7 @@ public class UISelectList extends UIInput implements NamingContainer * Set the transient current row index. Setting this value causes all child components to * have their ID values reset - so that cached clientID values are regenerated when next requested. * - * @param rowIndex + * @param rowIndex int */ public void setRowIndex(int rowIndex) { diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java index 98a1c7e96a..3ecdcb295f 100644 --- a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java +++ b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java @@ -313,7 +313,7 @@ public class UIRichList extends UIComponentBase implements IDataContainer,Serial /** * Sets the current page size used for the list. * - * @param val + * @param val int */ public void setPageSize(int val) { diff --git a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java index 6aa6c76f98..0ee42891f6 100644 --- a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java +++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java @@ -113,8 +113,9 @@ public class ActionLinkRenderer extends BaseRenderer /** * Render ActionLink as plain link and image * - * @param context - * @param link + * @param context FacesContext + * @param out Writer + * @param link UIActionLink */ private void renderActionLink(FacesContext context, Writer out, UIActionLink link) throws IOException @@ -176,8 +177,9 @@ public class ActionLinkRenderer extends BaseRenderer /** * Render ActionLink as plain link and image * - * @param context - * @param link + * @param context FacesContext + * @param out Writer + * @param link UIActionLink */ private void renderActionLinkAnchor(final FacesContext context, final Writer out, @@ -272,9 +274,9 @@ public class ActionLinkRenderer extends BaseRenderer } /** - * @param link - * @param out - * @param href + * @param link UIActionLink + * @param out Writer + * @param href String */ private void renderHrefParams(UIActionLink link, Writer out, String href) throws IOException @@ -312,9 +314,11 @@ public class ActionLinkRenderer extends BaseRenderer /** * Render ActionLink as menu image and item link - * - * @param context - * @param link + * + * @param context FacesContext + * @param out Writer + * @param link UIActionLink + * @param padding int */ private void renderMenuAction(FacesContext context, Writer out, UIActionLink link, int padding) throws IOException diff --git a/source/java/org/alfresco/web/ui/repo/component/UIActions.java b/source/java/org/alfresco/web/ui/repo/component/UIActions.java index d6a2420fde..0a89bb6b32 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIActions.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIActions.java @@ -281,8 +281,11 @@ public class UIActions extends SelfRenderingComponent /** * Build an action group as reusable UIActionLink components. * - * @param context - * @param actionGroup + * @param context FacesContext + * @param config ActionsConfigElement + * @param actionGroup ActionGroup + * @param contextId String + * @throws IOException */ @SuppressWarnings("unchecked") private void buildActionGroup( diff --git a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java index e61996bdb2..5d690aa1f3 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UINavigator.java +++ b/source/java/org/alfresco/web/ui/repo/component/UINavigator.java @@ -405,7 +405,7 @@ public class UINavigator extends SelfRenderingComponent /** * Sets the active area for the navigator panel * - * @param activeArea + * @param activeArea String */ public void setActiveArea(String activeArea) {