From c4e41301d0746ce57044a3aa41375cff3a9f2b5e Mon Sep 17 00:00:00 2001 From: Christian Maierhofer Date: Wed, 8 Jun 2016 08:12:21 +0200 Subject: initial pdfbox-2 commit --- .../java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java | 8 ++-- .../pdfas/lib/impl/stamping/StamperFactory.java | 47 ---------------------- 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java (limited to 'pdf-as-lib/src/main') diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java index fe7f72ab..966d6934 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java @@ -133,7 +133,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, signPreProcessing(parameter); // allocated Backend - PDFASBackend backend = BackendLoader.getPDFASBackend(); + PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); if (backend == null) { throw new PDFASError(ERROR_NO_BACKEND); @@ -258,7 +258,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, verifyPreProcessing(parameter); // allocated Backend - PDFASBackend backend = BackendLoader.getPDFASBackend(); + PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); if (backend == null) { throw new PDFASError(ERROR_NO_BACKEND); @@ -291,7 +291,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, signPreProcessing(parameter); // allocated Backend - PDFASBackend backend = BackendLoader.getPDFASBackend(); + PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); if (backend == null) { throw new PDFASError(ERROR_NO_BACKEND); @@ -527,7 +527,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, iaikCert = (X509Certificate) cert; } // allocated Backend - PDFASBackend backend = BackendLoader.getPDFASBackend(); + PDFASBackend backend = BackendLoader.getPDFASBackend(parameter.getConfiguration()); ISettings settings = (ISettings) parameter.getConfiguration(); status = new OperationStatus(settings, parameter, backend); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java deleted file mode 100644 index ffed4da6..00000000 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/StamperFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright 2014 by E-Government Innovation Center EGIZ, Graz, Austria - * PDF-AS has been contracted by the E-Government Innovation Center EGIZ, a - * joint initiative of the Federal Chancellery Austria and Graz University of - * Technology. - * - * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by - * the European Commission - subsequent versions of the EUPL (the "Licence"); - * You may not use this work except in compliance with the Licence. - * You may obtain a copy of the Licence at: - * http://www.osor.eu/eupl/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the Licence is distributed on an "AS IS" basis, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the Licence for the specific language governing permissions and - * limitations under the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text - * file for details on the various modules and licenses. - * The "NOTICE" text file is part of the distribution. Any derivative works - * that you distribute must include a readable copy of the "NOTICE" text file. - ******************************************************************************/ -package at.gv.egiz.pdfas.lib.impl.stamping; - -import at.gv.egiz.pdfas.common.exceptions.PdfAsException; -import at.gv.egiz.pdfas.common.settings.ISettings; - -public class StamperFactory { - - //public static final String DEFAULT_STAMPER_CLASS = "at.gv.egiz.pdfas.stmp.itext.ITextStamper"; - public static final String DEFAULT_STAMPER_CLASS = "at.gv.egiz.pdfas.lib.impl.stamping.pdfbox.PdfBoxStamper"; - - public static IPDFStamper createDefaultStamper(ISettings settings) throws PdfAsException { - try { - Class cls = Class.forName(DEFAULT_STAMPER_CLASS); - Object st = cls.newInstance(); - if (!(st instanceof IPDFStamper)) - throw new ClassCastException(); - IPDFStamper stamper = (IPDFStamper) st; - stamper.setSettings(settings); - return stamper; - } catch (Throwable e) { - throw new PdfAsException("error.pdf.stamp.10", e); - } - } -} -- cgit v1.2.3