X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcriteria%2Fdataset%2Fclass_DataSetCriteria.php;fp=inc%2Fclasses%2Fmain%2Fcriteria%2Fdataset%2Fclass_DataSetCriteria.php;h=516f007ee417372d4c379624b08c86e60428a995;hb=3f998a2d3aa2c4c16185c556d89cf755125cc699;hp=cf4fdc96647fa0c20c9067d748cd903342541f5a;hpb=be3e5282ba536934ddeac3daff59c5b7e43b1cd2;p=core.git

diff --git a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
index cf4fdc96..516f007e 100644
--- a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
@@ -28,11 +28,6 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 	 */
 	private $tableName = '';
 
-	/**
-	 * Table columns (criteria) to store
-	 */
-	private $tableColumns = array();
-
 	/**
 	 * Unique key
 	 */
@@ -70,30 +65,6 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 		return $criteriaInstance;
 	}
 
-	/**
-	 * Add criteria
-	 *
-	 * @param	$criteriaKey	Criteria key
-	 * @param	$criteriaValue	Criteria value
-	 * @return	void
-	 */
-	public function addCriteria ($criteriaKey, $criteriaValue) {
-		$this->tableColumns[(string) $criteriaKey] = $criteriaValue;
-	}
-
-	/**
-	 * Add configured criteria
-	 *
-	 * @param	$criteriaKey	Criteria key
-	 * @param	$configEntry	Configuration entry
-	 * @return	void
-	 */
-	public function addConfiguredCriteria ($criteriaKey, $configEntry) {
-		// Add configuration entry as criteria
-		$value = $this->getConfigInstance()->getConfigEntry($configEntry);
-		$this->addCriteria($criteriaKey, $value);
-	}
-
 	/**
 	 * Setter for table name
 	 *
@@ -138,16 +109,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 	 * @return	$uniqueValue	Value of the unique key
 	 */
 	public final function getUniqueValue () {
-		return $this->tableColumns[$this->getUniqueKey()];
-	}
-
-	/**
-	 * Getter for criteria array
-	 *
-	 * @return	$tableColumns
-	 */
-	public final function getCriteriaArray () {
-		return $this->tableColumns;
+		return $this->getCriteriaElemnent($this->getUniqueKey());
 	}
 
 	/**