[limb-svn] r6033 - 3.x/trunk/limb/fs/src

[svn at limb-project.com]

Author: serega
Date: 2007-07-02 10:29:27 +0400 (Mon, 02 Jul 2007)
New Revision: 6033
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6033

Modified:
   3.x/trunk/limb/fs/src/lmbFsTools.class.php
Log:
-- lmbFsTools :: findFileAlias -> findFileByAlias
-- minor refactorings in lmbFsTools :: getFileLocator()

Modified: 3.x/trunk/limb/fs/src/lmbFsTools.class.php
===================================================================
--- 3.x/trunk/limb/fs/src/lmbFsTools.class.php	2007-07-01 21:59:53 UTC (rev 6032)
+++ 3.x/trunk/limb/fs/src/lmbFsTools.class.php	2007-07-02 06:29:27 UTC (rev 6033)
@@ -1,47 +1,47 @@
 <?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 lmb_require('limb/toolkit/src/lmbAbstractTools.class.php');
 lmb_require('limb/fs/src/lmbFileLocator.class.php');
 lmb_require('limb/fs/src/lmbCachingFileLocator.class.php');
-lmb_require('limb/fs/src/lmbIncludePathFileLocations.class.php');
-
+lmb_require('limb/fs/src/lmbIncludePathFileLocations.class.php');
+
 /**
  * class lmbFsTools.
  *
  * @package fs
  * @version $Id$
- */
+ */
 class lmbFsTools extends lmbAbstractTools
 {
   protected $file_locators = array();
 
-  function findFileAlias($name, $paths, $files_group)
+  function findFileByAlias($alias, $paths, $locator_name)
   {
-    $locator = $this->toolkit->getFileLocator($paths, $files_group);
-    return $locator->locate($name);
+    $locator = $this->toolkit->getFileLocator($paths, $locator_name);
+    return $locator->locate($alias);
   }
 
-  function getFileLocator($path, $files_group)
+  function getFileLocator($paths, $locator_name)
   {
-    if(isset($this->file_locators[$path][$files_group]))
-       return $this->file_locators[$path][$files_group];
+    if(isset($this->file_locators[$locator_name]))
+       return $this->file_locators[$locator_name];
 
-    $file_locations = new lmbIncludePathFileLocations(explode(';', $path));
+    $file_locations = new lmbIncludePathFileLocations(explode(';', $paths));
 
     if(defined('LIMB_VAR_DIR'))
       $locator = new lmbCachingFileLocator(new lmbFileLocator($file_locations),
                                            LIMB_VAR_DIR . '/locators/',
-                                           $files_group);
+                                           $locator_name);
     else
-      $locator = new lmbFileLocator($file_locations);
+      $locator = new lmbFileLocator($locator_name);
 
-    $this->file_locators[$path][$files_group] = $locator;
+    $this->file_locators[$locator_name] = $locator;
     return $locator;
   }
 }