From ab57bf058107ad9ea251dfb8e3fc576834ea9f68 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Wed, 3 Nov 2010 16:39:22 +0000
Subject: Bug Nr. #534 fixed. Alignment params are now properly inherited to
 all table cells. Also added the Style params valuevalign and valuehalign to
 allow separate alignment for value cells. If those are not set value cells
 are aligned as any other cell.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@600 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../wag/egov/egiz/sig/SignatureObject.java         |  4 +-
 .../wag/egov/egiz/sig/SignatureTypes.java          | 64 +++++++++++-----------
 2 files changed, 35 insertions(+), 33 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/sig')

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 0b39a5b..859e54e 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
@@ -72,6 +72,8 @@ import at.knowcenter.wag.egov.egiz.tools.Normalizer;
 public class SignatureObject implements Serializable
 {
 
+// 03.11.2010 changed by exthex - added default for defaultValueStyle_.hAlign since we had to remove the hardcoded default in Style
+
   /**
    * SVUID.
    */
@@ -271,11 +273,11 @@ public class SignatureObject implements Serializable
     defaultImageStyle_.setPadding(3);
     defaultImageStyle_.setHAlign(Style.CENTER);
     defaultImageStyle_.setVAlign(Style.MIDDLE);
-    defaultImageStyle_.setBgColor(null);
 
     defaultCaptionStyle_.setHAlign(Style.CENTER);
     defaultCaptionStyle_.setVAlign(Style.MIDDLE);
 
+    defaultValueStyle_.setHAlign(Style.LEFT);
     defaultValueStyle_.setVAlign(Style.MIDDLE);
   }
 
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
index fcd704d..860120e 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/SignatureTypes.java
@@ -17,7 +17,6 @@
  */
 package at.knowcenter.wag.egov.egiz.sig;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,12 +30,13 @@ import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureTypesException;
-import at.knowcenter.wag.egov.egiz.table.Style;
 import at.knowcenter.wag.exactparser.ByteArrayUtils;
 
 public class SignatureTypes
 {
 
+// 03.11.2010 changed by exthex - commented unneded setDefaultStyles method to reduce confusion
+
   /**
    * The settings key prefix for signature definitions. <code>"sig_obj."</code>
    */
@@ -108,20 +108,20 @@ public class SignatureTypes
    */
   public final static String STYLE = "Style";
 
-  /**
-   * The default style definition for images.
-   */
-  private Style defaultImageStyle_ = new Style();
-
-  /**
-   * The default style definition for captions.
-   */
-  private Style defaultCaptionStyle_ = new Style();
-
-  /**
-   * The default style definition for values.
-   */
-  private Style defaultValueStyle_ = new Style();
+//  /**
+//   * The default style definition for images.
+//   */
+//  private Style defaultImageStyle_ = new Style();
+//
+//  /**
+//   * The default style definition for captions.
+//   */
+//  private Style defaultCaptionStyle_ = new Style();
+//
+//  /**
+//   * The default style definition for values.
+//   */
+//  private Style defaultValueStyle_ = new Style();
 
   /**
    * Standard key get/set the singature name
@@ -304,7 +304,7 @@ public class SignatureTypes
     {
       throw new SignatureTypesException(e);
     }
-    setDefaultStyles();
+//    setDefaultStyles();
     loadSignatureTypes();
   }
 
@@ -352,21 +352,21 @@ public class SignatureTypes
     // pTree_ = settings_.getPTree();
   }
 
-  /**
-   * This method set the default styles for images, captions and values.
-   */
-  private void setDefaultStyles()
-  {
-    defaultImageStyle_.setPadding(3);
-    defaultImageStyle_.setHAlign(Style.CENTER);
-    defaultImageStyle_.setVAlign(Style.MIDDLE);
-    defaultImageStyle_.setBgColor(new Color(255, 255, 255));
-
-    defaultCaptionStyle_.setHAlign(Style.CENTER);
-    defaultCaptionStyle_.setVAlign(Style.MIDDLE);
-
-    defaultValueStyle_.setVAlign(Style.MIDDLE);
-  }
+//  /**
+//   * This method set the default styles for images, captions and values.
+//   */
+//  private void setDefaultStyles()
+//  {
+//    defaultImageStyle_.setPadding(3);
+//    defaultImageStyle_.setHAlign(Style.CENTER);
+//    defaultImageStyle_.setVAlign(Style.MIDDLE);
+//    defaultImageStyle_.setBgColor(new Color(255, 255, 255));
+//
+//    defaultCaptionStyle_.setHAlign(Style.CENTER);
+//    defaultCaptionStyle_.setVAlign(Style.MIDDLE);
+//
+//    defaultValueStyle_.setVAlign(Style.MIDDLE);
+//  }
 
   /**
    * This method load the configured signature types. It stores the definition
-- 
cgit v1.2.3