[Solar-svn] Revision 3197

[pmjones at solarphp.com]

Move Solar_Model_Nodes_Bookmarks to Solar_Model_Bookmarks, to reduce hierarchy depth on single-table inheritance classes.


Copied: trunk/Solar/Model/Bookmarks (from rev 3184, trunk/Solar/Model/Nodes/Bookmarks)

Modified: trunk/Solar/Model/Bookmarks/Collection.php
===================================================================
--- trunk/Solar/Model/Nodes/Bookmarks/Collection.php	2008-05-28 16:31:28 UTC (rev 3184)
+++ trunk/Solar/Model/Bookmarks/Collection.php	2008-06-03 01:58:16 UTC (rev 3197)
@@ -14,4 +14,4 @@
  * @version $Id$
  * 
  */
-class Solar_Model_Nodes_Bookmarks_Collection extends Solar_Model_Nodes_Collection {}
\ No newline at end of file
+class Solar_Model_Bookmarks_Collection extends Solar_Model_Nodes_Collection {}
\ No newline at end of file

Modified: trunk/Solar/Model/Bookmarks/Record.php
===================================================================
--- trunk/Solar/Model/Nodes/Bookmarks/Record.php	2008-05-28 16:31:28 UTC (rev 3184)
+++ trunk/Solar/Model/Bookmarks/Record.php	2008-06-03 01:58:16 UTC (rev 3197)
@@ -14,7 +14,7 @@
  * @version $Id$
  * 
  */
-class Solar_Model_Nodes_Bookmarks_Record extends Solar_Model_Nodes_Record
+class Solar_Model_Bookmarks_Record extends Solar_Model_Nodes_Record
 {
     /**
      * 

Copied: trunk/Solar/Model/Bookmarks.php (from rev 3184, trunk/Solar/Model/Nodes/Bookmarks.php)
===================================================================
--- trunk/Solar/Model/Bookmarks.php	                        (rev 0)
+++ trunk/Solar/Model/Bookmarks.php	2008-06-03 01:58:16 UTC (rev 3197)
@@ -0,0 +1,32 @@
+<?php
+/**
+ * 
+ * A model of nodes used as bookmarks.
+ * 
+ * @category Solar
+ * 
+ * @package Solar_Model
+ * 
+ * @author Paul M. Jones <pmjones at solarphp.com>
+ * 
+ * @license http://opensource.org/licenses/bsd-license.php BSD
+ * 
+ * @version $Id$
+ * 
+ */
+class Solar_Model_Bookmarks extends Solar_Model_Nodes
+{
+    /**
+     * 
+     * Model setup.
+     * 
+     * @return void
+     * 
+     */
+    protected function _setup()
+    {
+        parent::_setup();
+        $this->_addFilter('uri', 'validateNotBlank');
+        $this->_addFilter('tags_as_string', 'validateNotBlank');
+    }
+}

Deleted: trunk/Solar/Model/Nodes/Bookmarks.php
===================================================================
--- trunk/Solar/Model/Nodes/Bookmarks.php	2008-06-03 01:57:31 UTC (rev 3196)
+++ trunk/Solar/Model/Nodes/Bookmarks.php	2008-06-03 01:58:16 UTC (rev 3197)
@@ -1,32 +0,0 @@
-<?php
-/**
- * 
- * A model of nodes used as bookmarks.
- * 
- * @category Solar
- * 
- * @package Solar_Model
- * 
- * @author Paul M. Jones <pmjones at solarphp.com>
- * 
- * @license http://opensource.org/licenses/bsd-license.php BSD
- * 
- * @version $Id$
- * 
- */
-class Solar_Model_Nodes_Bookmarks extends Solar_Model_Nodes
-{
-    /**
-     * 
-     * Model setup.
-     * 
-     * @return void
-     * 
-     */
-    protected function _setup()
-    {
-        parent::_setup();
-        $this->_addFilter('uri', 'validateNotBlank');
-        $this->_addFilter('tags_as_string', 'validateNotBlank');
-    }
-}