From 4c4bd7e74bc42a716dd056e51b205d609b6e8726 Mon Sep 17 00:00:00 2001 From: edgar Date: Mon, 2 Jan 2017 19:51:10 +0000 Subject: [PATCH] issue #8301 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64420 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioTabelaPrecoArtesp.jasper | Bin 34802 -> 32660 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 9 --------- .../relatorios/utilitarios/Relatorio.java | 12 ------------ 3 files changed, 21 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index 192795fab7938c8e85f3801a761d9baf2544cbeb..90f6af31d8f46e92bcdcdaf0c881fbe847926bc5 100644 GIT binary patch delta 3458 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml index 73f9d8bd3..ac0edcb49 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml @@ -50,11 +50,6 @@ - - - - - @@ -293,10 +288,6 @@ - - - - diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java index cc97e90fd..e18d53c3f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java @@ -19,7 +19,6 @@ 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; @@ -29,7 +28,6 @@ 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; @@ -159,14 +157,4 @@ 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 getClass().getResource(baseDir == null ? DEFAULT_BASE_DIR : baseDir).getPath(); - } - - public void setBaseDir(String baseDir) { - this.baseDir = baseDir; - } - } \ No newline at end of file