Continued with jcore:

[jcore.git] / src / org / mxchange / jcore / criteria / BaseCriteria.java

diff --git a/src/org/mxchange/jcore/criteria/BaseCriteria.java b/src/org/mxchange/jcore/criteria/BaseCriteria.java
index 36028fc5ef3f8b12e99c7f0580f0d5e109b02875..0846504367758421bb61cb164218a04a210a1cfc 100644 (file)
--- a/src/org/mxchange/jcore/criteria/BaseCriteria.java
+++ b/src/org/mxchange/jcore/criteria/BaseCriteria.java
@@ -18,7 +18,9 @@ package org.mxchange.jcore.criteria;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import org.mxchange.jcore.BaseFrameworkSystem;
+import org.mxchange.jcore.criteria.logical.Logical;
 
 /**
  * A general criteria class
@@ -31,6 +33,11 @@ public class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        private final Map<String, Object> criteria;
 
+       /**
+        * Logical matcher instance
+        */
+       private Logical logcial;
+
        /**
         * Protected default construtctor
         */
@@ -40,8 +47,49 @@ public class BaseCriteria extends BaseFrameworkSystem implements Criteria {
        }
 
        @Override
-       public void addCriteria (final String key, final boolean value) {
+       public void addCriteria (final String key, final Boolean value) {
                // Add to map
                this.criteria.put(key, value);
        }
+
+       @Override
+       public void addCriteria (final String key, final String value) {
+               // Add to map
+               this.criteria.put(key, value);
+       }
+
+       @Override
+       public Set<Map.Entry<String, Object>> entrySet () {
+               return this.criteria.entrySet();
+       }
+
+       @Override
+       public Iterable<Object> values () {
+               // Call map's method
+               return this.criteria.values();
+               
+       }
+
+       /**
+        * Getter for Logical matcher instance
+        * 
+        * @return Logical matcher instance
+        */
+       protected final Logical getLogical () {
+               return this.logcial;
+       }
+
+       /**
+        * Setter for Logical instance
+        * 
+        * @param logcial the Logical instance to set
+        */
+       public final void setLogcial (final Logical logcial) {
+               this.logcial = logcial;
+       }
+
+       @Override
+       public void addCriteria (final String key, final Number value) {
+               this.criteria.put(key, value);
+       }
 }