[MMBASE SCM] r42792 - mmbase/trunk/applications/resources/src/main/java/org/mmbase/module/builders

[michiel]

Author: michiel
Date: 2010-07-02 09:01:27 +0200 (Fri, 02 Jul 2010)
New Revision: 42792

Modified:
   
mmbase/trunk/applications/resources/src/main/java/org/mmbase/module/builders/ImageCaches.java
Log:
ported from 1.9

Modified: 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/module/builders/ImageCaches.java
===================================================================
--- 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/module/builders/ImageCaches.java
       2010-07-02 07:00:10 UTC (rev 42791)
+++ 
mmbase/trunk/applications/resources/src/main/java/org/mmbase/module/builders/ImageCaches.java
       2010-07-02 07:01:27 UTC (rev 42792)
@@ -71,6 +71,19 @@
         return getNode(node.getIntValue(FIELD_ID));
     }
 
+    /**
+     * @since MMBase-1.9.4
+     */
+    protected void appendExtension(StringBuilder buf, String ext) {
+        int extensionIndex = buf.lastIndexOf(".");
+        if (extensionIndex > 0) {
+            buf.replace(extensionIndex + 1, buf.length(), ext);
+        } else {
+            buf.append('.').append(ext);
+        }
+    }
+
+    @Override
     public StringBuilder getFileName(MMObjectNode node, StringBuilder buf) {
         MMObjectNode originalImage = originalImage(node);
         ImagesInterface images = (ImagesInterface) originalImage.getBuilder();
@@ -78,10 +91,10 @@
         String ext = getImageFormat(node);
         if (! (images instanceof Images) || ((Images) 
images).storesImageType()) { // otherwise too expensive
             if (! ext.equals(images.getImageFormat(originalImage))) {
-                buf.append('.').append(ext);
+                appendExtension(buf, ext);
             }
         } else {
-            buf.append('.').append(ext);
+            appendExtension(buf, ext);
         }
         return buf;
     }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs