From 3bdfbc13de9502c4ed16eb810a35d0634c57efcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Wed, 9 Mar 2016 14:12:56 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9place=20les=20impl=C3=A9mentations=20de?=
 =?UTF-8?q?=20Namespace=20dans=20leur=20namespace.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/ClassVisitor.php                       | 6 ++++--
 Model/{ => Namespace_}/AbstractNamespace.php | 4 +++-
 Model/{ => Namespace_}/Namespace_.php        | 4 +++-
 Model/{ => Namespace_}/RootNamespace.php     | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)
 rename Model/{ => Namespace_}/AbstractNamespace.php (93%)
 rename Model/{ => Namespace_}/Namespace_.php (89%)
 rename Model/{ => Namespace_}/RootNamespace.php (90%)

diff --git a/Model/ClassVisitor.php b/Model/ClassVisitor.php
index ae2e925..e559f0d 100644
--- a/Model/ClassVisitor.php
+++ b/Model/ClassVisitor.php
@@ -8,6 +8,8 @@
 
 namespace Irstea\PlantUmlBundle\Model;
 
+use Irstea\PlantUmlBundle\Model\Filter\AcceptAllFilter;
+use Irstea\PlantUmlBundle\Model\Namespace_\RootNamespace;
 use Irstea\PlantUmlBundle\Model\Node\Class_;
 use Irstea\PlantUmlBundle\Model\Node\Interface_;
 use Irstea\PlantUmlBundle\Model\Node\Trait_;
@@ -36,11 +38,11 @@ class ClassVisitor implements ClassVisitorInterface, WritableInterface
     public function __construct(ClassFilterInterface $filter = null)
     {
         $this->rootNamespace = new RootNamespace();
-        $this->filter = $filter ?: Filter\AcceptAllFilter::instance();
+        $this->filter = $filter ?: AcceptAllFilter::instance();
     }
 
     /**
-     * @param \Irstea\PlantUmlBundle\Model\ClassFilterInterface $filter
+     * @param ClassFilterInterface $filter
      * @return self
      */
     public function setClassFilter(ClassFilterInterface $filter)
diff --git a/Model/AbstractNamespace.php b/Model/Namespace_/AbstractNamespace.php
similarity index 93%
rename from Model/AbstractNamespace.php
rename to Model/Namespace_/AbstractNamespace.php
index 5cc0538..f2826c0 100644
--- a/Model/AbstractNamespace.php
+++ b/Model/Namespace_/AbstractNamespace.php
@@ -6,8 +6,10 @@
  * Tous droits réservés.
  */
 
-namespace Irstea\PlantUmlBundle\Model;
+namespace Irstea\PlantUmlBundle\Model\Namespace_;
 
+use Irstea\PlantUmlBundle\Model\NamespaceInterface;
+use Irstea\PlantUmlBundle\Model\NodeInterface;
 use Irstea\PlantUmlBundle\Writer\WritableInterface;
 use Irstea\PlantUmlBundle\Writer\WriterInterface;
 
diff --git a/Model/Namespace_.php b/Model/Namespace_/Namespace_.php
similarity index 89%
rename from Model/Namespace_.php
rename to Model/Namespace_/Namespace_.php
index 0b504ca..2f4977a 100644
--- a/Model/Namespace_.php
+++ b/Model/Namespace_/Namespace_.php
@@ -6,8 +6,10 @@
  * Tous droits réservés.
  */
 
-namespace Irstea\PlantUmlBundle\Model;
+namespace Irstea\PlantUmlBundle\Model\Namespace_;
 
+use Irstea\PlantUmlBundle\Model\ArrowInterface;
+use Irstea\PlantUmlBundle\Model\NamespaceInterface;
 use Irstea\PlantUmlBundle\Writer\WriterInterface;
 
 /**
diff --git a/Model/RootNamespace.php b/Model/Namespace_/RootNamespace.php
similarity index 90%
rename from Model/RootNamespace.php
rename to Model/Namespace_/RootNamespace.php
index efa9f3d..52719da 100644
--- a/Model/RootNamespace.php
+++ b/Model/Namespace_/RootNamespace.php
@@ -6,8 +6,9 @@
  * Tous droits réservés.
  */
 
-namespace Irstea\PlantUmlBundle\Model;
+namespace Irstea\PlantUmlBundle\Model\Namespace_;
 
+use Irstea\PlantUmlBundle\Model\ArrowInterface;
 use Irstea\PlantUmlBundle\Writer\WriterInterface;
 
 /**
-- 
GitLab