X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FAssurancesDisplay.java;h=9cd7558c1e54d5bc6dd65d7b2159a685c8a27238;hb=25f59f370978c0e9789821a15d89a83d5d702622;hp=df9d80a67db05dc9b8f3a5316efa5e0a61e80240;hpb=822443761eabc6166cddb123a1c99a95614fa11e;p=gigi.git diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java index df9d80a6..9cd7558c 100644 --- a/src/org/cacert/gigi/output/AssurancesDisplay.java +++ b/src/org/cacert/gigi/output/AssurancesDisplay.java @@ -1,31 +1,36 @@ package org.cacert.gigi.output; -import java.io.InputStreamReader; import java.io.PrintWriter; import java.util.Map; -import org.cacert.gigi.Assurance; +import org.cacert.gigi.dbObjects.Assurance; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.template.IterableDataset; +import org.cacert.gigi.output.template.Outputable; import org.cacert.gigi.output.template.Template; public class AssurancesDisplay implements Outputable { - private static Template template; + private static final Template template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ")); - public String assuranceArray; + private boolean assurer; - static { - template = new Template(new InputStreamReader(AssurancesDisplay.class.getResourceAsStream("AssurancesDisplay.templ"))); - } + public String assuranceArray; - public AssurancesDisplay(String assuranceArray) { + public AssurancesDisplay(String assuranceArray, boolean assurer) { this.assuranceArray = assuranceArray; + this.assurer = assurer; } @Override public void output(PrintWriter out, Language l, Map vars) { final Assurance[] assurances = (Assurance[]) vars.get(assuranceArray); + if (assurer) { + vars.put("verb", l.getTranslation("To")); + } else { + vars.put("verb", l.getTranslation("From")); + } + IterableDataset assuranceGroup = new IterableDataset() { private int i = 0; @@ -38,8 +43,11 @@ public class AssurancesDisplay implements Outputable { Assurance assurance = assurances[i]; vars.put("id", assurance.getId()); vars.put("method", assurance.getMethod()); - vars.put("from", assurance.getFrom().getName()); - vars.put("to", assurance.getTo().getName()); + if (assurer) { + vars.put("verbVal", assurance.getTo().getName()); + } else { + vars.put("verbVal", assurance.getFrom().getName()); + } vars.put("date", assurance.getDate()); vars.put("location", assurance.getLocation()); vars.put("points", assurance.getPoints());