From 36ef46a824cc6e83dfa01c298b369d480bb5e46a Mon Sep 17 00:00:00 2001 From: edgar Date: Tue, 3 Jan 2017 11:49:56 +0000 Subject: [PATCH] issue #8301 - fonte arial para sanserif git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64436 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../render/RenderRelatorioJasper.java | 3 +- .../RelatorioTabelaPrecoArtesp.jasper | Bin 32660 -> 34326 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 48 ++++++++++-------- .../relatorios/utilitarios/Relatorio.java | 12 +++++ 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java index 19e952106..cb389aba2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java @@ -58,9 +58,10 @@ public class RenderRelatorioJasper { Locale locale = LocaleUtil.getLocale(); try { - + ResourceBundle resource = ResourceBundle.getBundle("com.rjconsultores.ventaboletos.relatorios.internacionalizacao." + this.relatorio.getNome(), locale); this.relatorio.getParametros().put(JRParameter.REPORT_RESOURCE_BUNDLE, resource); + this.relatorio.getParametros().put("BASE_DIR", getClass().getResource(this.relatorio.getBaseDir()).getPath()); /* Adicionar o arquivo de internacionalização para o subreporte quando informado */ if(this.relatorio.getNomeSubReporte() != null && this.relatorio.getNomeSubReporte().length > 0) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index 90f6af31d8f46e92bcdcdaf0c881fbe847926bc5..e06d1107bcae5e19535ed10275f2ad02fe904593 100644 GIT binary patch delta 6699 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 E4W18ntpET3 delta 6022 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 MvX4Ce;eCt#1 - + @@ -38,14 +38,14 @@ - + - + @@ -57,7 +57,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -267,14 +267,14 @@ - + - + @@ -284,18 +284,22 @@ - + + + + + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java index e18d53c3f..c7304dd83 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java @@ -19,6 +19,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public abstract class Relatorio { private static Logger log = Logger.getLogger(Relatorio.class); + private static final String DEFAULT_BASE_DIR = "/com/rjconsultores/ventaboletos/relatorios"; private Connection conexao; protected Map parametros; @@ -28,6 +29,7 @@ public abstract class Relatorio { private Set infoMsg; private JRBeanCollectionDataSource collectionDataSource; private String[] nomeSubReporte; + private String baseDir; protected Relatorio(Map parametros, Connection conexao) { this.parametros = parametros; @@ -157,4 +159,14 @@ public abstract class Relatorio { log.error("Erro ao fechar a conexion", e); } } + + public String getBaseDir() { + //setado como parametro em RenderRelatorioJasper com a chave "BASE_DIR" + return baseDir == null ? DEFAULT_BASE_DIR : baseDir; + } + + public void setBaseDir(String baseDir) { + this.baseDir = baseDir; + } + } \ No newline at end of file