From 006abfa4f5064a905b14618708768e3aa295f264 Mon Sep 17 00:00:00 2001
From: "harald.bratko" <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 10 Jan 2007 15:34:50 +0000
Subject: Changed method replaceTag throw exception only if a tag is not
 present, but isexpected to be present.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@768 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../src/at/gv/egovernment/moa/id/auth/builder/Builder.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'id.server/src/at/gv/egovernment/moa')

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
index a5d87ef83..a5614655b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
@@ -16,18 +16,30 @@ public class Builder {
    * @param htmlTemplate template
    * @param tag special tag
    * @param value value replacing the tag
+   * @param expected specifies if the tag is expected to present; if <code>true</code> and the tag
+   *                 is not present, an exception is thrown; if <code>false</code> and the tag is
+   *                 not present, the original string is returned
    * @param maxreplacements: -1 to replace each occurence of tag, or limit replacements by a given positive number  
    * @return XML or HTML code, the tag replaced
    * @throws BuildException when template does not contain the tag
    */
-  protected String replaceTag(String template, String tag, String value, int maxreplacements) throws BuildException {
+  protected String replaceTag(
+    String template, 
+    String tag, 
+    String value, 
+    boolean expected, 
+    int maxreplacements) 
+  throws BuildException 
+  {
     String result = template;
     int index = result.indexOf(tag);
     if (index < 0) {
+      if (expected) {
     	// Substring not found but should
         throw new BuildException(
                 "builder.01", 
                 new Object[] {"&lt;" + tag.substring(1, tag.length() - 1) + "&gt;"});
+      }
     } else {
        // replace each occurence
        if (maxreplacements == -1) {
-- 
cgit v1.2.3