TemplateImageResolver refactoring to support 64x64 icons as a new filetype image size. More icons from Linton.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/template/BaseContentNode.java

@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.FileTypeImageSize;
 import org.alfresco.service.cmr.repository.TemplateException;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.alfresco.service.namespace.QName;
@@ -137,7 +138,7 @@ public abstract class BaseContentNode implements TemplateContent
         {
             if (getIsDocument())
             {
-                return this.imageResolver.resolveImagePathForName(getName(), true);
+                return this.imageResolver.resolveImagePathForName(getName(), FileTypeImageSize.Small);
             }
             else
             {
@@ -159,7 +160,7 @@ public abstract class BaseContentNode implements TemplateContent
     }
     
     /**
-     * @return the large icon image for this node
+     * @return the medium icon image for this node
      */
     public String getIcon32()
     {
@@ -167,7 +168,7 @@ public abstract class BaseContentNode implements TemplateContent
         {
             if (getIsDocument())
             {
-                return this.imageResolver.resolveImagePathForName(getName(), false);
+                return this.imageResolver.resolveImagePathForName(getName(), FileTypeImageSize.Medium);
             }
             else
             {
@@ -188,6 +189,36 @@ public abstract class BaseContentNode implements TemplateContent
         }
     }
     
+    /**
+     * @return the large icon image for this node
+     */
+    public String getIcon64()
+    {
+        if (this.imageResolver != null)
+        {
+            if (getIsDocument())
+            {
+                return this.imageResolver.resolveImagePathForName(getName(), FileTypeImageSize.Large);
+            }
+            else
+            {
+                String icon = (String)getProperties().get("app:icon");
+                if (icon != null)
+                {
+                    return "/images/icons/" + icon + "-64.png";
+                }
+                else
+                {
+                    return "/images/icons/space-icon-default-64.png";
+                }
+            }
+        }
+        else
+        {
+            return "/images/filetypes64/_default.gif";
+        }
+    }
+    
     /**
      * @return Display path to this node - the path built of 'cm:name' attribute values.
      */

source/java/org/alfresco/service/cmr/repository/FileTypeImageSize.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+package org.alfresco.service.cmr.repository;
+
+/**
+ * @author Kevin Roast
+ */
+public enum FileTypeImageSize
+{
+   Small, Medium, Large;
+}

source/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java

@@ -39,7 +39,9 @@ public interface TemplateImageResolver
      * Resolve the qualified icon image path for the specified filename 
      * 
      * @param filename      The file name to resolve image path for
-     * @param small         True to resolve to the small 16x16 image, else large 32x32 image
+     * @param size          Enum representing the size of the image to retrieve
+     * 
+     * @return image path for the specified filename and image size
      */
-    public String resolveImagePathForName(String filename, boolean small);
+    public String resolveImagePathForName(String filename, FileTypeImageSize size);
 }