Moves single-target-filter class to commands package

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
index 7c0cc86..4d7ac5f 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Session.java
@@ -49,8 +49,7 @@ public class Pz2Session implements Pz2Interface, StateListener {
   protected ErrorHelper errorHelper = null;\r
   \r
   protected List<ErrorInterface> configurationErrors = null;\r
-  protected SearchClient searchClient = null;   \r
-  protected SingleTargetFilter singleTargetFilter = null;  \r
+  protected SearchClient searchClient = null;       \r
   protected ResultsPager pager = null; \r
     \r
   public Pz2Session () {\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SingleTargetFilter.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SingleTargetFilter.java
deleted file mode 100644 (file)
index 7c0bcd8..0000000
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/SingleTargetFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.indexdata.pz2utils4jsf.pazpar2;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.indexdata.pz2utils4jsf.pazpar2.SingleTargetFilter;\r
-\r
-public class SingleTargetFilter implements Serializable {\r
-\r
-  private static final long serialVersionUID = 2389085467202526537L;\r
-\r
-  private String targetName;\r
-  private String targetId;\r
-  \r
-  public SingleTargetFilter (String targetId, String targetName) {\r
-    this.targetId = targetId;\r
-    this.targetName = targetName;\r
-  }\r
-  \r
-  public String getTargetName () {\r
-    return targetName;\r
-  }\r
-  \r
-  public String getTargetId () {\r
-    return targetId;    \r
-  }\r
-  \r
-  public String getFilterExpression () {\r
-    return "pz:id="+targetId;\r
-  }\r
-  \r
-  @Override\r
-  public boolean equals(Object o) {\r
-    if (o instanceof SingleTargetFilter) {\r
-      return targetName.equals(((SingleTargetFilter) o).getTargetName()) && \r
-             targetId.equals(((SingleTargetFilter) o).getTargetId());\r
-    } else {\r
-      return false;\r
-    }\r
-  }\r
-  \r
-  @Override\r
-  public int hashCode () {\r
-    return (targetId+targetName).hashCode();\r
-  }\r
-  \r
-  \r
-}\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
index 656f73f..09e370c 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/RecordCommand.java
@@ -16,9 +16,7 @@ public class RecordCommand extends Pazpar2Command {
   \r
   public String getRecordId () {\r
     return getParameterValue("id");\r
-  }\r
-  \r
-  \r
+  }    \r
 \r
   @Override\r
   public RecordCommand copy () {\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
index 6e3f500..7e0d361 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SearchCommand.java
@@ -5,7 +5,6 @@ import javax.enterprise.context.SessionScoped;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.pz2utils4jsf.pazpar2.Expression;\r
-import com.indexdata.pz2utils4jsf.pazpar2.SingleTargetFilter;\r
 import com.indexdata.pz2utils4jsf.pazpar2.state.StateManager;\r
 \r
 @SessionScoped\r

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SingleTargetFilter.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SingleTargetFilter.java
new file mode 100644 (file)
index 0000000..d495b70
--- /dev/null
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/SingleTargetFilter.java
@@ -0,0 +1,47 @@
+package com.indexdata.pz2utils4jsf.pazpar2.commands;\r
+\r
+import java.io.Serializable;\r
+\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.SingleTargetFilter;\r
+\r
+public class SingleTargetFilter implements Serializable {\r
+\r
+  private static final long serialVersionUID = 2389085467202526537L;\r
+\r
+  private String targetName;\r
+  private String targetId;\r
+  \r
+  public SingleTargetFilter (String targetId, String targetName) {\r
+    this.targetId = targetId;\r
+    this.targetName = targetName;\r
+  }\r
+  \r
+  public String getTargetName () {\r
+    return targetName;\r
+  }\r
+  \r
+  public String getTargetId () {\r
+    return targetId;    \r
+  }\r
+  \r
+  public String getFilterExpression () {\r
+    return "pz:id="+targetId;\r
+  }\r
+  \r
+  @Override\r
+  public boolean equals(Object o) {\r
+    if (o instanceof SingleTargetFilter) {\r
+      return targetName.equals(((SingleTargetFilter) o).getTargetName()) && \r
+             targetId.equals(((SingleTargetFilter) o).getTargetId());\r
+    } else {\r
+      return false;\r
+    }\r
+  }\r
+  \r
+  @Override\r
+  public int hashCode () {\r
+    return (targetId+targetName).hashCode();\r
+  }\r
+  \r
+  \r
+}\r