ADD: Role sensitive assurance display

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index df9d80a67db05dc9b8f3a5316efa5e0a61e80240..6338ccce283d70cb57a2b97b144500b345380e5d 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -13,19 +13,28 @@ public class AssurancesDisplay implements Outputable {
 
     private static Template template;
 
+    private boolean assurer;
+
     public String assuranceArray;
 
     static {
         template = new Template(new InputStreamReader(AssurancesDisplay.class.getResourceAsStream("AssurancesDisplay.templ")));
     }
 
-    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<String, Object> 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 +47,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());

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.templ b/src/org/cacert/gigi/output/AssurancesDisplay.templ
index 6c8cb1ee9f00e54d7534b8b83ad08e32440d1c4e..18d9bc2936470faa7eb176307e108d363f87ee56 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.templ
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.templ
@@ -5,8 +5,7 @@
 <tr>
 <td><?=_Id?></td>
 <td><?=_Date?></td>
-<td><?=_From?></td>
-<td><?=_To?></td>
+<td><?=$verb?></td>
 <td><?=_Points?></td>
 <td><?=_Location?></td>
 <td><?=_Method?></td>
@@ -15,8 +14,7 @@
 <tr>
 <td><?=$id?></td>
 <td><?=$date?></td>
-<td><?=$from?></td>
-<td><?=$to?></td>
+<td><?=$verbVal?></td>
 <td><?=$points?></td>
 <td><?=$location?></td>
 <td><?=$method?></td>

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.java b/src/org/cacert/gigi/pages/wot/MyPoints.java
index cd8b732e454b3cd4d5209c236fcd3afc7e3c5abc..1e61bebebe324bc39008222053443d55f441cad7 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/MyPoints.java
+++ b/src/org/cacert/gigi/pages/wot/MyPoints.java
@@ -16,9 +16,9 @@ public class MyPoints extends Page {
 
     public static final String PATH = "/wot/mypoints";
 
-    private AssurancesDisplay myDisplay = new AssurancesDisplay("asArr");
+    private AssurancesDisplay myDisplay = new AssurancesDisplay("asArr", false);
 
-    private AssurancesDisplay toOtherDisplay = new AssurancesDisplay("otherAsArr");
+    private AssurancesDisplay toOtherDisplay = new AssurancesDisplay("otherAsArr", true);
 
     public MyPoints(String title) {
         super(title);