From 4911cf02cfeac62e9be0f39006be736a8d21ede3 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 23 Nov 2010 11:58:35 -0700
Subject: [PATCH] Horde_Themes_Build -> Horde_Themes_Cache

---
 .../Core/Factory/{ThemesBuild.php => ThemesCache.php}    | 16 ++++++++--------
 framework/Core/lib/Horde/Themes/{Build.php => Cache.php} |  5 +++--
 framework/Core/lib/Horde/Themes/Css.php                  |  4 ++--
 framework/Core/lib/Horde/Themes/Element.php              |  4 ++--
 framework/Core/package.xml                               |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)
 rename framework/Core/lib/Horde/Core/Factory/{ThemesBuild.php => ThemesCache.php} (86%)
 rename framework/Core/lib/Horde/Themes/{Build.php => Cache.php} (97%)

diff --git a/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
similarity index 86%
rename from framework/Core/lib/Horde/Core/Factory/ThemesBuild.php
rename to framework/Core/lib/Horde/Core/Factory/ThemesCache.php
index f184d28b1..d00efac46 100644
--- a/framework/Core/lib/Horde/Core/Factory/ThemesBuild.php
+++ b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * A Horde_Injector:: based Horde_Themes_Build:: factory.
+ * A Horde_Injector:: based Horde_Themes_Cache:: factory.
  *
  * PHP version 5
  *
@@ -12,7 +12,7 @@
  */
 
 /**
- * A Horde_Injector:: based Horde_Themes_Build:: factory.
+ * A Horde_Injector:: based Horde_Themes_Cache:: factory.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -25,7 +25,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Core
  */
