upd: Reduce Boilerplate in translated SprintfCommands

[gigi.git] / src / org / cacert / gigi / dbObjects / DomainPingConfiguration.java

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)));
     }
 }