From d46440a10a583a3ddf3e8d61086328eef2b566d1 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 7 Oct 2010 17:34:32 -0400
Subject: [PATCH] Access Horde_Core_Factory_Tree directly

---
 agora/lib/Messages.php                         |  2 +-
 ansel/lib/Ansel.php                            |  2 +-
 ansel/lib/Widget/OtherGalleries.php            |  2 +-
 framework/Core/lib/Horde/Core/Binder/Tree.php  | 17 -----------------
 framework/Core/lib/Horde/Core/Factory/Tree.php |  2 +-
 framework/Core/lib/Horde/Core/Perms/Ui.php     |  2 +-
 framework/Core/lib/Horde/Core/Sidebar.php      |  2 +-
 framework/Core/lib/Horde/Registry.php          |  1 -
 framework/Core/package.xml                     |  2 --
 hermes/deliverables.php                        |  2 +-
 horde/admin/activesync.php                     |  2 +-
 horde/admin/datatree.php                       |  2 +-
 horde/admin/groups.php                         |  2 +-
 horde/services/help/index.php                  |  2 +-
 imp/lib/Imap/Tree.php                          |  2 +-
 trean/lib/Trean.php                            |  2 +-
 trean/templates/browse.php                     |  2 +-
 17 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 framework/Core/lib/Horde/Core/Binder/Tree.php

