Some 'static' array elements rewritten to constant, other cleanups

[core.git] / inc / classes / main / criteria / dataset / class_DataSetCriteria.php

diff --git a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
index cf4fdc96647fa0c20c9067d748cd903342541f5a..516f007ee417372d4c379624b08c86e60428a995 100644 (file)
--- 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());
        }
 
        /**