Move the "dbObject"s to their own package.

[gigi.git] / src / org / cacert / gigi / output / template / OutputVariableCommand.java

diff --git a/src/org/cacert/gigi/output/template/OutputVariableCommand.java b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
index b0f7849939ad8328e3303608a42a12881e3c4660..1a304d894b39a5a6b532177796e1282b93b49be2 100644 (file)
--- a/src/org/cacert/gigi/output/template/OutputVariableCommand.java
+++ b/src/org/cacert/gigi/output/template/OutputVariableCommand.java
@@ -3,18 +3,27 @@ package org.cacert.gigi.output.template;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Language;
+import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Outputable;
 
 public final class OutputVariableCommand implements Outputable {
-       private final String raw;
 
-       public OutputVariableCommand(String raw) {
-               this.raw = raw;
-       }
+    private final String raw;
 
-       @Override
-       public void output(PrintWriter out, Language l, Map<String, Object> vars) {
-               Template.outputVar(out, l, vars, raw);
-       }
-}
\ No newline at end of file
+    private final boolean unescaped;
+
+    public OutputVariableCommand(String raw) {
+        if (raw.charAt(0) == '!') {
+            unescaped = true;
+            this.raw = raw.substring(1);
+        } else {
+            unescaped = false;
+            this.raw = raw;
+        }
+    }
+
+    @Override
+    public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+        Template.outputVar(out, l, vars, raw, unescaped);
+    }
+}