Changeset 835
- Timestamp:
- 08/15/07 14:03:57 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/ioc/injection/stubBinding.php
r828 r835 134 134 public function getInstance() { 135 135 if ($this->instance != null) { 136 return $this->instance;136 return $this->instance; 137 137 } 138 138 … … 142 142 143 143 if ($this->scope === null) { 144 if ($this->impl->hasAnnotation('Singleton')) {145 $this->scope = stubBindingScopes::$SINGLETON;146 }144 if ($this->impl->hasAnnotation('Singleton')) { 145 $this->scope = stubBindingScopes::$SINGLETON; 146 } 147 147 } 148 148 if ($this->scope != null) { … … 206 206 public function getKey() { 207 207 if ($this->name === null) { 208 return $this->type;208 return $this->type; 209 209 } 210 210 return $this->type . '#' . $this->name; 211 211 } 212 213 214 212 } 215 213 ?> trunk/src/main/php/net/stubbles/ioc/injection/stubInjector.php
r825 r835 45 45 public function getInstance($type, $name = null) { 46 46 if (!empty($this->bindings)) { 47 $this->updateIndex();47 $this->updateIndex(); 48 48 } 49 49 $binding = $this->getBinding($type, $name); trunk/src/main/php/net/stubbles/xml/stubDomXMLStreamWriter.php
r829 r835 250 250 $messages = array(); 251 251 foreach ($errors as $error) { 252 $messages[] = trim($error->message);252 $messages[] = trim($error->message); 253 253 } 254 254 return implode(', ', $messages);
