diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index 4117569fae..7e3625ee72 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -88,7 +88,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
         }
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public boolean supports(Class clazz)
     {
         return (MethodInvocation.class.isAssignableFrom(clazz));
@@ -128,7 +128,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
         this.maxPermissionCheckTimeMillis = maxPermissionCheckTimeMillis;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public Object decide(Authentication authentication, Object object, ConfigAttributeDefinition config, Object returnedObject) throws AccessDeniedException
     {
         if (logger.isDebugEnabled())
@@ -302,7 +302,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
 
     }
 
-    @SuppressWarnings({"unchecked" })
+    @SuppressWarnings({"rawtypes" })
     private List<ConfigAttributeDefintion> extractSupportedDefinitions(ConfigAttributeDefinition config)
     {
         List<ConfigAttributeDefintion> definitions = new ArrayList<ConfigAttributeDefintion>();
@@ -593,7 +593,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
         return new QueryEngineResults(answer);
     }
 
-    @SuppressWarnings({ "unchecked" })
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private Collection decide(Authentication authentication, Object object, ConfigAttributeDefinition config, Collection returnedObject) throws AccessDeniedException
     {
         if (returnedObject == null)
@@ -946,7 +946,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
         return testNodeRef;
     }
 
-    @SuppressWarnings({"unchecked" })
+    @SuppressWarnings({"unchecked", "rawtypes" })
     private Map decide(Authentication authentication, Object object, ConfigAttributeDefinition config, Map returnedObject) throws AccessDeniedException
     {
         if (returnedObject.containsKey(RecordsManagementModel.PROP_HOLD_REASON))
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
index abfe60681e..48da1f2306 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
@@ -158,7 +158,7 @@ public class RMEntryVoter extends RMSecurityCommon
     /**
      * @see net.sf.acegisecurity.vote.AccessDecisionVoter#supports(java.lang.Class)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public boolean supports(Class clazz)
     {
         return (MethodInvocation.class.isAssignableFrom(clazz));
@@ -167,7 +167,7 @@ public class RMEntryVoter extends RMSecurityCommon
     /**
      * @see net.sf.acegisecurity.vote.AccessDecisionVoter#vote(net.sf.acegisecurity.Authentication, java.lang.Object, net.sf.acegisecurity.ConfigAttributeDefinition)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int vote(Authentication authentication, Object object, net.sf.acegisecurity.ConfigAttributeDefinition config)
     {
     	MethodInvocation mi = (MethodInvocation)object;
@@ -323,7 +323,7 @@ public class RMEntryVoter extends RMSecurityCommon
      * @param cad
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	private int checkCapability(MethodInvocation invocation, Class[] params, ConfigAttributeDefinition cad)
     {
         NodeRef testNodeRef = getTestNode(invocation, params, cad.getParameters().get(0), cad.isParent());
@@ -347,7 +347,7 @@ public class RMEntryVoter extends RMSecurityCommon
      * @param cad
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	private int checkPolicy(MethodInvocation invocation, Class[] params, ConfigAttributeDefinition cad)
     {
         Policy policy = policies.get(cad.getPolicyName());
@@ -373,7 +373,7 @@ public class RMEntryVoter extends RMSecurityCommon
      * @param config
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	private List<ConfigAttributeDefinition> extractSupportedDefinitions(net.sf.acegisecurity.ConfigAttributeDefinition config)
     {
         List<ConfigAttributeDefinition> definitions = new ArrayList<ConfigAttributeDefinition>(2);
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
index 1e8f2af985..95a224292b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
@@ -223,7 +223,7 @@ public class RMSecurityCommon
 
     }
     
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected NodeRef getTestNode(MethodInvocation invocation, Class[] params, int position, boolean parent)
     {
         NodeRef testNodeRef = null;
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
index 7553c67e4d..88de87e0d1 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AbstractBasePolicy.java
@@ -101,7 +101,7 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon
      * @param parent
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected QName getType(MethodInvocation invocation, Class[] params, int position, boolean parent)
     {
         if (QName.class.isAssignableFrom(params[position]))
@@ -131,7 +131,7 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon
      * @param position
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected QName getQName(MethodInvocation invocation, Class[] params, int position)
     {
         if (QName.class.isAssignableFrom(params[position]))
@@ -152,7 +152,7 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon
      * @param position
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected Serializable getProperty(MethodInvocation invocation, Class[] params, int position)
     {
         if (invocation.getArguments()[position] == null)
@@ -177,7 +177,7 @@ public abstract class AbstractBasePolicy extends RMSecurityCommon
      * @param position
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     protected Map<QName, Serializable> getProperties(MethodInvocation invocation, Class[] params, int position)
     {
         if (invocation.getArguments()[position] == null)
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
index 32f349bb95..ef95ef5650 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java
@@ -25,7 +25,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class AssocPolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
index 84f368aa4c..6da51f9dcf 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CapabilityPolicy.java
@@ -33,7 +33,7 @@ public class CapabilityPolicy extends AbstractBasePolicy
      * @see org.alfresco.module.org_alfresco_module_rm.capability.policy.Policy#evaluate(org.aopalliance.intercept.MethodInvocation, java.lang.Class[], org.alfresco.module.org_alfresco_module_rm.capability.policy.ConfigAttributeDefinition)
      */
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
index 4e2b3e6383..5f2f954e07 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/CreatePolicy.java
@@ -25,7 +25,7 @@ import org.aopalliance.intercept.MethodInvocation;
 
 public class CreatePolicy extends AbstractBasePolicy
 {
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
index 8a545d1b42..6f53f80c7a 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeclarePolicy.java
@@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class DeclarePolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
index ecbdc0f658..996a02130c 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/DeletePolicy.java
@@ -26,7 +26,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class DeletePolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
index f37defbd5f..8088108372 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/MovePolicy.java
@@ -26,7 +26,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class MovePolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
index 54083ed9a7..b50b605a81 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/Policy.java
@@ -41,7 +41,7 @@ public interface Policy
      * @param cad
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
index 7732fd4dba..78d308d530 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPolicy.java
@@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class ReadPolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
index f64827f308..b1a97cdfd8 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ReadPropertyPolicy.java
@@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class ReadPropertyPolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
index 3508b2fe38..fd9abe6780 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePolicy.java
@@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class UpdatePolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
index c8bb219884..bc058e4e6e 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/UpdatePropertiesPolicy.java
@@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation;
 
 public class UpdatePropertiesPolicy extends AbstractBasePolicy
 {
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate( 
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
index dd3ebb3f29..760beb7b03 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/WriteContentPolicy.java
@@ -24,7 +24,7 @@ import org.aopalliance.intercept.MethodInvocation;
 public class WriteContentPolicy extends AbstractBasePolicy
 {
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public int evaluate(
             MethodInvocation invocation, 
             Class[] params, 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
index 47ffa3fcbf..edde574e40 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java
@@ -144,7 +144,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
      *  
      * @param values a list of allowed values
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     public void setAllowedValues(List allowedValues)
     {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
index 69bc6a9b6d..7b4de445aa 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java
@@ -138,7 +138,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService#canCreateEvent(java.lang.String, java.lang.String)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public boolean canCreateEvent(String eventDisplayLabel, String eventName)
     {
         ParameterCheck.mandatoryString("eventDisplayLabel", eventDisplayLabel);
@@ -170,7 +170,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService#canEditEvent(java.lang.String, java.lang.String, java.lang.String)
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
 	public boolean canEditEvent(String eventDisplayLabel, String eventName, String eventType)
     {
         ParameterCheck.mandatoryString("eventDisplayLabel", eventDisplayLabel);
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
index aaa1ba07c8..b2847f5364 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
@@ -277,6 +277,10 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
                     result = "transfer-container";
                     break;
                 }
+                default:
+                {
+                    break;
+                }
             }
         }
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
index b28c775ed8..e28d955bd0 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java
@@ -120,7 +120,7 @@ public class CustomPropertyDefinitionPost extends BaseCustomPropertyWebScript
         return result;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected Map<String, Serializable> getParamsFromUrlAndJson(WebScriptRequest req, JSONObject json)
             throws JSONException
     {
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
index ae0e590598..726e103bab 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java
@@ -97,7 +97,7 @@ public class CustomReferenceDefinitionPost extends AbstractRmWebScript
     /**
      * Applies custom properties.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected Map<String, Object> addCustomReference(WebScriptRequest req, JSONObject json) throws JSONException
     {
         Map<String, Object> result = new HashMap<String, Object>();
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
index e68211e980..1f183609ad 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java
@@ -99,7 +99,7 @@ public class CustomReferenceDefinitionPut extends AbstractRmWebScript
     /**
      * Applies custom properties.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     protected Map<String, Object> updateCustomReference(WebScriptRequest req, JSONObject json) throws JSONException
     {
         Map<String, Object> result = new HashMap<String, Object>();