upd: Reduce Boilerplate in translated SprintfCommands

fixes #39

Change-Id: I635355454e9a061896b57bed7fe042f42d4a18f8

diff --git a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
index d63aff9b6fb81b250f9fded5649f64c2d689fcb6..772b066f173db45cb0535d2d110b1a7faa8a86bc 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
+++ b/src/org/cacert/gigi/dbObjects/DomainPingConfiguration.java
@@ -1,15 +1,11 @@
 package org.cacert.gigi.dbObjects;
 
-import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.cacert.gigi.Gigi;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.output.template.Scope;
 import org.cacert.gigi.output.template.SprintfCommand;
 
 public class DomainPingConfiguration implements IdCachable {
@@ -94,9 +90,6 @@ public class DomainPingConfiguration implements IdCachable {
             Gigi.notifyPinger(this);
             return;
         }
-        Map<String, Object> data = new HashMap<String, Object>();
-        data.put("delay", REPING_MINIMUM_DELAY / 60 / 1000);
-        data.put("data", new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY));
-        throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after {0} minutes, yours end at {1}.", Arrays.asList("${delay}", "${data}")), data));
+        throw new GigiApiException(SprintfCommand.createSimple("Reping is only allowed after {0} minutes, yours end at {1}.", REPING_MINIMUM_DELAY / 60 / 1000, new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY)));
     }
 }

diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java
index 04108ea2ec3831284f479ecd186f843d6a7790ee..964d1b68ec8dda6cb2afb7685d43c46415f303d7 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/EmailAddress.java
+++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java
@@ -1,11 +1,8 @@
 package org.cacert.gigi.dbObjects;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
@@ -13,7 +10,6 @@ import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.email.MailProbe;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.template.Scope;
 import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.util.RandomToken;
 
@@ -138,9 +134,7 @@ public class EmailAddress implements IdCachable, Verifyable {
         Date lastExecution = getLastPing(false);
 
         if (lastExecution != null && lastExecution.getTime() + REPING_MINIMUM_DELAY >= System.currentTimeMillis()) {
-            Map<String, Object> data = new HashMap<String, Object>();
-            data.put("data", new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY));
-            throw new GigiApiException(new Scope(new SprintfCommand("Reping is only allowed after 5 minutes, yours end at {0}.", Arrays.asList("${data}")), data));
+            throw new GigiApiException(SprintfCommand.createSimple("Reping is only allowed after {0} minutes, yours end at {1}.", REPING_MINIMUM_DELAY / 60 / 1000, new Date(lastExecution.getTime() + REPING_MINIMUM_DELAY)));
         }
         ping(l);
         return;

diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java
index 006155d2ffdd6f12836aa639506cff4e423a0407..51ea9cf209c16531a2637837c5410057aee9e011 100644 (file)
--- a/src/org/cacert/gigi/output/template/SprintfCommand.java
+++ b/src/org/cacert/gigi/output/template/SprintfCommand.java
@@ -111,7 +111,7 @@ public final class SprintfCommand implements Translatable {
      *            the variables to put into the placeholders.
      * @return the constructed {@link Outputable}.
      */
-    public static Outputable createSimple(String msg, String... vars) {
+    public static Outputable createSimple(String msg, Object... vars) {
         HashMap<String, Object> scope = new HashMap<>();
         String[] store = new String[vars.length];
         for (int i = 0; i < vars.length; i++) {