X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Fcommands%2Fclass_BaseCommand.php;fp=framework%2Fmain%2Fclasses%2Fcommands%2Fclass_BaseCommand.php;h=b66cb3ff45412546b66891ae50512a464fd2b4af;hb=e10c4b889b226e8138e99e8a9b4fa834f9382c9b;hp=6d6a9ebc77110d502d68c9e4d141bfde7282aabf;hpb=303d853c3d98734f9d7a1a0445c98b6d6c444945;p=core.git

diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php
index 6d6a9ebc..b66cb3ff 100644
--- a/framework/main/classes/commands/class_BaseCommand.php
+++ b/framework/main/classes/commands/class_BaseCommand.php
@@ -8,9 +8,10 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
-use Org\Mxchange\CoreFramework\Resolver\Resolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
-use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Traits\Resolver\ResolverTrait;
+use Org\Mxchange\CoreFramework\Traits\Template\CompileableTemplateTrait;
+
 /**
  * A general (base) command
  *
@@ -34,15 +35,9 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseCommand extends BaseFrameworkSystem {
-	/**
-	 * Resolver instance
-	 */
-	private $resolverInstance = NULL;
-
-	/**
-	 * Template engine instance
-	 */
-	private $templateInstance = NULL;
+	// Load traits
+	use CompileableTemplateTrait;
+	use ResolverTrait;
 
 	/**
 	 * Protected constructor
@@ -55,44 +50,6 @@ abstract class BaseCommand extends BaseFrameworkSystem {
 		parent::__construct($className);
 	}
 
-	/**
-	 * Setter for resolver instance
-	 *
-	 * @param	$resolverInstance	Instance of a command resolver class
-	 * @return	void
-	 */
-	protected final function setResolverInstance (Resolver $resolverInstance) {
-		$this->resolverInstance = $resolverInstance;
-	}
-
-	/**
-	 * Getter for resolver instance
-	 *
-	 * @return	$resolverInstance	Instance of a command resolver class
-	 */
-	protected final function getResolverInstance () {
-		return $this->resolverInstance;
-	}
-
-	/**
-	 * Setter for template engine instances
-	 *
-	 * @param	$templateInstance	An instance of a CompileableTemplate class
-	 * @return	void
-	 */
-	protected final function setTemplateInstance (CompileableTemplate $templateInstance) {
-		$this->templateInstance = $templateInstance;
-	}
-
-	/**
-	 * Getter for template engine instances
-	 *
-	 * @return	$templateInstance	An instance of a CompileableTemplate class
-	 */
-	public final function getTemplateInstance () {
-		return $this->templateInstance;
-	}
-
 	/**
 	 * Initializes the template engine
 	 *