Merged 5.2.N (5.2.1) to HEAD (5.2)

128510 mmuller: Fixed some javadoc errors. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/security/authentication/ChainingAuthenticationComponentImpl.java

@@ -72,7 +72,6 @@ public class ChainingAuthenticationComponentImpl extends AbstractChainingAuthent
     /**
      * Set a list of authentication components
      * 
-     * @param authenticationComponents List<AuthenticationComponent>
      */
     public void setAuthenticationComponents(List<AuthenticationComponent> authenticationComponents)
     {
@@ -293,7 +292,6 @@ public class ChainingAuthenticationComponentImpl extends AbstractChainingAuthent
     /**
      * Helper to get authentication components
      * 
-     * @return Collection<AuthenticationComponent>
      */
     protected Collection<AuthenticationComponent> getUsableAuthenticationComponents()
     {

source/java/org/alfresco/repo/security/authentication/CompositePasswordEncoder.java

@@ -71,7 +71,7 @@ public class CompositePasswordEncoder
 
     /**
      * Is the preferred encoding the last encoding to be used.
-     * @param hashIndicator a List<String></String> representing the encoding
+     * @param hashIndicator representing the encoding
      * @return true if is correct
      */
     public boolean lastEncodingIsPreferred(List<String> hashIndicator)
@@ -278,4 +278,4 @@ public class CompositePasswordEncoder
         }
         throw new AlfrescoRuntimeException("Unsupported encoder for matching: "+encoderKey);
     }
-}
+}

source/java/org/alfresco/repo/security/authentication/ldap/LDAPInitialDirContextFactory.java

@@ -43,7 +43,6 @@ public interface LDAPInitialDirContextFactory
     /**
      * Set the LDAP environment Hashtable properties used ot initialise the LDAP connection.
      * 
-     * @param environment Map<String, String>
      */
     public void setInitialDirContextEnvironment(Map<String, String> environment);