Added interface AddableCriteria

diff --git a/.gitattributes b/.gitattributes
index 2075b2fe53130addfb0894d046afa978977d1135..1da6d331ae2d70f8b572d6788f863a734b43f123 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -148,6 +148,7 @@ inc/classes/interfaces/controller/class_Controller.php svneol=native#text/plain
 inc/classes/interfaces/criteria/.htaccess svneol=native#text/plain
 inc/classes/interfaces/criteria/class_Criteria.php svneol=native#text/plain
 inc/classes/interfaces/criteria/extended/.htaccess svneol=native#text/plain
+inc/classes/interfaces/criteria/extended/class_AddableCriteria.php -text
 inc/classes/interfaces/criteria/extended/class_LocalSearchCriteria.php svneol=native#text/plain
 inc/classes/interfaces/criteria/extended/class_LocalUpdateCriteria.php svneol=native#text/plain
 inc/classes/interfaces/criteria/extended/class_StoreableCriteria.php svneol=native#text/plain

diff --git a/inc/classes/interfaces/criteria/extended/class_AddableCriteria.php b/inc/classes/interfaces/criteria/extended/class_AddableCriteria.php
new file mode 100644 (file)
index 0000000..fd6e685
--- /dev/null
+++ b/inc/classes/interfaces/criteria/extended/class_AddableCriteria.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * An interface for classes which are allowed to add criteria
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface Addable extends FrameworkInterface {
+       /**
+        * Adds registration elements to a given dataset instance
+        *
+        * @param       $criteriaInstance       An instance of a storeable criteria
+        * @return      void
+        */
+       function addElementsToDataSet (StoreableCriteria $criteriaInstance);
+}
+
+// [EOF]
+?>
+<?php
+/**
+ * An interface for classes which are allowed to add criteria
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface Addable extends FrameworkInterface {
+       /**
+        * Adds registration elements to a given dataset instance
+        *
+        * @param       $criteriaInstance       An instance of a storeable criteria
+        * @return      void
+        */
+       function addElementsToDataSet (StoreableCriteria $criteriaInstance);
+}
+
+// [EOF]
+?>

diff --git a/inc/classes/interfaces/points/class_BookablePoints.php b/inc/classes/interfaces/points/class_BookablePoints.php
index b67f2769dc379880b1d680a9b57092ffca6f7528..a1de221537e5f47d2b641a2cff6dff5fe3dbce41 100644 (file)
--- a/inc/classes/interfaces/points/class_BookablePoints.php
+++ b/inc/classes/interfaces/points/class_BookablePoints.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-interface BookablePoints extends FrameworkInterface {
+interface BookablePoints extends AddableCriteria {
        /**
         * Checks whether the user has the required amount of points left for the specified action
         *
@@ -37,14 +37,6 @@ interface BookablePoints extends FrameworkInterface {
         * @return      void
         */
        function bookPointsDirectly ($amount);
-
-       /**
-        * Adds registration elements to a given dataset instance
-        *
-        * @param       $criteriaInstance       An instance of a storeable criteria
-        * @return      void
-        */
-       function addElementsToDataSet (StoreableCriteria $criteriaInstance);
 }
 
 // [EOF]

diff --git a/inc/classes/interfaces/registration/class_UserRegister.php b/inc/classes/interfaces/registration/class_UserRegister.php
index faa409ebacd783796f2a93ed8d46d5dcf2c6f5ee..bae7b61ef85c3cb49af1dcb4b2853fa34fa091ab 100644 (file)
--- a/inc/classes/interfaces/registration/class_UserRegister.php
+++ b/inc/classes/interfaces/registration/class_UserRegister.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-interface UserRegister extends FrameworkInterface {
+interface UserRegister extends AddableCriteria {
        /**
         * Encrypt given request key or throws an exception if key was not found in
         * request.
@@ -62,14 +62,6 @@ interface UserRegister extends FrameworkInterface {
         * @return      void
         */
        function doPostAction ();
-
-       /**
-        * Adds registration elements to a given dataset instance
-        *
-        * @param       $criteriaInstance       An instance of a storeable criteria
-        * @return      void
-        */
-       function addElementsToDataSet (StoreableCriteria $criteriaInstance);
 }
 
 // [EOF]

diff --git a/inc/classes/interfaces/result/class_UpdateableResult.php b/inc/classes/interfaces/result/class_UpdateableResult.php
index f541dc35ae850ebf23f3eff596c194f7cc94737e..897a1e1ddbe96bc256ff9681a89dd1e9c4c55a3a 100644 (file)
--- a/inc/classes/interfaces/result/class_UpdateableResult.php
+++ b/inc/classes/interfaces/result/class_UpdateableResult.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-interface UpdateableResult extends FrameworkInterface {
+interface UpdateableResult extends AddableCriteria {
        /**
         * Adds an update request to the database result for writing it to the
         * database layer
@@ -31,14 +31,6 @@ interface UpdateableResult extends FrameworkInterface {
         * @throws      ResultUpdateException   If no result was updated
         */
        function add2UpdateQueue (LocalUpdateCriteria $criteriaInstance);
-
-       /**
-        * Adds registration elements to a given dataset instance
-        *
-        * @param       $criteriaInstance       An instance of a storeable criteria
-        * @return      void
-        */
-       function addElementsToDataSet (StoreableCriteria $criteriaInstance);
 }
 
 // [EOF]