From ee70662f17e03751f9d91f8d7727015419f80d78 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 09:27:39 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    59895:
 Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)       59748: Merged
 DEV to V4.2-BUG-FIX (4.2.2)          59567: MNT-10278: "Format" column is
 empty for Dublin Core View             Implemented renderer for mymetype.    
         Added mimetypeDisplayName property to JSON root values to be able to
 display human readable mimetype description without additional calls from
 JavaScript code.             Added localized strings for unknown types in
 English and Russian languages.             Edited dublin_core view sample to
 use mimetype instead of cm:mimetype.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/script-services-context.xml     |  1 +
 .../jscript/app/JSONConversionComponent.java    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index e2dd88f352..a8d0f31031 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -258,6 +258,7 @@
     </bean>
 
     <bean id="jsonConversionComponent" class="org.alfresco.repo.jscript.app.JSONConversionComponent" parent="baseJsonConversionComponent">
+        <property name="mimetypeService" ref="MimetypeService" />
     </bean>
     
     <bean id="baseDecorator" abstract="true" init-method="init">
diff --git a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
index 709ad1aba0..c7531f053d 100644
--- a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
+++ b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
@@ -36,6 +36,7 @@ import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AccessPermission;
@@ -92,6 +93,7 @@ public class JSONConversionComponent
     protected LockService lockService;    
     protected ContentService contentService;    
     protected PermissionService permissionService;
+    protected MimetypeService mimetypeService;
     
     
     /**
@@ -157,6 +159,14 @@ public class JSONConversionComponent
     {
         this.contentService = contentService;
     }
+
+    /**
+     * @param mimetypeService    mimetype service
+     */
+    public void setMimetypeService(MimetypeService mimetypeService)
+    {
+        this.mimetypeService = mimetypeService;
+    }
     
     /**
      * Register a property decorator;
@@ -251,6 +261,13 @@ public class JSONConversionComponent
                 
                 rootJSONObject.put("contentURL", contentURL);
                 rootJSONObject.put("mimetype", cdata.getMimetype());
+                Map<String, String> mimetypeDescriptions;
+                mimetypeDescriptions = mimetypeService.getDisplaysByMimetype();
+
+                if (mimetypeDescriptions.containsKey(cdata.getMimetype()))
+                {
+                    rootJSONObject.put("mimetypeDisplayName", mimetypeDescriptions.get(cdata.getMimetype()));
+                }
                 rootJSONObject.put("encoding", cdata.getEncoding());
                 rootJSONObject.put("size", cdata.getSize());
             }