Author: mfortun Date: 2011-08-01 15:25:39 +0200 (Mon, 01 Aug 2011) New Revision: 1102 Url: http://nuiton.org/repositories/revision/wikitty/1102 Log: * improve mimeType handling Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-01 09:17:38 UTC (rev 1101) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-01 13:25:39 UTC (rev 1102) @@ -24,9 +24,7 @@ */ package org.nuiton.wikitty.publication; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.script.ScriptEngineManager; @@ -48,6 +46,7 @@ */ protected Map<String, String> mapExtensionMime; protected ScriptEngineManager manager; + protected UiCodeDecorator decorator; /** * The default mime type @@ -56,7 +55,7 @@ public MimeTypePubHelper() { this.mapExtensionMime = new HashMap<String, String>(); - + decorator = new UiCodeDecorator(); manager = ScriptEvaluator.getScriptEnginManager(null); @@ -104,7 +103,10 @@ */ public boolean isPubTextMime(String mimeType) { // will check if there is an engine for the mimetype - return manager.getEngineByMimeType(mimeType)!=null; + + boolean result = manager.getEngineByMimeType(mimeType)!=null; + result = result || decorator.isMimeTypeUi(mimeType); + return result; } /** Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-01 09:17:38 UTC (rev 1101) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-01 13:25:39 UTC (rev 1102) @@ -137,22 +137,20 @@ return false; } String mime = WikittyPubTextHelper.getMimeType(wikitty); - String[] mimeParsed = StringUtil.split(mime, MIME_SEP); - boolean result = firstPartMimeHandled.contains(mimeParsed[0]); - - return result; + return isMimeTypeUi(mime); } public boolean isTransformationNeeded(WikittyPubData wikitty) { String mime = wikitty.getMimeType(); + return isMimeTypeUi(mime); + } + + + public boolean isMimeTypeUi(String mime){ String[] mimeParsed = StringUtil.split(mime, MIME_SEP); boolean result = firstPartMimeHandled.contains(mimeParsed[0]); - return result; } - - - }