minor changes

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

1 files changed, 4 insertions, 12 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
index 8fac221..e8443d7 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
@@ -19,7 +19,6 @@ package at.knowcenter.wag.egov.egiz.web;
 

 import java.io.IOException;

 import java.net.URL;

-import java.util.ArrayList;

 import java.util.List;

 import java.util.Properties;

 

@@ -31,14 +30,13 @@ import at.knowcenter.wag.egov.egiz.exceptions.NormalizeException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;

 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;

 import at.knowcenter.wag.egov.egiz.pdf.SignatureHolder;

-import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;

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

-import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

 import at.knowcenter.wag.egov.egiz.sig.SignatureData;

 import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;

 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;

-import at.knowcenter.wag.egov.egiz.sig.connectors.bku.LocRefDetachedBKUConnector;

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

+import at.knowcenter.wag.egov.egiz.sig.connectors.LocalConnector;

 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;

 

 /**

@@ -190,13 +188,7 @@ public abstract class LocalRequestHelper
         sd = new SignatureDataImpl(text_to_be_verified.getBytes("UTF-8"), "text/plain", "UTF-8");

       }

 

-      SignSignatureObject so = new SignSignatureObject();

-      so.date = s.getSignationDate();

-      so.signatureValue = s.getSignationValue();

-      so.issuer = s.getSignationIssuer();

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

-      so.id = s.getSignationIds();

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

+      SignSignatureObject so = SignatureObjectHelper.convertSignatureObjectToSignSignatureObject(s);

 

       LocalConnector local_conn = ConnectorChooser.chooseLocalConnectorForVerify(si.connector, s.getKZ(), so.id, si.type, loc_ref_url);

       String request_string = local_conn.prepareVerifyRequest(sd, so);