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 7fa9bdee38..b5bb5e0509 100644 --- a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java @@ -60,7 +60,6 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato /** * Construct * - * @param authenticationService * @param req * @param 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 0723988006..e9bac0b211 100644 --- a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java +++ b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java @@ -89,7 +89,6 @@ public class WebClientAuthenticatorFactory implements ServletAuthenticatorFactor /** * Construct * - * @param authenticationService * @param req * @param res */ diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java index 6bdda2eecf..95897d47ff 100644 --- a/source/java/org/alfresco/web/app/Application.java +++ b/source/java/org/alfresco/web/app/Application.java @@ -688,7 +688,7 @@ public class Application /** * Return the language Locale for the current user context * - * @param context FacesContext for the current user + * @param fc FacesContext for the current user * * @return Current language Locale set or the VM default if none set - never null */ diff --git a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java index 9ba37edfce..f111e7d623 100644 --- a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java +++ b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java @@ -1,19 +1,19 @@ /* - * Copyright (C) 2005-2010 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-2010 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.app; @@ -272,7 +272,6 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria /** * Factory method to get a named wrapped resource bundle for a particular locale. * - * @param servletContext ServletContext * @param name Bundle name * @param locale Locale to retrieve bundle for * diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java index f71f83941c..ff509e12f5 100644 --- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java +++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java @@ -382,7 +382,7 @@ public abstract class BaseServlet extends HttpServlet /** * Resolves the given path elements to a NodeRef in the current repository * - * @param WebApplicationContext Context + * @param wc WebApplicationContext Context * @param args The elements of the path to lookup * @param decode True to decode the arg from UTF-8 format, false for no decoding */ diff --git a/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java b/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java index a1cd27ab79..933eafc293 100644 --- a/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java +++ b/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java @@ -105,7 +105,7 @@ public class GlobalLocalizationFilter implements Filter /** * Apply Client and Repository language locale based on the 'Accept-Language' request header * - * @param request HttpServletRequest + * @param req HttpServletRequest */ public void setLanguageFromRequestHeader(HttpServletRequest req) { diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java index d1208ca193..eea9b3882e 100644 --- a/source/java/org/alfresco/web/bean/BrowseBean.java +++ b/source/java/org/alfresco/web/bean/BrowseBean.java @@ -2304,7 +2304,7 @@ public class BrowseBean implements IContextListener, Serializable /** * Constructor * - * @param NodeRef The NodeRef for this browse navigation element + * @param nodeRef The NodeRef for this browse navigation element * @param label Element label */ public BrowseBreadcrumbHandler(NodeRef nodeRef, String label) diff --git a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java index 46878b4758..54876df254 100644 --- a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java +++ b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java @@ -577,7 +577,7 @@ public class CategoriesDialog extends BaseDialogBean implements IContextListener /** * Constructor * - * @param NodeRef The NodeRef for this browse navigation element + * @param nodeRef The NodeRef for this browse navigation element * @param label Element label */ public CategoryBreadcrumbHandler(NodeRef nodeRef, String label) diff --git a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java index acfe57cf13..e48aa5fe4b 100644 --- a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java @@ -966,7 +966,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio } /** - * @param EditionService The Edition Service to set. + * @param editionService The Edition Service to set. */ public void setEditionService(EditionService editionService) { diff --git a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java index 8dde183ab8..1c7220cc6d 100644 --- a/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java +++ b/source/java/org/alfresco/web/bean/content/VersionedDocumentDetailsDialog.java @@ -577,7 +577,7 @@ public class VersionedDocumentDetailsDialog implements Serializable } /** - * @param Multilingual Content Service the Multilingual Content Service to set + * @param multilingualContentService Content Service the Multilingual Content Service to set */ public void setMultilingualContentService(MultilingualContentService multilingualContentService) { diff --git a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java index 3904d987cc..46c4ea6ef5 100644 --- a/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java +++ b/source/java/org/alfresco/web/bean/ml/MultilingualManageDialog.java @@ -136,7 +136,7 @@ public class MultilingualManageDialog extends BaseDialogBean } /** - * @param EditionService The Edition Service to set. + * @param editionService The Edition Service to set. */ public void setEditionService(EditionService editionService) { diff --git a/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java b/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java index 6a4a94032b..49d8f82d30 100644 --- a/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java +++ b/source/java/org/alfresco/web/bean/ml/NewEditionWizard.java @@ -380,7 +380,7 @@ public class NewEditionWizard extends BaseWizardBean } /** - * @param language the language to set + * @param locale the language to set */ public void setLanguage(Locale locale) { @@ -468,7 +468,7 @@ public class NewEditionWizard extends BaseWizardBean } /** - * @param selectedTranslationLanguage the selectedTranslationLanguage to set + * @param language the selectedTranslationLanguage to set */ public void setSelectedTranslationLanguage(String language) { diff --git a/source/java/org/alfresco/web/bean/repository/PreferencesService.java b/source/java/org/alfresco/web/bean/repository/PreferencesService.java index 3da909b544..d5eacc0b1b 100644 --- a/source/java/org/alfresco/web/bean/repository/PreferencesService.java +++ b/source/java/org/alfresco/web/bean/repository/PreferencesService.java @@ -56,7 +56,7 @@ public final class PreferencesService } /** - * @param user User instance + * @param session Http session * @return The Preferences for the current User instance. */ public static Preferences getPreferences(HttpSession session) diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java index 2b5fffbc44..ab61e19444 100644 --- a/source/java/org/alfresco/web/bean/repository/Repository.java +++ b/source/java/org/alfresco/web/bean/repository/Repository.java @@ -208,24 +208,24 @@ public final class Repository { String name = null; - // Check that node reference still exists - if (nodeService.exists(ref) == true) - { - // try to find a display "name" property for this node - Object nameProp = nodeService.getProperty(ref, ContentModel.PROP_NAME); - if (nameProp != null) - { - name = nameProp.toString(); - } - else - { - // revert to using QName if not found - QName qname = nodeService.getPrimaryParent(ref).getQName(); - if (qname != null) - { - name = qname.getLocalName(); - } - } + // Check that node reference still exists + if (nodeService.exists(ref) == true) + { + // try to find a display "name" property for this node + Object nameProp = nodeService.getProperty(ref, ContentModel.PROP_NAME); + if (nameProp != null) + { + name = nameProp.toString(); + } + else + { + // revert to using QName if not found + QName qname = nodeService.getPrimaryParent(ref).getQName(); + if (qname != null) + { + name = qname.getLocalName(); + } + } } return name; @@ -729,7 +729,7 @@ public final class Repository * * @param context Faces Context * @param nodeService The node service - * @param searchService used to perform the search + * @param personService PersonService * @return List of Person node objects */ public static List getUsers(FacesContext context, NodeService nodeService, PersonService personService) diff --git a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java index 9227ef2f57..7588299a86 100644 --- a/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java +++ b/source/java/org/alfresco/web/bean/rules/CreateRuleWizard.java @@ -758,7 +758,7 @@ public class CreateRuleWizard extends BaseActionWizard /** * Sets the rulesDialog instance to be used by the wizard in edit mode * - * @param rulesDialog The rulesDialog + * @param RulesDialog The rulesDialog */ public void setRulesDialog(RulesDialog RulesDialog) { diff --git a/source/java/org/alfresco/web/bean/search/SearchContext.java b/source/java/org/alfresco/web/bean/search/SearchContext.java index ce4227b13d..3cb0b2a31f 100644 --- a/source/java/org/alfresco/web/bean/search/SearchContext.java +++ b/source/java/org/alfresco/web/bean/search/SearchContext.java @@ -507,8 +507,8 @@ public class SearchContext implements Serializable * * @param qname QName.toString() of the attribute * @param value Non-null value of the attribute - * @param attrBuf Attribute search buffer to append lucene terms to - * @param textBuf Text search buffer to append lucene terms to + * @param appendText Attribute search buffer to append lucene terms to + * @param mnBuf Text search buffer to append lucene terms to */ private static void processSearchTextAttribute(String qname, String value, boolean appendText, StringBuilder mnBuf) { @@ -555,7 +555,7 @@ public class SearchContext implements Serializable * Generate a search XPATH pointing to the specified node, optionally return an XPATH * that includes the child nodes. * - * @param id Of the node to generate path too + * @param ref Of the node to generate path too * @param children Whether to include children of the node * * @return the path @@ -756,7 +756,6 @@ public class SearchContext implements Serializable * Add an additional attribute to search against for simple searches * * @param qname QName of the attribute to search against - * @param value Value of the attribute to use */ public void addSimpleAttributeQuery(QName qname) { diff --git a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java index ecdf647cd1..eaad898294 100644 --- a/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java +++ b/source/java/org/alfresco/web/bean/users/UserPreferencesBean.java @@ -133,7 +133,7 @@ public class UserPreferencesBean implements Serializable } /** - * @param languageStr A valid locale string or {@link #MSG_CONTENTALLLANGUAGES} + * @param contentFilterLanguage A valid locale string or {@link #MSG_CONTENTALLLANGUAGES} */ public void setContentFilterLanguage(String contentFilterLanguage) { @@ -233,7 +233,6 @@ public class UserPreferencesBean implements Serializable /** * Helper to return the available language items * - * @param includeAllLanguages True to include a marker item for "All Languages" * @return Array of SelectItem objects */ private static SelectItem[] getLanguageItems() diff --git a/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java b/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java index f9ad668c61..a05cb57ac4 100644 --- a/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java +++ b/source/java/org/alfresco/web/bean/users/UsersBeanProperties.java @@ -178,7 +178,7 @@ public class UsersBeanProperties implements Serializable } /** - * @param searchServiceq the search service + * @param searchService the search service */ public void setSearchService(SearchService searchService) { @@ -306,7 +306,7 @@ public class UsersBeanProperties implements Serializable } /** - * @param person The person context to set. + * @param p The person context to set. */ public void setPerson(final Node p) { diff --git a/source/java/org/alfresco/web/config/ActionsConfigElement.java b/source/java/org/alfresco/web/config/ActionsConfigElement.java index 38a17a2046..5949f6f83f 100644 --- a/source/java/org/alfresco/web/config/ActionsConfigElement.java +++ b/source/java/org/alfresco/web/config/ActionsConfigElement.java @@ -71,7 +71,7 @@ public class ActionsConfigElement extends ConfigElementAdapter } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java b/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java index 63e3654893..de2e50954c 100644 --- a/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java +++ b/source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java @@ -69,7 +69,7 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter implements } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/ClientConfigElement.java b/source/java/org/alfresco/web/config/ClientConfigElement.java index f163680a0a..a25919aa01 100644 --- a/source/java/org/alfresco/web/config/ClientConfigElement.java +++ b/source/java/org/alfresco/web/config/ClientConfigElement.java @@ -77,7 +77,7 @@ public class ClientConfigElement extends ConfigElementAdapter private boolean allowUserConfig = true; private int pickerSearchMinimum = 2; private boolean checkContextAgainstPath = false; - private boolean allowUserScriptExecute = false; + private boolean allowUserScriptExecute = false; private boolean isBulkFetchEnabled = true; private String emailRegExp = "^([-A-Za-z0-9\\xc0-\\xff!#$%&'*+\\/=?^_`{}~|]+\\.)*[-A-Za-z0-9\\xc0-\\xff!#$%&'*+\\/=?^_`{}|~_]+@([\\.A-Za-z0-9_-])*[A-Za-z0-9_-]$"; @@ -100,7 +100,7 @@ public class ClientConfigElement extends ConfigElementAdapter } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { @@ -314,17 +314,17 @@ public class ClientConfigElement extends ConfigElementAdapter { combinedElement.setPickerSearchMinimum(newElement.getPickerSearchMinimum()); } - - if (newElement.getCheckContextAgainstPath() != combinedElement.getCheckContextAgainstPath()) - { - combinedElement.setCheckContextAgainstPath(newElement.getCheckContextAgainstPath()); + + if (newElement.getCheckContextAgainstPath() != combinedElement.getCheckContextAgainstPath()) + { + combinedElement.setCheckContextAgainstPath(newElement.getCheckContextAgainstPath()); + } + + if (newElement.getAllowUserScriptExecute() != combinedElement.getAllowUserScriptExecute()) + { + combinedElement.setAllowUserScriptExecute(newElement.getAllowUserScriptExecute()); } - if (newElement.getAllowUserScriptExecute() != combinedElement.getAllowUserScriptExecute()) - { - combinedElement.setAllowUserScriptExecute(newElement.getAllowUserScriptExecute()); - } - return combinedElement; } @@ -638,7 +638,7 @@ public class ClientConfigElement extends ConfigElementAdapter /** * Sets whether AJAX support is enabled in the client * - * @param nodeSummaryEnabled + * @param ajaxEnabled */ /*package*/ void setNodeSummaryEnabled(boolean ajaxEnabled) { @@ -875,21 +875,21 @@ public class ClientConfigElement extends ConfigElementAdapter { this.pickerSearchMinimum = searchMinimum; } - - /** - * @return true if the context path should be checked against the path in the current URL - */ - public boolean getCheckContextAgainstPath() - { - return this.checkContextAgainstPath; - } - - /** - * @param checkContextAgainstPath true to check the context path against the path in the current URL - */ - /*package*/ void setCheckContextAgainstPath(boolean checkContextAgainstPath) - { - this.checkContextAgainstPath = checkContextAgainstPath; + + /** + * @return true if the context path should be checked against the path in the current URL + */ + public boolean getCheckContextAgainstPath() + { + return this.checkContextAgainstPath; + } + + /** + * @param checkContextAgainstPath true to check the context path against the path in the current URL + */ + /*package*/ void setCheckContextAgainstPath(boolean checkContextAgainstPath) + { + this.checkContextAgainstPath = checkContextAgainstPath; } /** @@ -906,7 +906,7 @@ public class ClientConfigElement extends ConfigElementAdapter /*package*/ void setAllowUserScriptExecute(boolean allowUserScriptExecute) { this.allowUserScriptExecute = allowUserScriptExecute; - } + } /** * @return true if bulk fetch is enabled diff --git a/source/java/org/alfresco/web/config/CommandServletConfigElement.java b/source/java/org/alfresco/web/config/CommandServletConfigElement.java index e2bbb99d10..dc6b2c8477 100644 --- a/source/java/org/alfresco/web/config/CommandServletConfigElement.java +++ b/source/java/org/alfresco/web/config/CommandServletConfigElement.java @@ -62,7 +62,7 @@ public class CommandServletConfigElement extends ConfigElementAdapter } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/DashboardsConfigElement.java b/source/java/org/alfresco/web/config/DashboardsConfigElement.java index 884b856a22..d4021624d1 100644 --- a/source/java/org/alfresco/web/config/DashboardsConfigElement.java +++ b/source/java/org/alfresco/web/config/DashboardsConfigElement.java @@ -69,7 +69,7 @@ public class DashboardsConfigElement extends ConfigElementAdapter } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/DialogsConfigElement.java b/source/java/org/alfresco/web/config/DialogsConfigElement.java index c7cdb3d8c8..5e6cecb922 100644 --- a/source/java/org/alfresco/web/config/DialogsConfigElement.java +++ b/source/java/org/alfresco/web/config/DialogsConfigElement.java @@ -60,7 +60,7 @@ public class DialogsConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#getChildren() + * @see ConfigElement#getChildren() */ public List getChildren() { @@ -68,7 +68,7 @@ public class DialogsConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement) + * @see ConfigElement#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/LanguagesConfigElement.java b/source/java/org/alfresco/web/config/LanguagesConfigElement.java index d5fdf8b882..2461674f18 100644 --- a/source/java/org/alfresco/web/config/LanguagesConfigElement.java +++ b/source/java/org/alfresco/web/config/LanguagesConfigElement.java @@ -67,7 +67,7 @@ public class LanguagesConfigElement extends ConfigElementAdapter } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/NavigationConfigElement.java b/source/java/org/alfresco/web/config/NavigationConfigElement.java index 4401dc3e44..75c380c269 100644 --- a/source/java/org/alfresco/web/config/NavigationConfigElement.java +++ b/source/java/org/alfresco/web/config/NavigationConfigElement.java @@ -56,7 +56,7 @@ public class NavigationConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#getChildren() + * @see ConfigElement#getChildren() */ public List getChildren() { @@ -121,7 +121,7 @@ public class NavigationConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement) + * @see ConfigElement#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/PropertySheetConfigElement.java b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java index f91a4a2a76..3fdaf72439 100644 --- a/source/java/org/alfresco/web/config/PropertySheetConfigElement.java +++ b/source/java/org/alfresco/web/config/PropertySheetConfigElement.java @@ -59,7 +59,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#getChildren() + * @see ConfigElement#getChildren() */ public List getChildren() { @@ -67,7 +67,7 @@ public class PropertySheetConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement) + * @see ConfigElement#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/SidebarConfigElement.java b/source/java/org/alfresco/web/config/SidebarConfigElement.java index 30b1847793..dfd478b249 100644 --- a/source/java/org/alfresco/web/config/SidebarConfigElement.java +++ b/source/java/org/alfresco/web/config/SidebarConfigElement.java @@ -61,7 +61,7 @@ public class SidebarConfigElement extends ConfigElementAdapter implements Serial } /** - * @see org.alfresco.config.ConfigElement#getChildren() + * @see ConfigElement#getChildren() */ public List getChildren() { @@ -69,7 +69,7 @@ public class SidebarConfigElement extends ConfigElementAdapter implements Serial } /** - * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement) + * @see ConfigElement#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/ViewsConfigElement.java b/source/java/org/alfresco/web/config/ViewsConfigElement.java index 34bf3fa7b7..cf5b92bc5e 100644 --- a/source/java/org/alfresco/web/config/ViewsConfigElement.java +++ b/source/java/org/alfresco/web/config/ViewsConfigElement.java @@ -102,7 +102,7 @@ public class ViewsConfigElement extends ConfigElementAdapter implements Serializ } /** - * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.alfresco.config.ConfigElement) + * @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/config/WizardsConfigElement.java b/source/java/org/alfresco/web/config/WizardsConfigElement.java index 9807f6d14a..39e3ceb84f 100644 --- a/source/java/org/alfresco/web/config/WizardsConfigElement.java +++ b/source/java/org/alfresco/web/config/WizardsConfigElement.java @@ -59,7 +59,7 @@ public class WizardsConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#getChildren() + * @see ConfigElement#getChildren() */ public List getChildren() { @@ -67,7 +67,7 @@ public class WizardsConfigElement extends ConfigElementAdapter } /** - * @see org.alfresco.config.ConfigElement#combine(org.alfresco.config.ConfigElement) + * @see ConfigElement#combine(org.springframework.extensions.config.ConfigElement) */ public ConfigElement combine(ConfigElement configElement) { diff --git a/source/java/org/alfresco/web/data/Sort.java b/source/java/org/alfresco/web/data/Sort.java index b0d1e1a0ff..5f691672eb 100644 --- a/source/java/org/alfresco/web/data/Sort.java +++ b/source/java/org/alfresco/web/data/Sort.java @@ -319,7 +319,7 @@ public abstract class Sort private static class SimpleComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -333,7 +333,7 @@ public abstract class Sort private static class SimpleStringComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -347,7 +347,7 @@ public abstract class Sort private static class StringComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -361,7 +361,7 @@ public abstract class Sort private static class IntegerComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -375,7 +375,7 @@ public abstract class Sort private static class FloatComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -389,7 +389,7 @@ public abstract class Sort private static class LongComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -403,7 +403,7 @@ public abstract class Sort private static class BooleanComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -417,7 +417,7 @@ public abstract class Sort private static class DateComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { @@ -431,7 +431,7 @@ public abstract class Sort private static class TimestampComparator implements Comparator { /** - * @see org.alfresco.web.data.IDataComparator#compare(java.lang.Object, java.lang.Object) + * @see Comparator#compare(java.lang.Object, java.lang.Object) */ public int compare(final Object obj1, final Object obj2) { diff --git a/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java index cde95f9bd1..aa68b96d5a 100644 --- a/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java +++ b/source/java/org/alfresco/web/ui/common/component/description/UIDynamicDescription.java @@ -210,7 +210,7 @@ public class UIDynamicDescription extends SelfRenderingComponent * * @param context The faces context * @param controlId The id of the control the description is for - * @param test The description text + * @param text The description text */ private void renderDescription(FacesContext context, String controlId, String text) throws IOException 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 c8f3369f26..6aa6c76f98 100644 --- a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java +++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java @@ -273,7 +273,7 @@ public class ActionLinkRenderer extends BaseRenderer /** * @param link - * @param linkBuf + * @param out * @param href */ private void renderHrefParams(UIActionLink link, Writer out, String href) diff --git a/source/java/org/alfresco/web/ui/common/tag/SelectListTag.java b/source/java/org/alfresco/web/ui/common/tag/SelectListTag.java index 00963b490a..891c352d45 100644 --- a/source/java/org/alfresco/web/ui/common/tag/SelectListTag.java +++ b/source/java/org/alfresco/web/ui/common/tag/SelectListTag.java @@ -138,7 +138,7 @@ public class SelectListTag extends HtmlComponentTag /** * Set the onchange handler * - * @param value the onchange handler. + * @param onchange the onchange handler. */ public void setOnchange(final String onchange) { diff --git a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java index d9440a9b32..5c3b75d1a6 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java +++ b/source/java/org/alfresco/web/ui/repo/component/UISearchCustomProperties.java @@ -240,8 +240,8 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements * Generates a JSF OutputText component/renderer * * @param context JSF context - * @param displayLabel The display label text - * @param parent The parent component for the label + * @param propDef PropertyDefinition + * @param beanBinding String * * @return UIComponent */ @@ -442,7 +442,7 @@ public class UISearchCustomProperties extends SelfRenderingComponent implements /** * Retrieves the list of values constraint for the item, if it has one * - * @param PropertyDefinition The property definition for the constraint + * @param propertyDef The property definition for the constraint * @return The constraint if the item has one, null otherwise */ protected ListOfValuesConstraint getListOfValuesConstraint(PropertyDefinition propertyDef) diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java index b5e61b321b..370c32e9e5 100644 --- a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java +++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java @@ -797,7 +797,7 @@ public class UIPropertySheet extends UIPanel implements NamingContainer * in an external config file. * * @param context JSF context - * @param properties Collection of properties to render (driven from configuration) + * @param items Collection of properties to render (driven from configuration) * @throws IOException */ @SuppressWarnings("unchecked")