From 03932c22409a7f1b5a8070b81d556f69213f52f9 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 7 Aug 2013 15:04:46 +0000
Subject: [PATCH] RM-796 (Add Scanned Record Metadata results in properties
 error)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@53729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org_alfresco_module_rm/module-context.xml |  7 +++----
 .../RecordsManagementNodeFormFilter.java      | 20 +++----------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index 3a2df6c4ea..b9197962d2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -113,7 +113,7 @@
 
    <!--  Import workflows -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml"/>
-   
+
    <!--  Import record service -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-report-context.xml"/>
 
@@ -209,7 +209,6 @@
       parent="baseRMFormFilter"
       class="org.alfresco.module.org_alfresco_module_rm.forms.RecordsManagementNodeFormFilter">
       <property name="filterRegistry" ref="nodeFilterRegistry" />
-      <property name="dictionaryService" ref="DictionaryService" />
       <property name="dispositionService" ref="dispositionService"/>
       <property name="filePlanService" ref="FilePlanService" />
    </bean>
@@ -242,8 +241,8 @@
 
    <!-- Import the RM webscript's -->
    <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml"/>
-   
+
    <!-- Import of installed demos -->
-   <import resource="classpath*:alfresco/module/org_alfresco_module_rm/demo/*/demo-context.xml"/> 
+   <import resource="classpath*:alfresco/module/org_alfresco_module_rm/demo/*/demo-context.xml"/>
 
 </beans>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
index 73c228e350..21ad07f4ca 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
@@ -41,7 +41,6 @@ import org.alfresco.repo.forms.processor.node.FieldUtils;
 import org.alfresco.repo.forms.processor.node.FormFieldConstants;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
@@ -67,25 +66,12 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
     protected static final String TRANSIENT_CATEGORY_ID = "rmCategoryIdentifier";
     protected static final String TRANSIENT_DISPOSITION_INSTRUCTIONS = "rmDispositionInstructions";
 
-    /** Dictionary service */
-    protected DictionaryService dictionaryService;
-
     /** Disposition service */
     protected DispositionService dispositionService;
-    
+
     /** File Plan Service */
     protected FilePlanService filePlanService;
 
-    /**
-     * Sets the data dictionary service
-     *
-     * @param dictionaryService The DictionaryService instance
-     */
-    public void setDictionaryService(DictionaryService dictionaryService)
-    {
-        this.dictionaryService = dictionaryService;
-    }
-
     /**
      * Sets the disposition service
      *
@@ -95,11 +81,11 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
     {
         this.dispositionService = dispositionService;
     }
-    
+
     /**
      * @param filePlanService	file plan service
      */
-    public void setFilePlanService(FilePlanService filePlanService) 
+    public void setFilePlanService(FilePlanService filePlanService)
     {
 		this.filePlanService = filePlanService;
 	}