From 29c86c027dbf2609900e1013a7fc290fac1ed951 Mon Sep 17 00:00:00 2001 From: Ray Gauss Date: Tue, 19 Feb 2013 21:55:02 +0000 Subject: [PATCH] Updated source options to use prefixes now defined in MimetypeMap git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../cmr/repository/AbstractTransformationSourceOptions.java | 3 --- .../alfresco/service/cmr/repository/CropSourceOptions.java | 4 +++- .../service/cmr/repository/TemporalSourceOptions.java | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java b/source/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java index b04c08817d..41b56c04b4 100644 --- a/source/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java +++ b/source/java/org/alfresco/service/cmr/repository/AbstractTransformationSourceOptions.java @@ -30,9 +30,6 @@ import java.util.Map; */ public abstract class AbstractTransformationSourceOptions implements TransformationSourceOptions, Cloneable { - protected static final String MIMETYPE_VIDEO_PREFIX = "video/"; - protected static final String MIMETYPE_AUDIO_PREFIX = "audio/"; - protected static final String MIMETYPE_IMAGE_PREFIX = "image/"; /** The list of applicable mimetypes */ private List applicabledMimetypes; diff --git a/source/java/org/alfresco/service/cmr/repository/CropSourceOptions.java b/source/java/org/alfresco/service/cmr/repository/CropSourceOptions.java index d53af47b46..34cbfe000a 100644 --- a/source/java/org/alfresco/service/cmr/repository/CropSourceOptions.java +++ b/source/java/org/alfresco/service/cmr/repository/CropSourceOptions.java @@ -22,6 +22,8 @@ package org.alfresco.service.cmr.repository; import java.io.Serializable; import java.util.Map; +import org.alfresco.repo.content.MimetypeMap; + /** * DTO used to store options for ImageMagick cropping. * @@ -40,7 +42,7 @@ public class CropSourceOptions extends AbstractTransformationSourceOptions public boolean isApplicableForMimetype(String sourceMimetype) { return ((sourceMimetype != null && - sourceMimetype.startsWith(MIMETYPE_IMAGE_PREFIX)) || + sourceMimetype.startsWith(MimetypeMap.PREFIX_IMAGE)) || super.isApplicableForMimetype(sourceMimetype)); } diff --git a/source/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java b/source/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java index 25441b0f27..284f28c807 100644 --- a/source/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java +++ b/source/java/org/alfresco/service/cmr/repository/TemporalSourceOptions.java @@ -22,6 +22,7 @@ import java.io.Serializable; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.content.MimetypeMap; import org.alfresco.service.cmr.repository.AbstractTransformationSourceOptions; /** @@ -52,8 +53,8 @@ public class TemporalSourceOptions extends AbstractTransformationSourceOptions public boolean isApplicableForMimetype(String sourceMimetype) { return ((sourceMimetype != null && - sourceMimetype.startsWith(MIMETYPE_VIDEO_PREFIX) || - sourceMimetype.startsWith(MIMETYPE_AUDIO_PREFIX)) || + sourceMimetype.startsWith(MimetypeMap.PREFIX_VIDEO) || + sourceMimetype.startsWith(MimetypeMap.PREFIX_AUDIO)) || super.isApplicableForMimetype(sourceMimetype)); }