Additional touches to RecessTools to utilize RecessView & helpers

KrisJordan · Apr 14, 2009 · 9cd7ffc · 9cd7ffc
1 parent 4575010
commit 9cd7ffc
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 155 deletions.
diff --git a/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php b/recess/recess/apps/tools/controllers/RecessToolsCodeController.class.php
@@ -110,10 +110,11 @@ public function classInfo($class) {
 		}
 	}
 
-	/** !Route GET, package/$package */
-	function packageInfo ($package) {
+	/** !Route GET, package/$packageName */
+	function packageInfo ($packageName) {
 		Library::import('recess.apps.tools.models.RecessReflectorPackage');
-		$package = new RecessReflectorPackage($package);
+		$package = new RecessReflectorPackage();
+		$package->name = $packageName;
 		$this->package = $package->find()->first();
 
 	}

diff --git a/recess/recess/apps/tools/models/RecessReflectorPackage.class.php b/recess/recess/apps/tools/models/RecessReflectorPackage.class.php
@@ -22,20 +22,15 @@ function childrenAlphabetically() {
 		return $this->children()->orderBy('name ASC');
 	}
 
-	function __construct($name = '') {
-		if($name != '') {
-			$this->name = $name;
-		}
-	}
-
 	function insert() {		
 		parent::insert();
 		$dotPosition = strrpos($this->name, Library::dotSeparator);
 
 		if($dotPosition !== false) { 
 			$parentName = substr($this->name, 0, $dotPosition);
 
-			$parent = new RecessReflectorPackage($parentName);
+			$parent = new RecessReflectorPackage();
+			$parent->name = $parentName;
 
 			if(!$parent->exists()) {
 				$parent->insert();

diff --git a/recess/recess/apps/tools/views/code/packageInfo.php b/recess/recess/apps/tools/views/code/packageInfo.php
@@ -3,7 +3,6 @@
 Layout::blockAssign('title', $package->name);
 ?>
 <?php
-
 function linkedPackagePath($package, $linkPrefix = "") {
 	$parts = explode('.', $package);
 	$partsSize = count($parts);
@@ -16,7 +15,6 @@ function linkedPackagePath($package, $linkPrefix = "") {
 			echo $parts[$i];
 	}
 }
-
 ?>
 
 <h1><?php linkedPackagePath($package->name); ?></h1>
@@ -36,8 +34,4 @@ function linkedPackagePath($package, $linkPrefix = "") {
 	echo '<li><a href="../class/' . $package->name . '.' . $class->name . '">'. $class->name .'</a></li>';
 }
 ?>
-</ul>
-
-<?php
-include_once($viewsDir . 'common/footer.php');
-?>
+</ul>
diff --git a/recess/recess/apps/tools/views/common/footer.php b/recess/recess/apps/tools/views/common/footer.php
diff --git a/recess/recess/apps/tools/views/common/header.php b/recess/recess/apps/tools/views/common/header.php
diff --git a/recess/recess/apps/tools/views/common/navbar.php b/recess/recess/apps/tools/views/common/navbar.php
diff --git a/recess/recess/apps/tools/views/common/printRoutes.php b/recess/recess/apps/tools/views/common/printRoutes.php
diff --git a/recess/recess/apps/tools/views/tests/home.php b/recess/recess/apps/tools/views/tests/home.php
diff --git a/recess/recess/framework/helpers/Layout.class.php b/recess/recess/framework/helpers/Layout.class.php
@@ -14,7 +14,7 @@ class Layout extends AbstractHelper {
 
 	protected static $app;
 
-	public static function init($view) {
+	public static function init(AbstractView $view) {
 		$response = $view->getResponse();
 		self::$app = $response->meta->app;
 	}

diff --git a/recess/recess/framework/helpers/Part.class.php b/recess/recess/framework/helpers/Part.class.php
@@ -10,7 +10,7 @@ class Part extends AbstractHelper {
 
 	protected static $loaded = array();
 
-	public static function init($view) {
+	public static function init(AbstractView $view) {
 		$response = $view->getResponse();
 		self::$app = $response->meta->app;
 	}