From: Roland Haeder <roland@mxchange.org>
Date: Tue, 7 Apr 2015 14:53:34 +0000 (+0200)
Subject: Let's see if this works better.
X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=6f3b09f6a22137eb528d1a76424293f1f7103780

Let's see if this works better.

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/inc/classes/main/criteria/class_BaseCriteria.php b/inc/classes/main/criteria/class_BaseCriteria.php
index 9898c117..86e67857 100644
--- a/inc/classes/main/criteria/class_BaseCriteria.php
+++ b/inc/classes/main/criteria/class_BaseCriteria.php
@@ -160,7 +160,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 	 * @param	$criteriaType	Type of this criteria, can be one of 'default' (default), 'choice' or 'exclude'
 	 * @return	void
 	 */
-	public function addCriteria ($criteriaKey, $criteriaValue, $criteriaType = 'default') {
+	public final function addCriteria ($criteriaKey, $criteriaValue, $criteriaType = 'default') {
 		// Make sure no 'my-' or 'my_' passes this point
 		assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE) && (!is_bool($criteriaValue)));
 
diff --git a/inc/classes/main/criteria/update/class_UpdateCriteria.php b/inc/classes/main/criteria/update/class_UpdateCriteria.php
index 9e9d6b45..df4470a7 100644
--- a/inc/classes/main/criteria/update/class_UpdateCriteria.php
+++ b/inc/classes/main/criteria/update/class_UpdateCriteria.php
@@ -24,21 +24,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class UpdateCriteria extends BaseCriteria implements LocalUpdateCriteria {
-	/**
-	 * Criteria to handle
-	 */
-	private $updateCriteria = array();
-
-	/**
-	 * Limitation for the update
-	 */
-	private $limit = 0;
-
-	/**
-	 * Skip these entries before using them
-	 */
-	private $skip = 0;
-
 	/**
 	 * Protected constructor
 	 *
@@ -62,40 +47,13 @@ class UpdateCriteria extends BaseCriteria implements LocalUpdateCriteria {
 		return $criteriaInstance;
 	}
 
-	/**
-	 * Add criteria, this method converts dashes to underscores because dashes
-	 * are not valid for criteria keys.
-	 *
-	 * @param	$criteriaKey	Criteria key
-	 * @param	$criteriaValue	Criteria value
-	 * @param	$criteriaType	Type of this criteria, can be one of 'default' (default), 'choice' or 'exclude'
-	 * @return	void
-	 */
-	public function addCriteria ($criteriaKey, $criteriaValue, $criteriaType = 'default') {
-		$this->updateCriteria[$criteriaKey] = $criteriaValue;
-	}
-
-	/**
-	 * Add configured criteria
-	 *
-	 * @param	$criteriaKey	Criteria key
-	 * @param	$configEntry	Configuration entry
-	 * @param	$criteriaType	Type of this criteria, can be one of 'default' (default), 'choice' or 'exclude'
-	 * @return	void
-	 */
-	public function addConfiguredCriteria ($criteriaKey, $configEntry, $criteriaType = 'default') {
-		// Add the configuration entry as a criteria
-		$value = $this->getConfigInstance()->getConfigEntry($configEntry);
-		$this->addCriteria($criteriaKey, $value);
-	}
-
 	/**
 	 * Getter for update criteria array
 	 *
 	 * @return	$updateCriteria		Array holding the update criteria
 	 */
 	public final function getUpdateCriteria () {
-		return $this->updateCriteria;
+		return $this->getCriteriaArray();
 	}
 }