From: Roland Haeder Date: Sun, 26 Feb 2017 19:36:11 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e6c7982d988772a7310c082a7b5a73b5b3ca629;p=core.git Continued: - added "import" of FilePointer, CloseableFile and BaseBinaryFile - added "import" of Block - added "import" of Handleable, HandleableDataSet, BaseHandler Signed-off-by: Roland Häder --- diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index 16aa6d9b..41287ab0 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -12,6 +12,8 @@ use CoreFramework\Criteria\Local\LocalSearchCriteria; use CoreFramework\Criteria\Local\LocalUpdateCriteria; use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Filesystem\Block; +use CoreFramework\Filesystem\FilePointer; use CoreFramework\Filesystem\FrameworkDirectory; use CoreFramework\Generic\FrameworkInterface; use CoreFramework\Generic\NullPointerException; diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php index 9ce33ec2..f89e0aaf 100644 --- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php +++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php @@ -4,6 +4,7 @@ namespace CoreFramework\Filesystem\File; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Filesystem\Block; /** * A general binary file class diff --git a/framework/main/classes/file_directories/binary/index/class_IndexFile.php b/framework/main/classes/file_directories/binary/index/class_IndexFile.php index f7335896..1e4fa7a4 100644 --- a/framework/main/classes/file_directories/binary/index/class_IndexFile.php +++ b/framework/main/classes/file_directories/binary/index/class_IndexFile.php @@ -2,6 +2,10 @@ // Own namespace namespace CoreFramework\Filesystem\Index; +// Import framework stuff +use CoreFramework\Filesystem\Block; +use CoreFramework\Filesystem\File\BaseBinaryFile; + /** * An index file class * diff --git a/framework/main/classes/file_directories/binary/stack/class_StackFile.php b/framework/main/classes/file_directories/binary/stack/class_StackFile.php index 87b3c0b8..cb557be7 100644 --- a/framework/main/classes/file_directories/binary/stack/class_StackFile.php +++ b/framework/main/classes/file_directories/binary/stack/class_StackFile.php @@ -2,6 +2,10 @@ // Own namespace namespace CoreFramework\Filesystem\Stack; +// Import framework stuff +use CoreFramework\Filesystem\Block; +use CoreFramework\Filesystem\File\BaseBinaryFile; + /** * A stack file class * diff --git a/framework/main/classes/file_directories/class_BaseAbstractFile.php b/framework/main/classes/file_directories/class_BaseAbstractFile.php index a4f718dc..a702c683 100644 --- a/framework/main/classes/file_directories/class_BaseAbstractFile.php +++ b/framework/main/classes/file_directories/class_BaseAbstractFile.php @@ -3,6 +3,8 @@ namespace CoreFramework\Filesystem\File; // Import framework stuff +use CoreFramework\Filesystem\CloseableFile; +use CoreFramework\Filesystem\FilePointer; use CoreFramework\Object\BaseFrameworkSystem; /** diff --git a/framework/main/classes/file_directories/class_BaseFileIo.php b/framework/main/classes/file_directories/class_BaseFileIo.php index 829557ea..4ba2e962 100644 --- a/framework/main/classes/file_directories/class_BaseFileIo.php +++ b/framework/main/classes/file_directories/class_BaseFileIo.php @@ -3,6 +3,8 @@ namespace CoreFramework\FileSystem; // Import framework stuff +use CoreFramework\Filesystem\CloseableFile; +use CoreFramework\Filesystem\FilePointer; use CoreFramework\Generic\NullPointerException; use CoreFramework\Object\BaseFrameworkSystem; diff --git a/framework/main/classes/handler/class_BaseHandler.php b/framework/main/classes/handler/class_BaseHandler.php index 945ebeb6..c152b0c8 100644 --- a/framework/main/classes/handler/class_BaseHandler.php +++ b/framework/main/classes/handler/class_BaseHandler.php @@ -4,6 +4,7 @@ namespace CoreFramework\Handler; // Import framework stuff use CoreFramework\Criteria\Storing\StoreableCriteria; +use CoreFramework\Handler\DataSet\HandleableDataSet; use CoreFramework\Object\BaseFrameworkSystem; /** diff --git a/framework/main/classes/handler/raw_data/class_BaseDataHandler.php b/framework/main/classes/handler/raw_data/class_BaseDataHandler.php index 4299aad1..b9b55e91 100644 --- a/framework/main/classes/handler/raw_data/class_BaseDataHandler.php +++ b/framework/main/classes/handler/raw_data/class_BaseDataHandler.php @@ -5,6 +5,7 @@ namespace CoreFramework\Handler\Data; // Import framework stuff use CoreFramework\Factory\ObjectFactory; use CoreFramework\Generic\FrameworkException; +use CoreFramework\Handler\BaseHandler; /** * A general data Handler diff --git a/framework/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php b/framework/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php index a762b449..32f63dc9 100644 --- a/framework/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php +++ b/framework/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php @@ -4,6 +4,7 @@ namespace CoreFramework\Handler\Raw; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Handler\BaseHandler; /** * A general Handler for raw data from sockets diff --git a/framework/main/classes/handler/tasks/class_TaskHandler.php b/framework/main/classes/handler/tasks/class_TaskHandler.php index b52d3bd3..34ddc5b1 100644 --- a/framework/main/classes/handler/tasks/class_TaskHandler.php +++ b/framework/main/classes/handler/tasks/class_TaskHandler.php @@ -4,6 +4,7 @@ namespace CoreFramework\Handler\Task; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Handler\BaseHandler; use CoreFramework\Registry\Registerable; /** diff --git a/framework/main/classes/index/class_BaseIndex.php b/framework/main/classes/index/class_BaseIndex.php index 8c000fa1..d035d617 100644 --- a/framework/main/classes/index/class_BaseIndex.php +++ b/framework/main/classes/index/class_BaseIndex.php @@ -4,6 +4,7 @@ namespace CoreFramework\Index; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Filesystem\File\BaseBinaryFile; use CoreFramework\Object\BaseFrameworkSystem; /** diff --git a/framework/main/classes/iterator/file/class_FileIterator.php b/framework/main/classes/iterator/file/class_FileIterator.php index 5b0c5cd8..6e0f1957 100644 --- a/framework/main/classes/iterator/file/class_FileIterator.php +++ b/framework/main/classes/iterator/file/class_FileIterator.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Iterator\File; +// Import framework stuff +use CoreFramework\Filesystem\Block; + /** * A file iterator * diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php index dd446e62..43ac9cca 100644 --- a/framework/main/classes/stacker/file/class_BaseFileStack.php +++ b/framework/main/classes/stacker/file/class_BaseFileStack.php @@ -4,6 +4,7 @@ namespace CoreFramework\Stack\File; // Import framework stuff use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Filesystem\File\BaseBinaryFile; /** * A general file-based stack class diff --git a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php index 2277bdff..04185bc8 100644 --- a/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php +++ b/framework/main/interfaces/block/calculatable/class_CalculatableBlock.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Filesystem\Block; +// Import framework stuff +use CoreFramework\Filesystem\Block; + /** * A CalculatableBlock interface * diff --git a/framework/main/interfaces/handler/class_HandleableDataSet.php b/framework/main/interfaces/handler/class_HandleableDataSet.php index e4434768..ea432ae2 100644 --- a/framework/main/interfaces/handler/class_HandleableDataSet.php +++ b/framework/main/interfaces/handler/class_HandleableDataSet.php @@ -4,6 +4,7 @@ namespace CoreFramework\Handler\DataSet; // Import framework stuff use CoreFramework\Criteria\Storing\StoreableCriteria; +use CoreFramework\Handler\Handleable; /** * An interface for data set handlers diff --git a/framework/main/interfaces/handler/protocol/class_HandleableProtocol.php b/framework/main/interfaces/handler/protocol/class_HandleableProtocol.php index 1ffbc043..b011385d 100644 --- a/framework/main/interfaces/handler/protocol/class_HandleableProtocol.php +++ b/framework/main/interfaces/handler/protocol/class_HandleableProtocol.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Handler\Protocol; +// Import framework stuff +use CoreFramework\Handler\Handleable; + /** * An interface for protocol handlers * diff --git a/framework/main/interfaces/handler/task/class_HandleableTask.php b/framework/main/interfaces/handler/task/class_HandleableTask.php index 0bdc518b..b42d53fb 100644 --- a/framework/main/interfaces/handler/task/class_HandleableTask.php +++ b/framework/main/interfaces/handler/task/class_HandleableTask.php @@ -2,6 +2,9 @@ // Own namespace namespace CoreFramework\Handler\Task; +// Import framework stuff +use CoreFramework\Handler\DataSet\HandleableDataSet; + /** * A HandleableTask interface * diff --git a/framework/main/interfaces/io/pointer/class_InputPointer.php b/framework/main/interfaces/io/pointer/class_InputPointer.php index 41e81245..d5a00612 100644 --- a/framework/main/interfaces/io/pointer/class_InputPointer.php +++ b/framework/main/interfaces/io/pointer/class_InputPointer.php @@ -3,6 +3,7 @@ namespace CoreFramework\Filesystem\Pointer; // Import framework stuff +use CoreFramework\Filesystem\FilePointer; use CoreFramework\Stream\Input\StreamableInput; /** diff --git a/framework/main/interfaces/io/pointer/class_OutputPointer.php b/framework/main/interfaces/io/pointer/class_OutputPointer.php index 2a711f8c..9b934d19 100644 --- a/framework/main/interfaces/io/pointer/class_OutputPointer.php +++ b/framework/main/interfaces/io/pointer/class_OutputPointer.php @@ -3,6 +3,7 @@ namespace CoreFramework\Filesystem\Pointer; // Import framework stuff +use CoreFramework\Filesystem\FilePointer; use CoreFramework\Stream\Output\StreamableOutput; /**