Changeset 912

Show
Ignore:
Timestamp:
09/12/07 12:50:22 (1 year ago)
Author:
mikey
Message:

use same naming scheme

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/rdbms/persistence/finder/stubDatabaseFinderResult.php

    r881 r912  
    2222     * reflection class for entity 
    2323     * 
    24      * @var  stubReflectionClass 
     24     * @var  stubBaseReflectionClass 
    2525     */ 
    26     protected $refClass; 
     26    protected $entityClass; 
    2727    /** 
    2828     * the result set from the database query 
    …… 
    4747     * constructor 
    4848     * 
    49      * @param  stubReflectionClass     $refClass            reflection class for entity 
    50      * @param  array                   $result              result set from the database query 
    51      * @param  stubSetterMethodHelper  $setterMethodHelper  list of setter methods for entity 
    52      * @param  array                   $arguments           optional  list of arguments for entity constructor 
     49     * @param  stubBaseReflectionClass  $entityClass         reflection class for entity 
     50     * @param  array                    $result              result set from the database query 
     51     * @param  stubSetterMethodHelper  $setterMethodHelper  list of setter methods for entity 
     52     * @param  array                    $arguments           optional  list of arguments for entity constructor 
    5353     */ 
    54     public function __construct(stubReflectionClass $refClass, array $result, stubSetterMethodHelper $setterMethodHelper, array $arguments = null) 
     54    public function __construct(stubBaseReflectionClass $entityClass, array $result, stubSetterMethodHelper $setterMethodHelper, array $arguments = null) 
    5555    { 
    56         $this->refClass           = $refClass; 
     56        $this->entityClass        = $entityClass; 
    5757        $this->resultIterator     = new ArrayIterator($result); 
    5858        $this->setterMethodHelper = $setterMethodHelper; 
    …… 
    6363     * returns reflection class for entity 
    6464     * 
    65      * @return  stubReflectionClass 
     65     * @return  stubBaseReflectionClass 
    6666     */ 
    6767    public function forClass() 
    6868    { 
    69         return $this->refClass; 
     69        return $this->entityClass; 
    7070    } 
    7171 
    …… 
    8787    { 
    8888        try { 
    89             if (null === $this->arguments) { 
    90                 $entity = $this->refClass->newInstance(); 
    91             } else { 
    92                 $entity = $this->refClass->newInstanceArgs($this->arguments); 
    93             } 
     89            $entity = ((null === $this->arguments) ? ($this->entityClass->newInstance()) : ($this->entityClass->newInstanceArgs($this->arguments))); 
    9490        } catch (ReflectionException $re) { 
    95             throw new stubDatabaseFinderException('Can not create a new instance of ' . $this->refClass->getFullQualifiedClassName(), $re); 
     91            throw new stubDatabaseFinderException('Can not create a new instance of ' . $this->entityClass->getFullQualifiedClassName(), $re); 
    9692        } 
    9793         
    9894        if (null === $entity) { 
    99             throw new stubDatabaseFinderException('Can not create a new instance of ' . $this->refClass->getFullQualifiedClassName()); 
     95            throw new stubDatabaseFinderException('Can not create a new instance of ' . $this->entityClass->getFullQualifiedClassName()); 
    10096        } 
    10197         
    10298        $this->setterMethodHelper->applySetterMethods($entity, $this->resultIterator->current()); 
    103         if ($entity instanceof stubPersistable) { 
    104             $entity->setPersistent(true); 
    105         } 
    106          
    10799        return $entity; 
    108100    }