detached connectors

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

1 files changed, 20 insertions, 16 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
index e510d53..d67bb90 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureObject.java
@@ -49,6 +49,7 @@ import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;
 import at.knowcenter.wag.egov.egiz.ldap.api.LDAPAPIException;

 import at.knowcenter.wag.egov.egiz.ldap.api.LDAPAPIFactory;

 import at.knowcenter.wag.egov.egiz.ldap.client.LDAPIssuerNameFilter;

+import at.knowcenter.wag.egov.egiz.sig.sigkz.SigKZIDHelper;

 import at.knowcenter.wag.egov.egiz.table.Entry;

 import at.knowcenter.wag.egov.egiz.table.Style;

 import at.knowcenter.wag.egov.egiz.table.Table;

@@ -732,7 +733,10 @@ public class SignatureObject implements Serializable
    */

   public void setSignationIDs(String sigIds)

   {

-    setSigValue(SignatureTypes.SIG_ID, sigIds);

+    if (sigIds != null)

+    {

+      setSigValue(SignatureTypes.SIG_ID, sigIds);

+    }

   }

 

   // /**

@@ -838,7 +842,18 @@ public class SignatureObject implements Serializable
    */

   public boolean isMOASigned()

   {

-    return getSignationIds() == null;

+    try

+    {

+    PdfASID sig_kz = getKZ();

+    String sig_id = getSignationIds();

+    return SigKZIDHelper.isMOASigned(sig_kz, sig_id);

+    //return getSignationIds() == null;

+    }

+    catch (InvalidIDException e)

+    {

+      logger_.error(e);

+      return false;

+    }

   }

 

   /**

@@ -857,13 +872,7 @@ public class SignatureObject implements Serializable
     {

       e.printStackTrace();

     }

-    if (kz == null)

-    {

-      return true; // must be an old Signature

-    }

-

-    boolean textual = kz.getType().equals(SignatorFactory.TYPE_TEXTUAL);

-    return textual;

+    return SigKZIDHelper.isTextual(kz);

   }

 

   /**

@@ -882,13 +891,8 @@ public class SignatureObject implements Serializable
     {

       e.printStackTrace();

     }

-    if (kz == null)

-    {

-      return false; // must be an old Signature

-    }

-

-    boolean binary = kz.getType().equals(SignatorFactory.TYPE_BINARY);

-    return binary;

+ 

+    return SigKZIDHelper.isBinary(kz);

   }

 

   /**