From 3e32cdf2bb1918cd02be37873e2e6282b697e32e Mon Sep 17 00:00:00 2001 From: tknall Date: Fri, 3 Dec 2010 11:46:16 +0000 Subject: Minor updates (log messages...) git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@667 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java | 5 ++--- .../at/gv/egiz/pdfas/commandline/CommandlineConnectorChooser.java | 4 ++-- src/main/java/at/gv/egiz/pdfas/exceptions/ErrorCode.java | 2 +- src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/main/java/at/gv/egiz') diff --git a/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java b/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java index 81e9005..3025e8a 100644 --- a/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java +++ b/src/main/java/at/gv/egiz/pdfas/api/commons/DynamicSignatureProfileImpl.java @@ -168,7 +168,7 @@ public class DynamicSignatureProfileImpl implements DynamicSignatureProfile { SignatureTypes.getInstance().addSignatureType(this.name); store(); } catch (Exception e) { - throw new RuntimeException("schas", e); + throw new RuntimeException(e); } } @@ -184,9 +184,8 @@ public class DynamicSignatureProfileImpl implements DynamicSignatureProfile { SignatureTypes.getInstance().removeSignatureType(this.name); remove(); - System.err.println("DISPOSED ddd"); } catch (Exception e) { - throw new RuntimeException("schas", e); + throw new RuntimeException(e); } } diff --git a/src/main/java/at/gv/egiz/pdfas/commandline/CommandlineConnectorChooser.java b/src/main/java/at/gv/egiz/pdfas/commandline/CommandlineConnectorChooser.java index 50678db..a23c9e3 100644 --- a/src/main/java/at/gv/egiz/pdfas/commandline/CommandlineConnectorChooser.java +++ b/src/main/java/at/gv/egiz/pdfas/commandline/CommandlineConnectorChooser.java @@ -9,6 +9,7 @@ import at.gv.egiz.pdfas.framework.ConnectorFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import at.knowcenter.wag.egov.egiz.PdfAS; import at.knowcenter.wag.egov.egiz.PdfASID; import at.knowcenter.wag.egov.egiz.exceptions.ConnectorException; import at.knowcenter.wag.egov.egiz.framework.SignatorFactory; @@ -118,8 +119,7 @@ public class CommandlineConnectorChooser return chooseDetachedMultipartConnector(connectorType); } - - throw new ConnectorException(ErrorCode.UNSUPPORTED_SIGNATURE_METHOD, "The SIG_KZ version '" + sig_kz.getVersion() + "' is unknown."); + throw new ConnectorException(ErrorCode.UNSUPPORTED_SIGNATURE, "The SIG_KZ version '" + sig_kz.getVersion() + "' is unknown. Please get a new version of PDF-AS. Your version is: " + PdfAS.PDFAS_VERSION); } protected static String chooseEnvelopingBase64ConnectorOld(String sig_app) throws ConnectorException diff --git a/src/main/java/at/gv/egiz/pdfas/exceptions/ErrorCode.java b/src/main/java/at/gv/egiz/pdfas/exceptions/ErrorCode.java index 89c4e07..aa90330 100644 --- a/src/main/java/at/gv/egiz/pdfas/exceptions/ErrorCode.java +++ b/src/main/java/at/gv/egiz/pdfas/exceptions/ErrorCode.java @@ -53,7 +53,7 @@ public final class ErrorCode public static final int NON_BINARY_SIGNATURES_PRESENT = 317; public static final int UNSUPPORTED_REPLACES_NAME = 318; - public static final int UNSUPPORTED_SIGNATURE_METHOD = 319; + public static final int UNSUPPORTED_SIGNATURE = 319; public static final int SIGNATURE_VERIFICATION_NOT_SUPPORTED = 371; public static final int INVALID_SIGNING_TIME = 372; diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java index 8816b1c..c0639a3 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java @@ -340,7 +340,6 @@ public class PdfAsObject implements PdfAs AnalyzeParameters ap = new AnalyzeParameters(); fillAnalyzeParametersWithVerifyParameters(ap, verifyParameters); AnalyzeResult analyzeResult = analyze(ap); - System.err.println(ToStringBuilder.reflectionToString(analyzeResult)); if (verifyParameters.getSignatureToVerify() != Constants.VERIFY_ALL) { -- cgit v1.2.3