Changeset 1871

Show
Ignore:
Timestamp:
09/30/08 16:51:53 (3 months ago)
Author:
mikey
Message:

get rid of stubConfig::useStar()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • framework/trunk/build.xml

    r1850 r1871  
    6262      </fileset> 
    6363    </copy> 
    64     <copy file="${stubbles.base.dir}/projects/dist/config/php/config-dist.php" tofile="${build.src.dir}/projects/dist/config/php/config.php"/> 
     64    <copy file="${stubbles.base.dir}/projects/dist/config/php/config.php" tofile="${build.src.dir}/projects/dist/config/php/config.php"/> 
    6565 
    6666    <mkdir dir="${build.src.dir}/projects/common/docroot/javascript"/> 

  • framework/trunk/projects/dist/config/php/config.php

    r1763 r1871  
    179179        return self::$commonPath; 
    180180    } 
    181  
    182     /** 
    183      * switch to use star files or not 
    184      * 
    185      * @return  bool 
    186      */ 
    187     public static function useStar() 
    188     { 
    189         return false; 
    190         #return true; 
    191     } 
    192181} 
    193182?> 

  • framework/trunk/projects/examples/config/php/config.php

    r1763 r1871  
    158158        return self::$commonPath; 
    159159    } 
    160  
    161     /** 
    162      * switch to use star files or not 
    163      * 
    164      * @return  bool 
    165      */ 
    166     public static function useStar() 
    167     { 
    168         return file_exists(self::getLibPath() . '/stubbles.php'); 
    169     } 
    170160} 
    171161?> 

  • framework/trunk/projects/examples/docroot/bootstrap-stubbles.php

    r1763 r1871  
    55    require stubConfig::getLibPath() . DIRECTORY_SEPARATOR . 'stubbles.php'; 
    66} else { 
     7    require stubConfig::getSourcePath() . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR . 'net' . DIRECTORY_SEPARATOR . 'stubbles' . DIRECTORY_SEPARATOR . 'stubClassLoader.php'; 
    78    require stubConfig::getLibPath() . DIRECTORY_SEPARATOR . 'starWriter.php'; 
    8     require stubConfig::getSourcePath() . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR . 'net' . DIRECTORY_SEPARATOR . 'stubbles' . DIRECTORY_SEPARATOR . 'stubClassLoader.php'; 
    99} 
    1010?> 

  • framework/trunk/src/main/php/net/stubbles/lang/stubFactory.php

    r1763 r1871  
    3636    { 
    3737        self::$resourcePath = stubConfig::getSourcePath() . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR; 
    38         if (stubConfig::useStar() == true && class_exists('StarClassRegistry', false) == true) { 
    39             self::$useStar = true; 
    40         } else { 
    41             self::$useStar = false; 
    42         } 
     38        self::$useStar      = class_exists('StarClassRegistry', false); 
    4339    } 
    4440    // @codeCoverageIgnoreEnd 

  • framework/trunk/src/main/php/net/stubbles/stubClassLoader.php

    r1822 r1871  
    155155    private static function init() 
    156156    { 
    157         if (stubConfig::useStar() == true && class_exists('StarClassRegistry', false) == true) { 
    158             self::$useStar = true; 
    159         } else { 
    160             self::$useStar = false; 
    161         } 
    162  
     157        self::$useStar    = class_exists('StarClassRegistry', false); 
    163158        self::$sourcePath = stubConfig::getSourcePath() . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR; 
    164159    }