inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +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 a5f8df310a
commit 22d2935235
119 changed files with 444 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/web/scripts/config/OpenSearchConfigElement.java
View File

@@ -102,7 +102,7 @@ public class OpenSearchConfigElement extends ConfigElementAdapter
/**
* Sets the proxy configuration
*
* @param proxyConfig
* @param proxyConfig ProxyConfig
*/
/*package*/ void setProxy(ProxyConfig proxyConfig)
{
@@ -168,8 +168,8 @@ public class OpenSearchConfigElement extends ConfigElementAdapter
/**
* Construct
*
* @param label
* @param labelId
* @param label String
* @param labelId String
*/
public EngineConfig(String label, String labelId)
{
@@ -184,9 +184,9 @@ public class OpenSearchConfigElement extends ConfigElementAdapter
/**
* Construct
*
* @param label
* @param labelId
* @param proxy
* @param label String
* @param labelId String
* @param proxy String
*/
public EngineConfig(String label, String labelId, String proxy)
{
@@ -254,7 +254,7 @@ public class OpenSearchConfigElement extends ConfigElementAdapter
/**
* Construct
*
* @param url
* @param url String
*/
public ProxyConfig(String url)
{