inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent a2349e101f
commit b15a2e772b
28 changed files with 108 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/bean/admin/ConfigAdminConsoleBean.java
View File

@@ -64,7 +64,7 @@ public class ConfigAdminConsoleBean
/**
* Sets the command result
*
* @param result
* @param result String
*/
public void setResult(String result)
{

2
source/java/org/alfresco/web/bean/ajax/PresenceProxyBean.java
View File

@@ -69,8 +69,6 @@ public class PresenceProxyBean implements Serializable
/**
* Perform request
*
* @throws IOException
*/
public String getUrlResponse(String requestUrl)
{

2
source/java/org/alfresco/web/bean/categories/EditNodeCategoriesDialog.java
View File

@@ -148,7 +148,7 @@ public class EditNodeCategoriesDialog extends BaseDialogBean
/**
* Sets the categories Map
*
* @param categories
* @param categories List
*/
public void setCategories(List categories)
{

2
source/java/org/alfresco/web/bean/coci/EditOfflineDialog.java
View File

@@ -211,7 +211,7 @@ public class EditOfflineDialog extends CheckinCheckoutDialog
}
/**
* @param continueCountdown
* @param continueCountdown boolean
*/
public void setContinueCountdown(boolean continueCountdown)
{

2
source/java/org/alfresco/web/bean/groups/GroupsDialog.java
View File

@@ -592,7 +592,7 @@ public class GroupsDialog extends BaseDialogBean
/**
* Simple setter
*
* @param groupsSearchCriteria
* @param groupsSearchCriteria String
*/
public void setGroupsSearchCriteria(String groupsSearchCriteria)
{

24
source/java/org/alfresco/web/bean/ml/MultilingualUtils.java
View File

@@ -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)
{

2
source/java/org/alfresco/web/bean/ml/SingleEditionBean.java
View File

@@ -40,7 +40,7 @@ public class SingleEditionBean implements Serializable
private List<MapNode> translations = null;
/**
* @return
* @return String
*/
public String getEditionLabel()
{

2
source/java/org/alfresco/web/bean/repository/Repository.java
View File

@@ -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.
*/

2
source/java/org/alfresco/web/bean/repository/admin/RepoAdminConsoleBean.java
View File

@@ -83,7 +83,7 @@ public class RepoAdminConsoleBean implements Serializable
/**
* Sets the command result
*
* @param result
* @param result String
*/
public void setResult(String result)
{

2
source/java/org/alfresco/web/bean/repository/tenant/TenantAdminConsoleBean.java
View File

@@ -83,7 +83,7 @@ public class TenantAdminConsoleBean implements Serializable
/**
* Sets the command result
*
* @param result
* @param result String
*/
public void setResult(String result)
{

2
source/java/org/alfresco/web/bean/rules/RulesDialog.java
View File

@@ -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)
{

6
source/java/org/alfresco/web/bean/users/CreateUserWizard.java
View File

@@ -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

2
source/java/org/alfresco/web/bean/users/UsersBeanProperties.java
View File

@@ -210,7 +210,7 @@ public class UsersBeanProperties implements Serializable
}
/**
* @param userRegistrySynchronizer
* @param userRegistrySynchronizer UserRegistrySynchronizer
*/
public void setUserRegistrySynchronizer(UserRegistrySynchronizer userRegistrySynchronizer)
{

2
source/java/org/alfresco/web/bean/users/UsersDialog.java
View File

@@ -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)
{

80
source/java/org/alfresco/web/bean/wizard/NewUserWizard.java
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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