mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Remove method call from argument list; minor change to simply debugging
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31403 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -145,6 +145,8 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
return invocation.proceed();
|
return invocation.proceed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Locale contentLangLocale = I18NUtil.getContentLocaleLang();
|
||||||
|
|
||||||
Object ret = null;
|
Object ret = null;
|
||||||
|
|
||||||
final String methodName = invocation.getMethod().getName();
|
final String methodName = invocation.getMethod().getName();
|
||||||
@@ -160,7 +162,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
|
|
||||||
// What locale must be used for filtering - ALF-3756 fix, ignore the country and variant
|
// What locale must be used for filtering - ALF-3756 fix, ignore the country and variant
|
||||||
Serializable value = (Serializable) invocation.proceed();
|
Serializable value = (Serializable) invocation.proceed();
|
||||||
ret = convertOutboundProperty(I18NUtil.getContentLocaleLang(), nodeRef, pivotNodeRef, propertyQName, value);
|
ret = convertOutboundProperty(contentLangLocale, nodeRef, pivotNodeRef, propertyQName, value);
|
||||||
}
|
}
|
||||||
else if (methodName.equals("getProperties"))
|
else if (methodName.equals("getProperties"))
|
||||||
{
|
{
|
||||||
@@ -176,7 +178,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
{
|
{
|
||||||
QName propertyQName = entry.getKey();
|
QName propertyQName = entry.getKey();
|
||||||
Serializable value = entry.getValue();
|
Serializable value = entry.getValue();
|
||||||
Serializable convertedValue = convertOutboundProperty(I18NUtil.getContentLocaleLang(), nodeRef, pivotNodeRef, propertyQName, value);
|
Serializable convertedValue = convertOutboundProperty(contentLangLocale, nodeRef, pivotNodeRef, propertyQName, value);
|
||||||
// Add it to the return map
|
// Add it to the return map
|
||||||
convertedProperties.put(propertyQName, convertedValue);
|
convertedProperties.put(propertyQName, convertedValue);
|
||||||
}
|
}
|
||||||
@@ -204,7 +206,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
||||||
currentProperties,
|
currentProperties,
|
||||||
newProperties,
|
newProperties,
|
||||||
I18NUtil.getContentLocaleLang(),
|
contentLangLocale,
|
||||||
nodeRef,
|
nodeRef,
|
||||||
pivotNodeRef);
|
pivotNodeRef);
|
||||||
// Now complete the call by passing the converted properties
|
// Now complete the call by passing the converted properties
|
||||||
@@ -225,7 +227,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
||||||
currentProperties,
|
currentProperties,
|
||||||
newProperties,
|
newProperties,
|
||||||
I18NUtil.getContentLocaleLang(),
|
contentLangLocale,
|
||||||
nodeRef,
|
nodeRef,
|
||||||
pivotNodeRef);
|
pivotNodeRef);
|
||||||
// Now complete the call by passing the converted properties
|
// Now complete the call by passing the converted properties
|
||||||
@@ -242,7 +244,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
NodeRef pivotNodeRef = getPivotNodeRef(nodeRef);
|
NodeRef pivotNodeRef = getPivotNodeRef(nodeRef);
|
||||||
|
|
||||||
// Convert the property
|
// Convert the property
|
||||||
inboundValue = convertInboundProperty(I18NUtil.getContentLocaleLang(), nodeRef, pivotNodeRef, propertyQName, inboundValue, null);
|
inboundValue = convertInboundProperty(contentLangLocale, nodeRef, pivotNodeRef, propertyQName, inboundValue, null);
|
||||||
|
|
||||||
// Pass this through to the node service
|
// Pass this through to the node service
|
||||||
nodeService.setProperty(nodeRef, propertyQName, inboundValue);
|
nodeService.setProperty(nodeRef, propertyQName, inboundValue);
|
||||||
@@ -268,7 +270,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
||||||
null,
|
null,
|
||||||
newProperties,
|
newProperties,
|
||||||
I18NUtil.getContentLocaleLang(),
|
contentLangLocale,
|
||||||
nodeRef,
|
nodeRef,
|
||||||
pivotNodeRef);
|
pivotNodeRef);
|
||||||
// Now complete the call by passing the converted properties
|
// Now complete the call by passing the converted properties
|
||||||
@@ -290,7 +292,7 @@ public class MLPropertyInterceptor implements MethodInterceptor
|
|||||||
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
Map<QName, Serializable> convertedProperties = convertInboundProperties(
|
||||||
currentProperties,
|
currentProperties,
|
||||||
newProperties,
|
newProperties,
|
||||||
I18NUtil.getContentLocaleLang(),
|
contentLangLocale,
|
||||||
nodeRef,
|
nodeRef,
|
||||||
pivotNodeRef);
|
pivotNodeRef);
|
||||||
// Now complete the call by passing the converted properties
|
// Now complete the call by passing the converted properties
|
||||||
|
Reference in New Issue
Block a user