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
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -67,7 +67,7 @@ public abstract class BaseParameterConstraint implements ParameterConstraint,
/**
* Determines whether the allowable values should be cached, default is true.
*
* @param cache
* @param cache boolean
*/
public void setCacheAllowableValues(boolean cache)
{
@@ -113,14 +113,14 @@ public abstract class BaseParameterConstraint implements ParameterConstraint,
/**
* Gets the list of allowable values, calculating them every time it is called.
*
* @return Map<String, String> map of allowable values
* @return map of allowable values
*/
protected abstract Map<String, String> getAllowableValuesImpl();
/**
* Get the I18N display label for a particular key
*
* @param key
* @param key String
* @return String I18N value
*/
protected String getI18NLabel(String key)
@@ -135,21 +135,21 @@ public abstract class BaseParameterConstraint implements ParameterConstraint,
result = i18n;
}
return result;
}
/**
* @see org.alfresco.service.cmr.action.ParameterConstraint#getValueDisplayLabel(String)
*/
public String getValueDisplayLabel(String value)
{
}
/**
* @see org.alfresco.service.cmr.action.ParameterConstraint#getValueDisplayLabel(String)
*/
public String getValueDisplayLabel(String value)
{
return getAllowableValues().get(value);
}
/**
* @see org.alfresco.service.cmr.action.ParameterConstraint#isValidValue(String)
*/
public boolean isValidValue(String value)
{
}
/**
* @see org.alfresco.service.cmr.action.ParameterConstraint#isValidValue(String)
*/
public boolean isValidValue(String value)
{
return getAllowableValues().containsKey(value);
}
}