Author: mfortun Date: 2011-08-26 17:11:47 +0200 (Fri, 26 Aug 2011) New Revision: 1189 Url: http://nuiton.org/repositories/revision/wikitty/1189 Log: *conf option to constant Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-26 15:09:10 UTC (rev 1188) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-26 15:11:47 UTC (rev 1189) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.publication; -import java.io.File; -import java.io.FileFilter; + import java.io.IOException; import java.io.InputStream; import java.io.StringReader; @@ -11,7 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; - import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -26,10 +24,11 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.operators.Element; -import temp.Mainer; public class CodeDecorator { + protected static final String FILTERS_FILE_NAME_REGEX = "filters-\\w*\\.properties"; + static private Log log = LogFactory.getLog(CodeDecorator.class); /* @@ -52,7 +51,8 @@ static { - InputStream input = CodeDecorator.class.getResourceAsStream("/"+filtersOptionDirName + filtersOptionDefault); + InputStream input = CodeDecorator.class.getResourceAsStream("/" + + filtersOptionDirName + filtersOptionDefault); Properties mimeProps = new Properties(); @@ -99,11 +99,10 @@ // add basic value js and htmlp filtersOptions.put(defaultFilterOption.getKey(), defaultFilterOption); try { - List<URL> urlsRessourceFilters = Resource.getResources( filtersOptionDirName +"filters-\\w*\\.properties", - Thread.currentThread().getContextClassLoader() - ); - ///"+filtersOptionDirName+"/filters-\\w*\\.properties" - + List<URL> urlsRessourceFilters = Resource.getResources( + filtersOptionDirName + FILTERS_FILE_NAME_REGEX, Thread + .currentThread().getContextClassLoader()); + // /"+filtersOptionDirName+"/filters-\\w*\\.properties" System.out.println(urlsRessourceFilters); for (URL propFil : urlsRessourceFilters) { @@ -111,7 +110,7 @@ Properties props = new Properties(); InputStream propsstrem = propFil.openStream(); props.load(propsstrem); - + // parse properties FilterOption option = new FilterOption(); option.setOpeningTemplate(props @@ -232,7 +231,6 @@ String mimeKeyOption = helper.pubUiMimeToConverterOption(mime); return filtersOptions.containsKey(mimeKeyOption); } - public boolean isDecorated(String string) { return filtersOptions.containsKey(string);