Adds filter attribute, renames target id filter attribute

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / Pz2Bean.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
index 277876b..70dde92 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/Pz2Bean.java
@@ -115,30 +115,40 @@ public class Pz2Bean implements Pz2Interface, Serializable {
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setTargetFilter(java.lang.String, java.lang.String)\r
    */\r
-  public void setTargetFilter(String targetId, String targetName) {\r
-    pz2.setTargetFilter(targetId, targetName);\r
+  public void setSingleTargetFilter(String targetId, String targetName) {\r
+    pz2.setSingleTargetFilter(targetId, targetName);\r
   }\r
   \r
   /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()\r
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()\r
    */\r
-  public void removeTargetFilter () {\r
-    pz2.removeTargetFilter();\r
+  public SingleTargetFilter getSingleTargetFilter() {\r
+    return pz2.getSingleTargetFilter();\r
   }\r
-\r
+  \r
   /* (non-Javadoc)\r
-   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#getTargetFilter()\r
+   * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#removeTargetFilter()\r
    */\r
-  public TargetFilter getTargetFilter() {\r
-    return pz2.getTargetFilter();\r
+  public void removeSingleTargetFilter () {\r
+    pz2.removeSingleTargetFilter();\r
   }\r
-\r
+  \r
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#hasTargetFilter()\r
    */\r
-  public boolean hasTargetFilter() {\r
-    return pz2.hasTargetFilter();\r
+  public boolean hasSingleTargetFilter() {\r
+    return pz2.hasSingleTargetFilter();\r
+  }\r
+\r
+  \r
+  public String getFilter () {\r
+    return pz2.getFilter();\r
   }\r
+  \r
+  public void setFilter (String filterExpression) {\r
+    pz2.setFilter(filterExpression);\r
+  }\r
+\r
 \r
   /* (non-Javadoc)\r
    * @see com.indexdata.pz2utils4jsf.pazpar2.Pz2Interface#setSort(java.lang.String)\r