Moved to new cache builder folder

Moved CacheBuilderUserNotificationObjectType to the cache builder
folder, updated the namespace and used the namespace of ICacheBuilder.

diff --git a/com.woltlab.wcf.notification/files/lib/system/cache/CacheBuilderUserNotificationObjectType.class.php b/com.woltlab.wcf.notification/files/lib/system/cache/CacheBuilderUserNotificationObjectType.class.php
deleted file mode 100644 (file)
index 2a7950c..0000000
--- a/com.woltlab.wcf.notification/files/lib/system/cache/CacheBuilderUserNotificationObjectType.class.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-namespace wcf\system\cache;
-use wcf\data\user\notification\event\UserNotificationEvent;
-use wcf\data\user\notification\object\type\UserNotificationObjectType;
-use wcf\system\WCF;
-
-/**
- * Caches user notification object types and events.
- *
- * @author     Marcell Werk, Oliver Kliebisch
- * @copyright  2001-2011 WoltLab GmbH, Oliver Kliebisch
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf.notification
- * @subpackage system.cache
- * @category   Community Framework
- */
-class CacheBuilderUserNotificationObjectType implements ICacheBuilder {
-       /**
-        * @see wcf\system\cache\ICacheBuilder::getData()
-        */
-       public function getData($cacheResource) {
-               $data = array();
-               
-               // get package id
-               $tmp = explode('-', $cacheResource['cache']);
-               $packageID = array_pop($tmp);
-               
-               // get object types
-               $typeIDArray = array();
-               $sql = "SELECT          object_type.*
-                       FROM            wcf".WCF_N."_user_notification_object_type object_type,
-                                       wcf".WCF_N."_package_dependency package_dependency
-                       WHERE           object_type.packageID = package_dependency.dependency
-                                       AND package_dependency.packageID = ?
-                       ORDER BY        package_dependency.priority DESC";
-               $statement = WCF::getDB()->prepareStatement($sql);
-               $statement->execute(array($packageID));
-               while ($row = $statement->fetchArray()) {
-                       if (!isset($data[$row['objectType']])) {
-                               $databaseObject = new UserNotificationObjectType(null, $row);
-                               $data[$row['objectType']] = array(
-                                       'object' => $databaseObject->getProcessor(),
-                                       'events' => array()
-                               );
-                       }
-               }
-
-               // get events
-               $sql = "SELECT          event.*, object_type.objectType
-                       FROM            wcf".WCF_N."_package_dependency package_dependency,
-                                       wcf".WCF_N."_user_notification_event event
-                       LEFT JOIN       wcf".WCF_N."_user_notification_object_type object_type
-                       ON              (object_type.objectTypeID = event.objectTypeID)
-                       WHERE           event.packageID = package_dependency.dependency
-                                       AND package_dependency.packageID = ?
-                       ORDER BY        package_dependency.priority DESC";
-               $statement = WCF::getDB()->prepareStatement($sql);
-               $statement->execute(array($packageID));
-               while ($row = $statement->fetchArray()) {
-                       if (isset($data[$row['objectType']]) && !isset($data[$row['objectType']]['events'][$row['eventName']])) {
-                               $databaseObject = new UserNotificationEvent(null, $row);
-                               $data[$row['objectType']]['events'][$row['eventName']] = $databaseObject->getProcessor();
-                       }
-               }
-               
-               return $data;
-       }
-}

diff --git a/com.woltlab.wcf.notification/files/lib/system/cache/builder/CacheBuilderUserNotificationObjectType.class.php b/com.woltlab.wcf.notification/files/lib/system/cache/builder/CacheBuilderUserNotificationObjectType.class.php
new file mode 100644 (file)
index 0000000..3d8dcd7
--- /dev/null
+++ b/com.woltlab.wcf.notification/files/lib/system/cache/builder/CacheBuilderUserNotificationObjectType.class.php
@@ -0,0 +1,69 @@
+<?php
+namespace wcf\system\cache\builder;
+use wcf\data\user\notification\event\UserNotificationEvent;
+use wcf\data\user\notification\object\type\UserNotificationObjectType;
+use wcf\system\cache\ICacheBuilder;
+use wcf\system\WCF;
+
+/**
+ * Caches user notification object types and events.
+ *
+ * @author     Marcell Werk, Oliver Kliebisch
+ * @copyright  2001-2011 WoltLab GmbH, Oliver Kliebisch
+ * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package    com.woltlab.wcf.notification
+ * @subpackage system.cache
+ * @category   Community Framework
+ */
+class CacheBuilderUserNotificationObjectType implements ICacheBuilder {
+       /**
+        * @see wcf\system\cache\ICacheBuilder::getData()
+        */
+       public function getData($cacheResource) {
+               $data = array();
+               
+               // get package id
+               $tmp = explode('-', $cacheResource['cache']);
+               $packageID = array_pop($tmp);
+               
+               // get object types
+               $typeIDArray = array();
+               $sql = "SELECT          object_type.*
+                       FROM            wcf".WCF_N."_user_notification_object_type object_type,
+                                       wcf".WCF_N."_package_dependency package_dependency
+                       WHERE           object_type.packageID = package_dependency.dependency
+                                       AND package_dependency.packageID = ?
+                       ORDER BY        package_dependency.priority DESC";
+               $statement = WCF::getDB()->prepareStatement($sql);
+               $statement->execute(array($packageID));
+               while ($row = $statement->fetchArray()) {
+                       if (!isset($data[$row['objectType']])) {
+                               $databaseObject = new UserNotificationObjectType(null, $row);
+                               $data[$row['objectType']] = array(
+                                       'object' => $databaseObject->getProcessor(),
+                                       'events' => array()
+                               );
+                       }
+               }
+
+               // get events
+               $sql = "SELECT          event.*, object_type.objectType
+                       FROM            wcf".WCF_N."_package_dependency package_dependency,
+                                       wcf".WCF_N."_user_notification_event event
+                       LEFT JOIN       wcf".WCF_N."_user_notification_object_type object_type
+                       ON              (object_type.objectTypeID = event.objectTypeID)
+                       WHERE           event.packageID = package_dependency.dependency
+                                       AND package_dependency.packageID = ?
+                       ORDER BY        package_dependency.priority DESC";
+               $statement = WCF::getDB()->prepareStatement($sql);
+               $statement->execute(array($packageID));
+               while ($row = $statement->fetchArray()) {
+                       if (isset($data[$row['objectType']]) && !isset($data[$row['objectType']]['events'][$row['eventName']])) {
+                               $databaseObject = new UserNotificationEvent(null, $row);
+                               $data[$row['objectType']]['events'][$row['eventName']] = $databaseObject->getProcessor();
+                       }
+               }
+               
+               return $data;
+       }
+}