X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Freader%2Fclass_ConsoleNewsReader.php;h=29e79cae3c41a41a5626e782fda6de405b491b38;hb=93ca071880213fa2472521c3bb505a0745a24e8e;hp=f371a2bbc29308db51c858153a6533eb8135cf2f;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/classes/reader/class_ConsoleNewsReader.php b/framework/main/classes/reader/class_ConsoleNewsReader.php
index f371a2bb..29e79cae 100644
--- a/framework/main/classes/reader/class_ConsoleNewsReader.php
+++ b/framework/main/classes/reader/class_ConsoleNewsReader.php
@@ -1,21 +1,23 @@
 <?php
 // Own namespace
-namespace CoreFramework\Reader\News\Console;
+namespace Org\Mxchange\CoreFramework\Reader\News\Console;
 
 // Import framework stuff
-use CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Reader\News\ReadableNews;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Reader\News\ReadableNews;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Traits\Result\Search\SearchableResultTrait;
 
 /**
  * A console news reader class reads news from database layer
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2022 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -33,12 +35,15 @@ use CoreFramework\Request\Requestable;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Registerable {
+	// Load traits
+	use SearchableResultTrait;
+
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -53,9 +58,6 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 		// Get a new instance
 		$readerInstance = new ConsoleNewsReader();
 
-		// Set request instance
-		$readerInstance->setRequestInstance($requestInstance);
-
 		// Return prepared instance
 		return $readerInstance;
 	}
@@ -68,10 +70,10 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	 */
 	public function initializeReader () {
 		// Get 'command' for saving some calls
-		$command = $this->getRequestInstance()->getRequestElement('command');
+		$command = FrameworkBootstrap::getRequestInstance()->getRequestElement('command');
 
-		// First get a wrapper instance
-		$wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('news_db_wrapper_class');
+		// First get a frontend instance
+		$frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('news_db_frontend_class');
 
 		// Next create a searchable criteria instance
 		$criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
@@ -83,7 +85,7 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 		$criteriaInstance->setConfiguredLimit('news_' . $command . '_limit');
 
 		// Get a resultInstance back from the database
-		$resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
+		$resultInstance = $frontendInstance->doSelectByCriteria($criteriaInstance);
 
 		// Save that resultInstance in this class
 		$this->setResultInstance($resultInstance);