knowcenter adjustments from 2006-12-01 merged

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

3 files changed, 84 insertions, 66 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 b26abd8..f2e409f 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
@@ -13,18 +13,16 @@
  * LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS

  * DERIVATIVES.

  * 

- * $Id: SignatureObject.java,v 1.5 2006/08/25 17:09:41 wprinz Exp $

+ * $Id: SignatureObject.java,v 1.7 2006/10/31 08:18:56 wprinz Exp $

  */

 package at.knowcenter.wag.egov.egiz.sig;

 

-import java.awt.Color;

 import java.io.File;

 import java.io.FileOutputStream;

 import java.io.IOException;

 import java.io.Serializable;

 import java.io.UnsupportedEncodingException;

 import java.util.ArrayList;

-import java.util.Arrays;

 import java.util.Hashtable;

 import java.util.Iterator;

 import java.util.List;

@@ -37,7 +35,6 @@ import org.apache.log4j.Logger;
 import at.knowcenter.wag.egov.egiz.PdfASID;

 import at.knowcenter.wag.egov.egiz.cfg.ConfigLogger;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

-import at.knowcenter.wag.egov.egiz.exceptions.ErrorCodeException;

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

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

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

@@ -248,7 +245,8 @@ public class SignatureObject implements Serializable
     defaultImageStyle_.setPadding(3);

     defaultImageStyle_.setHAlign(Style.CENTER);

     defaultImageStyle_.setVAlign(Style.MIDDLE);

-    defaultImageStyle_.setBgColor(new Color(255, 255, 255));

+//    defaultImageStyle_.setBgColor(new Color(255, 255, 255));

+    defaultImageStyle_.setBgColor(null);

 

     defaultCaptionStyle_.setHAlign(Style.CENTER);

     defaultCaptionStyle_.setVAlign(Style.MIDDLE);

@@ -1407,10 +1405,10 @@ public class SignatureObject implements Serializable
           }

         }

         // value = new String(CodingHelper.encodeUTF8(value));

-        if (logger_.isDebugEnabled())

-        {

-          logger_.debug("key:" + key + " value:" + value);

-        }

+//        if (logger_.isDebugEnabled())

+//        {

+//          logger_.debug("key:" + key + " value:" + value);

+//        }

         setSigValue(key, value);

       }

     }

@@ -1532,57 +1530,6 @@ public class SignatureObject implements Serializable
     return strg;

   }

 

-  // /**

-  // * Used only for testing!

-  // *

-  // * @param args

-  // */

-  // public static void main(String[] args)

-  // {

-  //    

-  // String sig_strg1 = " Verfahren

-  // urn:publicid:egov.graz.gv.at:AS+bescheid+tb-1.0 Datum 2006-01-18T14:57:33

-  // Inhaber A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH ,

-  // a-sign-corporate-light-02 Aussteller

-  // CN=a-sign-corporate-light-02,OU=a-sign-corporate-light-02,O=A-Trust Ges. f.

-  // Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT Seriennummer 86710

-  // Signaturwert

-  // p/EdZadVe0LPoWtvkMQmsCtH7nwH5Bm9hV0+lfSdT8k4oeKlNtqwNIYFm1mpGd3B

-  // bgggEtSvth/sbsm0BYMse33j3lYxYvT+kdui8QNa+iHCm23S2YdvzrTtay6/DSgZ

-  // 48c7vmMR7wOKNZsVx2SrZgoD4XK+xag9CCsbjGeEyyM= Hinweis: Dieses Dokument ist

-  // nur in elektronischer Form gültig!";

-  // String sig_strg2 = " Signiert von BMI SU-ZMR Datum 2006-02-08T15:03:07

-  // Zertifikat A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,

-  // a-sign-corporate-light-02, AT (80524) Verfahren

-  // urn:publicid:bmi.gv.at:ZP+bescheid+mb-1.2 Seriennummer 1234 56789

-  // Signaturwert

-  // c27g+sQ57rMYg6MaOjQ206VSQzkSszR/715RO/ZR3UYptP+YST7l9BEX1vUBi+3W

-  // h4oDEJtHJ+ubWfiu7yG8xWzmtCFwJLe1Ubg94v8SWCUgd2xg/PsN52+K6wolZF/i

-  // 0M1RTzFA2QisL3xKSVSw8h0pGp0r3/kigcQaCJ7AH1M= Weitere Hinweise zu dieser

-  // elektronischen Meldebestätigung finden Sie unter

-  // https://meldung.cio.gv.at/egovMB/info/mb_info.html,Informationen zur

-  // Signatur unter https://meldung.cio.gv.at/egovMB/info/mb_sig.html";

-  // String sig_strg3 = "Signaturwert

-  // c27g+sQ57rMYg6MaOjQ206VSQzkSszR/715RO/ZR3UYptP+YST7l9BEX1vUBi+3W

