# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Users/mkleint/src/core-main # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java --- libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java Base (BASE) +++ libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java Locally Modified (Based On LOCAL) @@ -35,10 +35,13 @@ import freemarker.template.TemplateExceptionHandler; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; +import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.io.Writer; +import java.net.URI; +import java.net.URISyntaxException; import java.nio.charset.Charset; import java.util.Enumeration; import java.util.LinkedHashSet; @@ -53,6 +56,7 @@ import org.openide.filesystems.FileStateInvalidException; import org.openide.filesystems.FileUtil; import org.openide.util.Exceptions; +import org.openide.util.Utilities; /** * Velocity templates resource loader rewritten for Freemarker to @@ -92,6 +96,12 @@ private FileObject getFile(String name) { FileObject tmp = (getFolder() == null) ? null : getFolder().getFileObject(name); + if (tmp == null) { + try { + tmp = FileUtil.toFileObject(FileUtil.normalizeFile(Utilities.toFile(new URI(name)))); + } catch (URISyntaxException ex) { + } + } return tmp; }