diff options
Diffstat (limited to 'bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller')
-rw-r--r-- | bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java | 14 | ||||
-rw-r--r-- | bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java index 427e9c37..e9bfdf0b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java @@ -31,15 +31,15 @@ import at.gv.egiz.bku.slcommands.SLCommand; public abstract class CommandParamChecker {
- protected List<Tupel<String, String>> paramList = new LinkedList<Tupel<String, String>>();
+ protected List<Pair<String, String>> paramList = new LinkedList<Pair<String, String>>();
- public static class Tupel<T, Q> {
+ public static class Pair<T, Q> {
private T key;
private Q val;
- public Tupel(T key, Q val) {
+ public Pair(T key, Q val) {
if ((key == null) || (val == null)) {
- throw new NullPointerException("Tupel key and value must not be null");
+ throw new NullPointerException("Pair key and value must not be null");
}
this.key = key;
this.val = val;
@@ -54,8 +54,8 @@ public abstract class CommandParamChecker { }
public boolean equals(Object other) {
- if (other instanceof Tupel) {
- Tupel ot = (Tupel) other;
+ if (other instanceof Pair) {
+ Pair<?, ?> ot = (Pair<?, ?>) other;
return (key.equals(ot.key) && val.equals(ot.val));
}
return false;
@@ -67,7 +67,7 @@ public abstract class CommandParamChecker { }
public void addParameter(String key, String value) {
- paramList.add(new Tupel<String, String>(key, value));
+ paramList.add(new Pair<String, String>(key, value));
}
public abstract boolean checkParameter(SLCommand cmd);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java index e6f03234..6a10a116 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java @@ -50,7 +50,7 @@ public class InfoboxParamChecker extends CommandParamChecker { if (cmd instanceof InfoboxReadCommand) { InfoboxReadCommand irc = (InfoboxReadCommand) cmd; - for (Tupel<String, String> param : paramList) { + for (Pair<String, String> param : paramList) { if (param.getKey().equals(INFOBOX_ID)) { if (!param.getVal().equals(irc.getInfoboxIdentifier())) { return false; |