Some minor code tweaks

pdepend · Jan 4, 2017 · b5d708e · b5d708e
1 parent 47ab52b
commit b5d708e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/src/main/php/PDepend/Source/AST/ASTArtifact.php b/src/main/php/PDepend/Source/AST/ASTArtifact.php
@@ -50,7 +50,7 @@
  * @copyright 2008-2015 Manuel Pichler. All rights reserved.
  * @license http://www.opensource.org/licenses/bsd-license.php BSD License
  */
-interface ASTArtifact// extends ASTNode
+interface ASTArtifact //extends ASTNode
 {
     /**
      * Returns the artifact name.

diff --git a/src/main/php/PDepend/Source/AST/ASTNamespace.php b/src/main/php/PDepend/Source/AST/ASTNamespace.php
@@ -52,13 +52,6 @@
  */
 class ASTNamespace extends AbstractASTArtifact
 {
-    /**
-     * The namespace name.
-     *
-     * @var string
-     */
-    protected $name = '';
-
     /**
      * The unique identifier for this function.
      *
@@ -96,20 +89,10 @@ class ASTNamespace extends AbstractASTArtifact
      */
     public function __construct($name)
     {
-        $this->name = $name;
+        parent::__construct($name);
         $this->id = spl_object_hash($this);
     }
 
-    /**
-     * Returns the namespace name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
     /**
      * Returns a id for this code node.
      *

diff --git a/src/main/php/PDepend/Source/AST/AbstractASTArtifact.php b/src/main/php/PDepend/Source/AST/AbstractASTArtifact.php
@@ -102,6 +102,16 @@ public function __construct($name)
         $this->name = $name;
     }
 
+    /**
+     * Returns the source image of this ast node.
+     *
+     * @return string
+     */
+    public function getImage()
+    {
+        return $this->name;
+    }
+
     /**
      * Returns the item name.
      *
@@ -125,6 +135,8 @@ public function setName($name)
         $this->name = $name;
     }
 
+
+
     /**
      * Returns a id for this code node.
      *

diff --git a/src/main/php/PDepend/Source/AST/AbstractASTType.php b/src/main/php/PDepend/Source/AST/AbstractASTType.php
@@ -381,6 +381,17 @@ public function setTokens(array $tokens)
             ->store($this->id, $tokens);
     }
 
+    /**
+     * @return string
+     */
+    public function getNamespacedName()
+    {
+        if (null === $this->namespaceName) {
+            return $this->name;
+        }
+        return sprintf('%s\\%s', $this->namespaceName, $this->name);
+    }
+
     /**
      * Returns the name of the parent namespace.
      *