diff --git a/buildSrc/src/main/scala/com/riege/jasperservice/backend/PDFProducer.scala b/buildSrc/src/main/scala/com/riege/jasperservice/backend/PDFProducer.scala index f2753a4..530ed5e 100644 --- a/buildSrc/src/main/scala/com/riege/jasperservice/backend/PDFProducer.scala +++ b/buildSrc/src/main/scala/com/riege/jasperservice/backend/PDFProducer.scala @@ -5,29 +5,25 @@ package com.riege.jasperservice.backend -import java.io.BufferedOutputStream -import java.net.{URL, URLClassLoader} -import java.util - -import scala.util.control.NonFatal - import akka.actor.{Actor, ActorLogging, Props, Status} - +import better.files.{File, _} +import com.lowagie.text.pdf.PdfWriter import com.riege.jasperservice.FileUtils import com.riege.jasperservice.backend.FormsLoader.PROPERTY_FORM_DIR import com.riege.jasperservice.functions.JasperServiceFunctions import com.riege.jasperservice.model.{PDFDocument, PDFRawData, Simulations} - -import better.files.{File, _} -import com.lowagie.text.DocumentException -import com.lowagie.text.pdf.PdfWriter import net.sf.jasperreports.engine.data.JRMapCollectionDataSource import net.sf.jasperreports.engine.export.JRPdfExporter -import net.sf.jasperreports.engine.{JRParameter, JRPrintText, JasperFillManager, JasperPrint, JasperReport} +import net.sf.jasperreports.engine.{JRParameter, JasperFillManager, JasperPrint, JasperReport} import net.sf.jasperreports.export.`type`.PdfaConformanceEnum import net.sf.jasperreports.export.{SimpleExporterInput, SimpleOutputStreamExporterOutput, SimplePdfExporterConfiguration} import org.apache.batik.ext.awt.image.spi.ImageTagRegistry +import java.io.BufferedOutputStream +import java.net.{URL, URLClassLoader} +import java.util +import scala.util.control.NonFatal + object PDFProducer { val PDF_PERMISSIONS: Int = PdfWriter.ALLOW_PRINTING | @@ -74,7 +70,7 @@ class PDFProducer( val ctx = data.context val formLoader = new FormsLoader(ctx, formsStore) val form = formLoader.getForm(data.formName, Option(ctx.locale)) - val exporter = getJRExporter(data) + val exporter = new JRPdfExporter val printable = createPrintable(data, formLoader, form) val ec = new SimplePdfExporterConfiguration if (data.pdfa) { @@ -131,25 +127,6 @@ class PDFProducer( } } - private def getJRExporter(data: PDFRawData): JRPdfExporter = { - if (data.context.isCMRWaybill) { - // CMR printing requires special handling. - new JRPdfExporter() { - - @throws[DocumentException] - override def exportText(text: JRPrintText): Unit = { - if (text.getFontName.contains("Liberation Mono")) { - pdfContentByte.setHorizontalScaling(118.0f) - } - super.exportText(text) - } - - } - } else { - new JRPdfExporter - } - } - private def createPrintable( data: PDFRawData, formLoader: FormsLoader,