+ Extracting information from Certificate (Ognl)

+ CMS KeyStore Signer (still wrong format)

1 files changed, 11 insertions, 6 deletions

diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java
index 45b8b711..9d574af7 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/TableFactory.java
@@ -3,6 +3,7 @@ package at.gv.egiz.pdfas.lib.impl.stamping;
 import at.gv.egiz.pdfas.common.settings.IProfileConstants;
 import at.gv.egiz.pdfas.common.settings.ISettings;
 import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
+import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature;
 import at.knowcenter.wag.egov.egiz.pdf.sig.SignatureEntry;
 import at.knowcenter.wag.egov.egiz.table.Entry;
 import at.knowcenter.wag.egov.egiz.table.Style;
@@ -71,7 +72,8 @@ public class TableFactory implements IProfileConstants {
      * @see at.knowcenter.wag.egov.egiz.table.Table
      * @see at.knowcenter.wag.egov.egiz.table.Entry
      */
-    public static Table createSigTable(SignatureProfileSettings profile, String tableID, ISettings configuration )
+    public static Table createSigTable(SignatureProfileSettings profile, String tableID, ISettings configuration,
+    		RequestedSignature requestedSignature)
     {
         String table_key_prefix = SIG_OBJ + profile.getProfileID() + "." + TABLE;
         String table_key = table_key_prefix + tableID;
@@ -135,7 +137,7 @@ public class TableFactory implements IProfileConstants {
                     if (TYPE_TABLE.equals(key))
                     {
                         // add a table entry
-                        Table table = createSigTable(profile, type, configuration);
+                        Table table = createSigTable(profile, type, configuration, requestedSignature);
                         if (table != null)
                         {
                             Entry entry = new Entry(Entry.TYPE_TABLE, table, key);
@@ -160,8 +162,10 @@ public class TableFactory implements IProfileConstants {
                     if (TYPE_VALUE.equals(type))
                     {
                         // add a single value entry
+                    	 ValueResolver resolver = new ValueResolver();
                         String value = profile.getValue(key);
-                        Entry entry = new Entry(Entry.TYPE_VALUE, value, key);
+                        Entry entry = new Entry(Entry.TYPE_VALUE, 
+                        		resolver.resolve(key, value, profile, requestedSignature), key);
                         if (entry != null)
                         {
                             entry.setColSpan(2);
@@ -181,8 +185,9 @@ public class TableFactory implements IProfileConstants {
                             Entry c_entry = new Entry(Entry.TYPE_CAPTION, caption, key);
                             c_entry.setNoWrap(true);  // dferbas fix bug #331
                             c_entry.setStyle(defaultCaptionStyle_);
-
-                            Entry v_entry = new Entry(Entry.TYPE_VALUE, value, key);
+                            ValueResolver resolver = new ValueResolver();
+                            Entry v_entry = new Entry(Entry.TYPE_VALUE, 
+                            		resolver.resolve(key, value, profile, requestedSignature), key);
                             v_entry.setStyle(defaultValueStyle_);
                             if (c_entry != null && v_entry != null)
                             {
@@ -198,7 +203,7 @@ public class TableFactory implements IProfileConstants {
                             ValueResolver resolver = new ValueResolver();
 
                             Entry v_entry = new Entry(Entry.TYPE_VALUE,
-                                    resolver.resolve(key, value, profile), key);
+                                    resolver.resolve(key, value, profile, requestedSignature), key);
                             v_entry.setStyle(defaultValueStyle_);
                             if (c_entry != null && v_entry != null)
                             {