From 4269b33cdf763cfd1111d0b33d6ae82004b39cf6 Mon Sep 17 00:00:00 2001 From: Martin Goellnitz Date: Tue, 19 Feb 2019 18:29:05 +0100 Subject: [PATCH] refs #6 add svg support in three places - hopefully nothing is missing --- core/src/org/tangram/Constants.java | 4 +++- .../view/AbstractRepositoryTemplateResolver.java | 3 ++- mutable/src/org/tangram/mutable/CodeHelper.java | 12 +++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/core/src/org/tangram/Constants.java b/core/src/org/tangram/Constants.java index 9f80be71..39fa9d80 100644 --- a/core/src/org/tangram/Constants.java +++ b/core/src/org/tangram/Constants.java @@ -1,6 +1,6 @@ /** * - * Copyright 2011-2015 Martin Goellnitz + * Copyright 2011-2019 Martin Goellnitz * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -54,6 +54,8 @@ public final class Constants { public static final String MIME_TYPE_MARKDOWN = "text/x-markdown"; + public static final String MIME_TYPE_SVG = "image/svg+xml"; + /** * Default date format string for http headers and the like. */ diff --git a/core/src/org/tangram/view/AbstractRepositoryTemplateResolver.java b/core/src/org/tangram/view/AbstractRepositoryTemplateResolver.java index a558de3d..7aab944a 100644 --- a/core/src/org/tangram/view/AbstractRepositoryTemplateResolver.java +++ b/core/src/org/tangram/view/AbstractRepositoryTemplateResolver.java @@ -1,6 +1,6 @@ /** * - * Copyright 2013-2016 Martin Goellnitz + * Copyright 2013-2019 Martin Goellnitz * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -52,6 +52,7 @@ public AbstractRepositoryTemplateResolver() { supportedContentTypes = new HashSet<>(); supportedContentTypes.add(Constants.MIME_TYPE_HTML); supportedContentTypes.add(Constants.MIME_TYPE_XML); + supportedContentTypes.add(Constants.MIME_TYPE_SVG); } // AbstractRepositoryTemplateResolver() diff --git a/mutable/src/org/tangram/mutable/CodeHelper.java b/mutable/src/org/tangram/mutable/CodeHelper.java index b42b99e0..68c4530a 100644 --- a/mutable/src/org/tangram/mutable/CodeHelper.java +++ b/mutable/src/org/tangram/mutable/CodeHelper.java @@ -1,6 +1,6 @@ /* * - * Copyright 2013-2016 Martin Goellnitz + * Copyright 2013-2019 Martin Goellnitz * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -53,6 +53,7 @@ private CodeHelper() { MIME_TYPES.add(Constants.MIME_TYPE_XML); MIME_TYPES.add(Constants.MIME_TYPE_HTML); MIME_TYPES.add(Constants.MIME_TYPE_CSS); + MIME_TYPES.add(Constants.MIME_TYPE_SVG); MIME_TYPES.add(Constants.MIME_TYPE_JS); MIME_TYPES.add(Constants.MIME_TYPE_GROOVY); MIME_TYPES.add(Constants.MIME_TYPE_MARKDOWN); @@ -85,6 +86,9 @@ public static String getExtension(String mimeType) { if (Constants.MIME_TYPE_XML.equals(mimeType)) { mimeType = "text/vtl"; } // if + if (Constants.MIME_TYPE_SVG.equals(mimeType)) { + mimeType = "text/vtl"; + } // if if (Constants.MIME_TYPE_JS.equals(mimeType)) { mimeType = "text/js"; } // if @@ -120,6 +124,9 @@ public static String getFolder(String mimeType) { if (Constants.MIME_TYPE_XML.equals(mimeType)) { mimeType = "text/velocity-xml"; } // if + if (Constants.MIME_TYPE_SVG.equals(mimeType)) { + mimeType = "text/velocity-svg"; + } // if if (Constants.MIME_TYPE_JS.equals(mimeType)) { mimeType = "text/js"; } // if @@ -153,6 +160,9 @@ public static String getMimetype(String directoryName) { if ("css".equals(directoryName)) { result = Constants.MIME_TYPE_CSS; } // if + if ("velocity-svg".equals(directoryName)) { + result = Constants.MIME_TYPE_SVG; + } // if if ("js".equals(directoryName)) { result = Constants.MIME_TYPE_JS; } // if