-class Horde_Core_Factory_ThemesBuild
+class Horde_Core_Factory_ThemesCache
 {
     /**
      * The list of cache IDs mapped to instance IDs.
@@ -59,12 +59,12 @@ class Horde_Core_Factory_ThemesBuild
     }
 
     /**
-     * Return the Horde_Themes_Build:: instance.
+     * Return the Horde_Themes_Cache:: instance.
      *
      * @param string $app    The application name.
      * @param string $theme  The theme name.
      *
-     * @return Horde_Themes_Build  The singleton instance.
+     * @return Horde_Themes_Cache  The singleton instance.
      */
     public function create($app, $theme)
     {
@@ -79,7 +79,7 @@ class Horde_Core_Factory_ThemesBuild
         }
 
         if (!$cache || ($cache instanceof Horde_Cache_Null)) {
-            $instance = new Horde_Themes_Build($app, $theme);
+            $instance = new Horde_Themes_Cache($app, $theme);
         } else {
             $id = $sig . '|' . $GLOBALS['registry']->getVersion($app);
             if ($app != 'horde') {
@@ -94,8 +94,8 @@ class Horde_Core_Factory_ThemesBuild
                 $instance = null;
             }
 
-            if (!($instance instanceof Horde_Themes_Build)) {
-                $instance = new Horde_Themes_Build($app, $theme);
+            if (!($instance instanceof Horde_Themes_Cache)) {
+                $instance = new Horde_Themes_Cache($app, $theme);
                 $instance->build();
 
                 if (empty($this->_cacheids)) {
diff --git a/framework/Core/lib/Horde/Themes/Build.php b/framework/Core/lib/Horde/Themes/Cache.php
similarity index 97%
rename from framework/Core/lib/Horde/Themes/Build.php
rename to framework/Core/lib/Horde/Themes/Cache.php
index fbe1d6cf8..3294b1447 100644
--- a/framework/Core/lib/Horde/Themes/Build.php
+++ b/framework/Core/lib/Horde/Themes/Cache.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This class is responsible for parsing/building a theme.
+ * This class is responsible for parsing/building theme elements and then
+ * caching these results.
  *
  * Copyright 2010 The Horde Project (http://www.horde.org/)
  *
@@ -12,7 +13,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @package  Core
  */
-class Horde_Themes_Build implements Serializable
+class Horde_Themes_Cache implements Serializable
 {
     /* Constants */
     const HORDE_DEFAULT = 1;
diff --git a/framework/Core/lib/Horde/Themes/Css.php b/framework/Core/lib/Horde/Themes/Css.php
index 5a32cdd01..d82138c31 100644
--- a/framework/Core/lib/Horde/Themes/Css.php
+++ b/framework/Core/lib/Horde/Themes/Css.php
@@ -182,12 +182,12 @@ class Horde_Themes_Css
             : $opts['app'];
         $mask = empty($opts['nohorde'])
             ? 0
-            : Horde_Themes_Build::APP_DEFAULT | Horde_Themes_Build::APP_THEME;
+            : Horde_Themes_Cache::APP_DEFAULT | Horde_Themes_Cache::APP_THEME;
         $sub = empty($opts['sub'])
             ? null
             : $opts['sub'];
 
-        $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesBuild')->create($curr_app, $theme);
+        $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($curr_app, $theme);
 
         foreach ($css_list as $css_name) {
             if (empty($opts['subonly'])) {
diff --git a/framework/Core/lib/Horde/Themes/Element.php b/framework/Core/lib/Horde/Themes/Element.php
index a02dcd8ce..e60bee041 100644
--- a/framework/Core/lib/Horde/Themes/Element.php
+++ b/framework/Core/lib/Horde/Themes/Element.php
@@ -121,10 +121,10 @@ class Horde_Themes_Element
                 'uri' => $registry->get('themesuri', $this->app) . '/' . $theme . '/' . $this->_dirname
             );
         } else {
-            $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesBuild')->create($this->app, $theme);
+            $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($this->app, $theme);
             $mask = empty($this->_opts['nohorde'])
                 ? 0
-                : Horde_Themes_Build::APP_DEFAULT | Horde_Themes_Build::APP_THEME;
+                : Horde_Themes_Cache::APP_DEFAULT | Horde_Themes_Cache::APP_THEME;
 
             $this->_data = $build->get($this->_dirname . '/' . $this->_name, $mask);
         }
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index e54aec898..8516b8d42 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -164,7 +164,7 @@ Application Framework.</description>
        <file name="ShareBase.php" role="php" />
        <file name="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
-       <file name="ThemesBuild.php" role="php" />
+       <file name="ThemesCache.php" role="php" />
        <file name="Token.php" role="php" />
        <file name="Tree.php" role="php" />
        <file name="Twitter.php" role="php" />
@@ -259,7 +259,7 @@ Application Framework.</description>
       <file name="Files.php" role="php" />
      </dir> <!-- /lib/Horde/Script -->
      <dir name="Themes">
-      <file name="Build.php" role="php" />
+      <file name="Cache.php" role="php" />
       <file name="Css.php" role="php" />
       <file name="Element.php" role="php" />
       <file name="Image.php" role="php" />
@@ -786,7 +786,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/ShareBase.php" name="lib/Horde/Core/Factory/ShareBase.php" />
    <install as="Horde/Core/Factory/Template.php" name="lib/Horde/Core/Factory/Template.php" />
    <install as="Horde/Core/Factory/TextFilter.php" name="lib/Horde/Core/Factory/TextFilter.php" />
-   <install as="Horde/Core/Factory/ThemesBuild.php" name="lib/Horde/Core/Factory/ThemesBuild.php" />
+   <install as="Horde/Core/Factory/ThemesCache.php" name="lib/Horde/Core/Factory/ThemesCache.php" />
    <install as="Horde/Core/Factory/Token.php" name="lib/Horde/Core/Factory/Token.php" />
    <install as="Horde/Core/Factory/Tree.php" name="lib/Horde/Core/Factory/Tree.php" />
    <install as="Horde/Core/Factory/Twitter.php" name="lib/Horde/Core/Factory/Twitter.php" />
@@ -831,7 +831,7 @@ Application Framework.</description>
    <install as="Horde/Registry/Application.php" name="lib/Horde/Registry/Application.php" />
    <install as="Horde/Registry/Caller.php" name="lib/Horde/Registry/Caller.php" />
    <install as="Horde/Script/Files.php" name="lib/Horde/Script/Files.php" />
-   <install as="Horde/Themes/Build.php" name="lib/Horde/Themes/Build.php" />
+   <install as="Horde/Themes/Cache.php" name="lib/Horde/Themes/Cache.php" />
    <install as="Horde/Themes/Css.php" name="lib/Horde/Themes/Css.php" />
    <install as="Horde/Themes/Element.php" name="lib/Horde/Themes/Element.php" />
    <install as="Horde/Themes/Image.php" name="lib/Horde/Themes/Image.php" />
-- 
2.11.0