From af51e7855d726ce3634fa897a71f46011729bf1f Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 22 Sep 2010 20:52:59 +0200 Subject: [PATCH] moved iterators to interpreters --- backend/lib/Interpreter/Interpreter.php | 14 ++++---------- .../Iterator/DataAggregationIterator.php | 2 +- .../{ => Interpreter}/Iterator/DataIterator.php | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) rename backend/lib/{ => Interpreter}/Iterator/DataAggregationIterator.php (98%) rename backend/lib/{ => Interpreter}/Iterator/DataIterator.php (97%) diff --git a/backend/lib/Interpreter/Interpreter.php b/backend/lib/Interpreter/Interpreter.php index 042aa87..3c4ef2f 100644 --- a/backend/lib/Interpreter/Interpreter.php +++ b/backend/lib/Interpreter/Interpreter.php @@ -23,17 +23,11 @@ namespace Volkszaehler\Interpreter; -/** - * - * @package default - * @author Steffen Vogel - * - */ -use Volkszaehler\Iterator; -use Volkszaehler; +use Volkszaehler\Interpreter\Iterator; +use Doctrine\ORM; +use Volkszaehler\Model; use Doctrine\ORM\Query; - /** * Interpreter superclass for all interpreters * @@ -56,7 +50,7 @@ abstract class Interpreter implements InterpreterInterface { * @param integer $from timestamp in ms since 1970 * @param integer $to timestamp in ms since 1970 */ - public function __construct(\Volkszaehler\Model\Channel $channel, \Doctrine\ORM\EntityManager $em, $from = NULL, $to = NULL) { + public function __construct(Model\Channel $channel, ORM\EntityManager $em, $from = NULL, $to = NULL) { $this->channel = $channel; $this->em = $em; diff --git a/backend/lib/Iterator/DataAggregationIterator.php b/backend/lib/Interpreter/Iterator/DataAggregationIterator.php similarity index 98% rename from backend/lib/Iterator/DataAggregationIterator.php rename to backend/lib/Interpreter/Iterator/DataAggregationIterator.php index 63c6333..5cc6c77 100644 --- a/backend/lib/Iterator/DataAggregationIterator.php +++ b/backend/lib/Interpreter/Iterator/DataAggregationIterator.php @@ -21,7 +21,7 @@ * along with volkszaehler.org. If not, see . */ -namespace Volkszaehler\Iterator; +namespace Volkszaehler\Interpreter\Iterator; use Doctrine\DBAL; diff --git a/backend/lib/Iterator/DataIterator.php b/backend/lib/Interpreter/Iterator/DataIterator.php similarity index 97% rename from backend/lib/Iterator/DataIterator.php rename to backend/lib/Interpreter/Iterator/DataIterator.php index 9e9b122..864c8cf 100644 --- a/backend/lib/Iterator/DataIterator.php +++ b/backend/lib/Interpreter/Iterator/DataIterator.php @@ -21,7 +21,7 @@ * along with volkszaehler.org. If not, see . */ -namespace Volkszaehler\Iterator; +namespace Volkszaehler\Interpreter\Iterator; use Doctrine\DBAL;