Author: dandre Date: Mon Nov 18 01:17:48 2013 New Revision: 4669 Log: fix gedart resource not founf on windows
Modified: trunk/AncestrisCore/reports/nbproject/genfiles.properties trunk/AncestrisCore/reports/nbproject/project.xml trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java trunk/AncestrisCore/reports/src/ancestris/reports/gedart/GedartTemplate.java Modified: trunk/AncestrisCore/reports/nbproject/genfiles.properties ============================================================================== --- trunk/AncestrisCore/reports/nbproject/genfiles.properties (original) +++ trunk/AncestrisCore/reports/nbproject/genfiles.properties Mon Nov 18 01:17:48 2013 @@ -3,6 +3,6 @@ [email protected] # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=800a73f3 +nbproject/build-impl.xml.data.CRC32=1741dfae nbproject/build-impl.xml.script.CRC32=cb6f2dc2 nbproject/[email protected] Modified: trunk/AncestrisCore/reports/nbproject/project.xml ============================================================================== --- trunk/AncestrisCore/reports/nbproject/project.xml (original) +++ trunk/AncestrisCore/reports/nbproject/project.xml Mon Nov 18 01:17:48 2013 @@ -39,6 +39,14 @@ </run-dependency> </dependency> <dependency> + <code-name-base>org.openide.modules</code-name-base> + <build-prerequisite/> + <compile-dependency/> + <run-dependency> + <specification-version>7.27.1</specification-version> + </run-dependency> + </dependency> + <dependency> <code-name-base>org.openide.util</code-name-base> <build-prerequisite/> <compile-dependency/> Modified: trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java ============================================================================== --- trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java (original) +++ trunk/AncestrisCore/reports/src/ancestris/reports/gedart/DocReport.java Mon Nov 18 01:17:48 2013 @@ -31,6 +31,7 @@ import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.tools.generic.DateTool; import org.apache.velocity.tools.generic.ListTool; +import org.openide.modules.Places; // FIXME: refactor this class, remove @suppresswarning @SuppressWarnings("unchecked") @@ -39,8 +40,9 @@ private static VelocityEngine engine = new VelocityEngine(); private Writer out; public Charset CHARSET; - - + private static final File TEMPLATE_DIR = Places.getUserDirectory(); + + DocReport(GedartTemplates template, String encoding) { try { CHARSET = Charset.forName(encoding);} catch (Exception e) {CHARSET = Charset.forName("ISO-8859-1");} @@ -50,7 +52,7 @@ // Velocity.setProperty("class.resource.loader.class", // "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); // Velocity.setProperty("class.resource.loader.cache","true"); - engine.setProperty("file.resource.loader.path","/"); + engine.setProperty("file.resource.loader.path", TEMPLATE_DIR.getPath()); engine.setProperty("file.resource.loader.cache","true"); Modified: trunk/AncestrisCore/reports/src/ancestris/reports/gedart/GedartTemplate.java ============================================================================== --- trunk/AncestrisCore/reports/src/ancestris/reports/gedart/GedartTemplate.java (original) +++ trunk/AncestrisCore/reports/src/ancestris/reports/gedart/GedartTemplate.java Mon Nov 18 01:17:48 2013 @@ -4,6 +4,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.TreeMap; +import org.openide.modules.Places; class GedartTemplate extends Object implements Cloneable{ @@ -60,7 +61,10 @@ return context.get(ctx); } public String getPath() { - return path; + //XXX: this is a quick fix. Gedart will use velocity renderer + // Make template path relative to userdir + final String base = Places.getUserDirectory().getAbsolutePath(); + return path.substring(base.length()+1); } public String getFormat() { return format; --------------------------------------------------------------------- Site Web Ancestris : http://www.ancestris.org <*> Pour vous desinscrire de cette liste, envoyez un mail a : [email protected] <*> Pour obtenir de l'aide sur les commandes de la liste : [email protected] Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira d'envoyer le message : [email protected]
