minor changes

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@122 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 4 insertions, 15 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
index e4107eb..cdc0aa8 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
@@ -62,6 +62,7 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
 import at.knowcenter.wag.egov.egiz.sig.connectors.Connector;

 import at.knowcenter.wag.egov.egiz.sig.connectors.ConnectorChooser;

 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;

+import at.knowcenter.wag.egov.egiz.sig.signatureobject.SignatureObjectHelper;

 import at.knowcenter.wag.egov.egiz.tools.CodingHelper;

 import at.knowcenter.wag.egov.egiz.tools.Normalizer;

 import at.knowcenter.wag.exactparser.ParseDocument;

@@ -846,14 +847,8 @@ public abstract class PdfAS
       }

     }

 

-    SignSignatureObject so = new SignSignatureObject();

-    so.date = so_to_be_verified.getSignationDate();

-    so.signatureValue = so_to_be_verified.getSignationValue();

-    so.issuer = so_to_be_verified.getSignationIssuer();

-    so.x509Certificate = so_to_be_verified.getX509Cert().getX509Certificate();

-    so.id = so_to_be_verified.getSignationIds();

-    so.kz = so_to_be_verified.getKZ() == null ? null : so_to_be_verified.getKZ().toString();

-

+    SignSignatureObject so = SignatureObjectHelper.convertSignatureObjectToSignSignatureObject(so_to_be_verified);

+ 

     String profile = so_to_be_verified.getSignatureTypeDefinition().getType();

     Connector c = ConnectorChooser.chooseCommandlineConnectorForVerify(connector, so_to_be_verified.getKZ(), so.id, profile);

 

@@ -907,13 +902,7 @@ public abstract class PdfAS
       }

     }

 

-    SignSignatureObject so = new SignSignatureObject();

-    so.date = so_to_be_verified.getSignationDate();

-    so.signatureValue = so_to_be_verified.getSignationValue();

-    so.issuer = so_to_be_verified.getSignationIssuer();

-    so.x509Certificate = so_to_be_verified.getX509Cert().getX509Certificate();

-    so.id = so_to_be_verified.getSignationIds();

-    so.kz = so_to_be_verified.getKZ() == null ? null : so_to_be_verified.getKZ().toString();

+    SignSignatureObject so = SignatureObjectHelper.convertSignatureObjectToSignSignatureObject(so_to_be_verified);

 

     String profile = so_to_be_verified.getSignatureTypeDefinition().getType();

     Connector c = ConnectorChooser.chooseWebConnectorForVerify(connector, so_to_be_verified.getKZ(), so.id, profile, loc_ref);