Moved MATCH_MODE_* constants from SignParameters to Constants.

Added javadoc and updated Anwendungsbeschreibung

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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
index 4a70f3f..2ffecec 100644
--- a/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
+++ b/src/main/java/at/gv/egiz/pdfas/commandline/Main.java
@@ -241,7 +241,7 @@ public abstract class Main
 

     boolean search_placeholder = true;

     String placeholderId = null;

-    int placeholderMatchMode = SignParameters.PLACEHOLDER_MATCH_MODE_MODERATE;

+    int placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_MODERATE;

 

     int verify_which = -1;

 

@@ -369,11 +369,11 @@ public abstract class Main
           }

           String matchMode = args[i];

           if (matchMode.equals(VALUE_PLACEHOLDER_MATCH_MODE_LENIENT))

-             placeholderMatchMode = SignParameters.PLACEHOLDER_MATCH_MODE_LENIENT;

+             placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_LENIENT;

           else if (matchMode.equals(VALUE_PLACEHOLDER_MATCH_MODE_MODERATE))

-             placeholderMatchMode = SignParameters.PLACEHOLDER_MATCH_MODE_MODERATE;

+             placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_MODERATE;

           else if (matchMode.equals(VALUE_PLACEHOLDER_MATCH_MODE_STRICT))

-             placeholderMatchMode = SignParameters.PLACEHOLDER_MATCH_MODE_STRICT;

+             placeholderMatchMode = Constants.PLACEHOLDER_MATCH_MODE_STRICT;

           else

              printUnrecognizedValue(PARAMETER_PLACEHOLDER_MATCH_MODE, args[i]);

           continue;

@@ -1092,7 +1092,7 @@ public abstract class Main
 

     writer.println("    " + PARAMETER_PLACEHOLDER_SEARCH + " <true|false> ... [optional] if set to true, the source document will be scanned for signature placeholder images. If not set, the enable_placeholder_search value in the config file decides whether or not a search for placeholder images will be performed.");

     writer.println("    " + PARAMETER_PLACEHOLDER_ID + " <id> ... [optional] search for signature placeholder images containing the given id");

-    writer.println("    " + PARAMETER_PLACEHOLDER_MATCH_MODE + " <" + VALUE_PLACEHOLDER_MATCH_MODE_LENIENT + "|" + VALUE_PLACEHOLDER_MATCH_MODE_MODERATE + "|" + VALUE_PLACEHOLDER_MATCH_MODE_STRICT + "> ... [optional] specify the behaviour if no matching placeholder could be found. Default is <moderate>.");

+    writer.println("    " + PARAMETER_PLACEHOLDER_MATCH_MODE + " <" + VALUE_PLACEHOLDER_MATCH_MODE_LENIENT + "|" + VALUE_PLACEHOLDER_MATCH_MODE_MODERATE + "|" + VALUE_PLACEHOLDER_MATCH_MODE_STRICT + "> ... [optional] specify the behavior if no matching placeholder could be found. Default is <moderate>.");

     writer.println("      " + VALUE_PLACEHOLDER_MATCH_MODE_LENIENT + " ... sign in place of the first found placeholder, regardless if it matches exactly, or at the end of the document if none is found.");

     writer.println("      " + VALUE_PLACEHOLDER_MATCH_MODE_MODERATE + " ... sign in place of the first found placeholder which has no explicit id set, or at the end of the document if none is found.");

     writer.println("      " + VALUE_PLACEHOLDER_MATCH_MODE_STRICT + " ... throws a PlaceholderExtractionException.");