diff --git a/agora/lib/Messages.php b/agora/lib/Messages.php
index d24608487..5c7d4709a 100644
--- a/agora/lib/Messages.php
+++ b/agora/lib/Messages.php
@@ -1395,7 +1395,7 @@ class Agora_Messages {
         /* Render threaded lists with Horde_Tree. */
         $current = key($threads);
         if (!$template_file && isset($threads[$current]['indent'])) {
-            $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('threads', 'Html', array(
+            $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('threads', 'Html', array(
                 'multiline' => $bodies,
                 'lines' => !$bodies
             ));
diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 7f84bd9ba..00f587b86 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -91,7 +91,7 @@ class Ansel
             ->getScope()
             ->listGalleries($params);
 
-        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('gallery_tree', 'Select');
+        $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('gallery_tree', 'Select');
 
         /* Remove the ignored gallery, make sure it's also not the selected
          * gallery */
diff --git a/ansel/lib/Widget/OtherGalleries.php b/ansel/lib/Widget/OtherGalleries.php
index c1b503fed..880ebf6b0 100644
--- a/ansel/lib/Widget/OtherGalleries.php
+++ b/ansel/lib/Widget/OtherGalleries.php
@@ -64,7 +64,7 @@ class Ansel_Widget_OtherGalleries extends Ansel_Widget_Base
         $owner = $this->_view->gallery->get('owner');
 
         /* Set up the tree */
-        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('otherAnselGalleries_' . md5($owner), 'Javascript', array('class' => 'anselWidgets'));
+        $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('otherAnselGalleries_' . md5($owner), 'Javascript', array('class' => 'anselWidgets'));
 
         try {
             $galleries = $GLOBALS['injector']->getInstance('Ansel_Storage')
diff --git a/framework/Core/lib/Horde/Core/Binder/Tree.php b/framework/Core/lib/Horde/Core/Binder/Tree.php
deleted file mode 100644
index abe00d8c1..000000000
--- a/framework/Core/lib/Horde/Core/Binder/Tree.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Tree implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Tree($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
diff --git a/framework/Core/lib/Horde/Core/Factory/Tree.php b/framework/Core/lib/Horde/Core/Factory/Tree.php
index a8a94dc56..a289f0cbe 100644
--- a/framework/Core/lib/Horde/Core/Factory/Tree.php
+++ b/framework/Core/lib/Horde/Core/Factory/Tree.php
@@ -66,7 +66,7 @@ class Horde_Core_Factory_Tree
      * @return Horde_Tree_Base  The singleton instance.
      * @throws Horde_Tree_Exception
      */
-    public function getTree($name, $renderer, array $params = array())
+    public function create($name, $renderer, array $params = array())
     {
         $lc_renderer = Horde_String::lower($renderer);
         $id = $name . '|' . $lc_renderer;
diff --git a/framework/Core/lib/Horde/Core/Perms/Ui.php b/framework/Core/lib/Horde/Core/Perms/Ui.php
index 18441992c..7349d4224 100644
--- a/framework/Core/lib/Horde/Core/Perms/Ui.php
+++ b/framework/Core/lib/Horde/Core/Perms/Ui.php
@@ -75,7 +75,7 @@ class Horde_Core_Perms_Ui
         $blank_img = Horde::img('blank.gif', '', array('width' => 16, 'height' => 16));
 
         /* Set up the tree. */
-        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('perms_ui', 'Javascript', array(
+        $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('perms_ui', 'Javascript', array(
             'alternate' => true,
             'hideHeaders' => true
         ));
diff --git a/framework/Core/lib/Horde/Core/Sidebar.php b/framework/Core/lib/Horde/Core/Sidebar.php
index aac0a2ef5..278772a72 100644
--- a/framework/Core/lib/Horde/Core/Sidebar.php
+++ b/framework/Core/lib/Horde/Core/Sidebar.php
@@ -123,7 +123,7 @@ class Horde_Core_Sidebar
         }
 
         // Set up the tree.
-        $tree = $injector->getInstance('Horde_Tree')->getTree('horde_sidebar', 'Javascript', array('jsvar' => 'HordeSidebar.tree'));
+        $tree = $injector->getInstance('Horde_Core_Factory_Tree')->create('horde_sidebar', 'Javascript', array('jsvar' => 'HordeSidebar.tree'));
 
         foreach ($menu as $app => $params) {
             switch ($params['status']) {
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 7e962ed43..8de506a77 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -253,7 +253,6 @@ class Horde_Registry
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
-            'Horde_Tree' => new Horde_Core_Binder_Tree(),
             'Horde_Vfs' => new Horde_Core_Binder_Vfs(),
         );
 
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 9d0687b99..69eda8739 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Tree.php" role="php" />
        <file name="Vfs.php" role="php" />
       </dir> <!-- /lib/Horde/Core/Binder -->
       <dir name="Controller">
@@ -424,7 +423,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Tree.php" name="lib/Horde/Core/Binder/Tree.php" />
    <install as="Horde/Core/Binder/Vfs.php" name="lib/Horde/Core/Binder/Vfs.php" />
    <install as="Horde/Core/Controller/NotFound.php" name="lib/Horde/Core/Controller/NotFound.php" />
    <install as="Horde/Core/Controller/RequestConfiguration.php" name="lib/Horde/Core/Controller/RequestConfiguration.php" />
diff --git a/hermes/deliverables.php b/hermes/deliverables.php
index ce4ac8579..3983b0b87 100644
--- a/hermes/deliverables.php
+++ b/hermes/deliverables.php
@@ -88,7 +88,7 @@ if ($vars->exists('deliverable_id') || $vars->exists('new')) {
         throw new Hermes_Exception($deliverables);
     }
 
-    $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('deliverables', 'Javascript');
+    $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('deliverables', 'Javascript');
     $tree->setOption(array('class'       => 'item',
                            'alternate'   => true));
 
diff --git a/horde/admin/activesync.php b/horde/admin/activesync.php
index f7fe25793..47688194c 100644
--- a/horde/admin/activesync.php
+++ b/horde/admin/activesync.php
@@ -85,7 +85,7 @@ $device_node = array('icon' => strval(Horde_Themes::img('mobile.png')));
 $user_node = array('icon' => strval(Horde_Themes::img('user.png')));
 $users = array();
 
-$tree = $injector->getInstance('Horde_Tree')->getTree('admin_devices', 'Javascript', array(
+$tree = $injector->getInstance('Horde_Core_Factory_Tree')->create('admin_devices', 'Javascript', array(
     'alternate' => true
 ));
 
diff --git a/horde/admin/datatree.php b/horde/admin/datatree.php
index 67759f5fb..40eababf1 100644
--- a/horde/admin/datatree.php
+++ b/horde/admin/datatree.php
@@ -31,7 +31,7 @@ Horde_Registry::appInit('horde', array('admin' => true));
 
 require_once 'Horde/DataTree.php';
 
-$tree = $injector->getInstance('Horde_Tree')->getTree('datatree', 'Javascript', array(
+$tree = $injector->getInstance('Horde_Core_Factory_Tree')->create('datatree', 'Javascript', array(
     'alternate' => true
 ));
 
diff --git a/horde/admin/groups.php b/horde/admin/groups.php
index dfd3f1662..f193659bb 100644
--- a/horde/admin/groups.php
+++ b/horde/admin/groups.php
@@ -215,7 +215,7 @@ $edit_img = Horde::img('edit.png', _("Edit Group"));
 $delete_img = Horde::img('delete.png', _("Delete Group"));
 
 /* Set up the tree. */
-$tree = $injector->getInstance('Horde_Tree')->getTree('admin_groups', 'Javascript', array(
+$tree = $injector->getInstance('Horde_Core_Factory_Tree')->create('admin_groups', 'Javascript', array(
     'alternate' => true,
     'hideHeaders' => true
 ));
diff --git a/horde/services/help/index.php b/horde/services/help/index.php
index 978620671..ad7f7e3f5 100644
--- a/horde/services/help/index.php
+++ b/horde/services/help/index.php
@@ -71,7 +71,7 @@ case 'sidebar':
     $tabs->addTab(_("Sea_rch"), $sidebar_url, 'search');
 
     /* Set up the tree. */
-    $tree = $injector->getInstance('Horde_Tree')->getTree('horde_menu', 'Javascript');
+    $tree = $injector->getInstance('Horde_Core_Factory_Tree')->create('horde_menu', 'Javascript');
     $tree->setOption(array('target' => 'help_main'));
 
     $contents = '';
diff --git a/imp/lib/Imap/Tree.php b/imp/lib/Imap/Tree.php
index b9318b2da..858d62256 100644
--- a/imp/lib/Imap/Tree.php
+++ b/imp/lib/Imap/Tree.php
@@ -1482,7 +1482,7 @@ class IMP_Imap_Tree implements ArrayAccess, Iterator, Serializable
             $tree = $name;
             $parent = $opts['parent'];
         } else {
-            $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree($name, $opts['render_type'], array(
+            $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create($name, $opts['render_type'], array(
                 'alternate' => true,
                 'lines' => true,
                 'lines_base' => true,
diff --git a/trean/lib/Trean.php b/trean/lib/Trean.php
index 03bffb40a..074a80726 100644
--- a/trean/lib/Trean.php
+++ b/trean/lib/Trean.php
@@ -91,7 +91,7 @@ class Trean
             $folders = array();
         }
 
-        $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('folder_select', 'Select');
+        $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('folder_select', 'Select');
 
         foreach ($folders as $folder_name => $folder) {
             /* Selected or not? */
diff --git a/trean/templates/browse.php b/trean/templates/browse.php
index 8357eb8a3..3b7e2de5e 100644
--- a/trean/templates/browse.php
+++ b/trean/templates/browse.php
@@ -118,7 +118,7 @@ $folders = Trean::listFolders(Horde_Perms::READ);
 if (!is_a($folders, 'PEAR_Error')) {
     $params = array('icon' => 'folder.png',
                     'iconopen' => 'folderopen.png');
-    $tree = $GLOBALS['injector']->getInstance('Horde_Tree')->getTree('folder_tree', 'Javascript');
+    $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('folder_tree', 'Javascript');
     $tree->setOption(array('alternate' => true));
     $expand = $prefs->getValue('expand_tree');
     if ($expand == 'none') {
-- 
2.11.0