-  // h4oDEJtHJ+ubWfiu7yG8xWzmtCFwJLe1Ubg94v8SWCUgd2xg/PsN52+K6wolZF/i

-  // 0M1RTzFA2QisL3xKSVSw8h0pGp0r3/kigcQaCJ7AH1M= Datum 2006-02-08T15:03:07

-  // Unterzeichner Franz Morak Aussteller

-  // CN=a-sign-corporate-light-02,OU=a-sign-corporate-light-02,O=A-Trust Ges. f.

-  // Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT Seriennummer 43312

-  // Weitere Hinweise weiruqweruqweruqerqi4123491348123ß4";

-  // try

-  // {

-  // SignatureSeparator sig_sep = new SignatureSeparator();

-  // sig_sep.separateBlock(sig_strg3);

-  // SignatureObject sig_obj = sig_sep.getFirstSignatureObject();

-  // System.out.println(sig_obj.toString());

-  //

-  // Table table = sig_obj.getAbstractTable();

-  // System.out.println(table.toString());

-  // }

-  // catch (SignatureTypesException e)

-  // {

-  // e.printStackTrace();

-  // }

-  // }

+  

+  

 }
\ No newline at end of file
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypeDefinition.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypeDefinition.java
index 4b14019..c8d8818 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypeDefinition.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypeDefinition.java
@@ -407,17 +407,88 @@ public class SignatureTypeDefinition implements Serializable
     {

       String key = (String) this.sortedKeys_.get(i);

       SignatureFieldDefinition sfd = readFieldDefinition(key);

-      //sfd.brev = SignatureTypes.ALL_SIG_BREV[i];

+      // sfd.brev = SignatureTypes.ALL_SIG_BREV[i];

       this.field_definitions_.add(sfd);

     }

   }

-  

+

   /**

    * Returns the list of field definitions of this Signature profile.

+   * 

    * @return Returns the list of field definitions of this Signature profile.

    */

   public List getFieldDefinitions()

   {

     return this.field_definitions_;

   }

+

+  /**

+   * Tells if this signature profile is semantically equal to the other

+   * signature profile.

+   * 

+   * <p>

+   * One profile is semantically equal to another one if the captions and keys

+   * of both profiles are equal and have the same order.

+   * </p>

+   * 

+   * @param other

+   *          The other signature profile.

+   * @return Returns true, if this profile is semantically equivalent to the

+   *         other profile.

+   */

+  public boolean isSemanticallyEqual(SignatureTypeDefinition other)

+  {

+    List this_keys = filterOutNonRequiredFoundKeys(this.sortedKeys_);

+    List other_keys = filterOutNonRequiredFoundKeys(other.sortedKeys_);

+

+    if (this_keys.size() != other_keys.size())

+    {

+      return false;

+    }

+

+    for (int i = 0; i < this_keys.size(); i++)

+    {

+      String this_key = (String) this_keys.get(i);

+      String other_key = (String) other_keys.get(i);

+

+      if (!this_key.equals(other_key))

+      {

+        return false;

+      }

+

+      String this_caption = this.getCaptionFromKey(this_key);

+      String other_caption = other.getCaptionFromKey(other_key);

+

+      if (!this_caption.equals(other_caption))

+      {

+        return false;

+      }

+    }

+

+    return true;

+  }

+  

+  /**

+   * Filters out all non required keys from the List of keys.

+   * 

+   * @param keys The List of keys.

+   * 

+   * @return Returns the subset List which contains only the required keys.

+   */

+  protected static List filterOutNonRequiredFoundKeys (List keys)

+  {

+    List required_keys = new ArrayList(keys.size());

+    for (int i = 0; i < keys.size(); i++)

+    {

+      String this_key = (String) keys.get(i);

+

+      if (!SignatureTypes.isRequiredKey(this_key))

+      {

+        continue;

+      }

+      

+      required_keys.add(this_key);

+    }

+    return required_keys;

+  }

 }
\ No newline at end of file
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
index de1ee57..5e323a2 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/MOAConnector.java
@@ -187,7 +187,7 @@ public class MOAConnector implements Connector
     sign_req_str = sign_req_str.replaceFirst("KeyIdentifierReplace", key_ident);

     if (logger_.isDebugEnabled())

     {

-      logger_.debug("error_signature_response = " + sign_req_str);

+      //logger_.debug("error_signature_response = " + sign_req_str);

       // FileHelper.writeToFile(sign_request_filename + "_signText.xml",

       // signText);

     }

@@ -261,7 +261,7 @@ public class MOAConnector implements Connector
       {

         if (logger_.isDebugEnabled())

         {

-          logger_.debug("error_signature_response = " + response_string);

+          //logger_.debug("response_string = " + response_string);

           // FileHelper.writeToFile(sign_request_filename + "_response.xml",

           // response_string);

         }