[Wact-cvs] SF.net SVN: wact: [88] trunk/wact/template/compiler

[<jef...@us...>]

Revision: 88
Author:   jeffmoore
Date:     2006-03-27 11:46:22 -0800 (Mon, 27 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/wact/?rev=88&view=rev

Log Message:
-----------
Renamed classes:
AttributeProperty to WactAttributeProperty
ConstantProperty to WactConstantProperty
PropertyInfo to WactPropertyInfo
CompilerProperty to WactTemplateProperty

Modified Paths:
--------------
    trunk/wact/template/compiler/compiler.inc.php
    trunk/wact/template/compiler/expression/databinding.test.php
    trunk/wact/template/compiler/expression/expression.inc.php
    trunk/wact/template/compiler/node/template.inc.php
    trunk/wact/template/compiler/property/attribute.inc.php
    trunk/wact/template/compiler/property/constant.inc.php
    trunk/wact/template/compiler/property/constant.test.php
    trunk/wact/template/compiler/property/dictionary.test.php
    trunk/wact/template/compiler/property/extractor.inc.php
    trunk/wact/template/compiler/property/extractor.test.php
    trunk/wact/template/compiler/property/info.inc.php
    trunk/wact/template/compiler/property/property.inc.php
Modified: trunk/wact/template/compiler/compiler.inc.php
===================================================================
--- trunk/wact/template/compiler/compiler.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/compiler.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -54,7 +54,7 @@
 }
 
 /**
-* Fills global WactPropertyDictionary instance with PropertyInfo objects
+* Fills global WactPropertyDictionary instance with WactPropertyInfo objects
 */
 function ExtractPropertyInfo($files) {
     if (!WactPropertyDictionary :: restore()) {

Modified: trunk/wact/template/compiler/expression/databinding.test.php
===================================================================
--- trunk/wact/template/compiler/expression/databinding.test.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/expression/databinding.test.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -8,7 +8,7 @@
 
 Mock::Generate('WactTemplateNode', 'MockTemplateNode');
 Mock::GeneratePartial('WactTemplateNode', 'PartialMockTemplateNode', array('getDataSource', 'getProperty'));
-Mock::Generate('CompilerProperty', 'MockCompilerProperty');
+Mock::Generate('WactTemplateProperty', 'MockTemplateProperty');
 Mock::Generate('WactCodeWriter', 'MockCodeWriter');
 
 class DataBindingExpressionTestCase extends UnitTestCase {
@@ -117,7 +117,7 @@
 	}
 
     function testGetValuePropertyValue() {
-        $property = new MockCompilerProperty($this);
+        $property = new MockTemplateProperty($this);
         $property->expectAtLeastOnce('getValue');
         $property->setReturnValue('IsConstant', TRUE);
         $property->setReturnValue('getValue', 'hello');
@@ -153,7 +153,7 @@
 	}
 
 	function testIsConstantPropertyValue() {
-        $property = new MockCompilerProperty($this);
+        $property = new MockTemplateProperty($this);
         $property->expectAtLeastOnce('IsConstant');
         $property->setReturnValue('IsConstant', TRUE);
 
@@ -175,7 +175,7 @@
 
     function testGeneratePreStatement() {
         $codewriter = new MockCodeWriter($this);
-        $property = new MockCompilerProperty($this);
+        $property = new MockTemplateProperty($this);
         $property->expectAtLeastOnce('generatePreStatement');
 
         $dataspace = new MockTemplateNode($this);
@@ -196,7 +196,7 @@
     function testGeneratePostStatement() {
         $codewriter = new MockCodeWriter($this);
 
-        $property = new MockCompilerProperty($this);
+        $property = new MockTemplateProperty($this);
         $property->expectAtLeastOnce('generatePostStatement');
 
         $dataspace = new MockTemplateNode($this);
@@ -217,7 +217,7 @@
     function testGenerateExpressionProperty() {
         $codewriter = new MockCodeWriter($this);
 
-        $property = new MockCompilerProperty($this);
+        $property = new MockTemplateProperty($this);
         $property->expectAtLeastOnce('generateExpression');
 
         $dataspace = new MockTemplateNode($this);

Modified: trunk/wact/template/compiler/expression/expression.inc.php
===================================================================
--- trunk/wact/template/compiler/expression/expression.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/expression/expression.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -102,7 +102,7 @@
     * Parses an expression and returns an object representing the expression
     * @param string expression
     * @param object Compiler Component that attribute was found in
-    * @return object ConstantProperty or DataBindingExpression
+    * @return object WactConstantProperty or DataBindingExpression
     */
     function createValue($expression, $ComponentContext) {
         $Parser = new ExpressionValueParser($expression);
@@ -112,7 +112,7 @@
             case EXPRESSION_VALUE_INT:
             case EXPRESSION_VALUE_FLOAT:
             case EXPRESSION_VALUE_STRING:
-                $cp = new ConstantProperty($Parser->Value);
+                $cp = new WactConstantProperty($Parser->Value);
                 return $cp;
             break;
 

Modified: trunk/wact/template/compiler/node/template.inc.php
===================================================================
--- trunk/wact/template/compiler/node/template.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/node/template.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -270,7 +270,7 @@
     }
 
     /**
-    * @return CompilerProperty returns the named property or NULL if it doesn't exist
+    * @return WactTemplateProperty returns the named property or NULL if it doesn't exist
     */
     function getProperty($name) {
         if (array_key_exists($name, $this->properties)) {

Modified: trunk/wact/template/compiler/property/attribute.inc.php
===================================================================
--- trunk/wact/template/compiler/property/attribute.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/attribute.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -17,7 +17,7 @@
 /**
 * A property linked to the value of an attribute.
 */
-class AttributeProperty extends CompilerProperty {
+class WactAttributeProperty extends WactTemplateProperty {
 
     private $attribute;
 

Modified: trunk/wact/template/compiler/property/constant.inc.php
===================================================================
--- trunk/wact/template/compiler/property/constant.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/constant.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -17,7 +17,7 @@
 /**
 * A property representing a constant value.
 */
-class ConstantProperty extends CompilerProperty {
+class WactConstantProperty extends WactTemplateProperty {
     
     private $value;
     

Modified: trunk/wact/template/compiler/property/constant.test.php
===================================================================
--- trunk/wact/template/compiler/property/constant.test.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/constant.test.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -2,15 +2,15 @@
 
 require_once 'wact/template/compiler/property/constant.inc.php';
 
-class ConstantPropertyTestCase extends UnitTestCase {
+class WactConstantPropertyTestCase extends UnitTestCase {
 	
 	function testGetValue() {
-	    $property = new ConstantProperty('value');
+	    $property = new WactConstantProperty('value');
 	    $this->assertIdentical($property->getValue(), 'value');
 	}
 	
 	function testIsConnstant() {
-	    $property = new ConstantProperty('value');
+	    $property = new WactConstantProperty('value');
 	    $this->assertIdentical($property->isConstant(), TRUE);
 	}
 

Modified: trunk/wact/template/compiler/property/dictionary.test.php
===================================================================
--- trunk/wact/template/compiler/property/dictionary.test.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/dictionary.test.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -3,7 +3,7 @@
 require_once 'wact/template/compiler/property/dictionary.inc.php';
 
 /**
-* PropertyInfo classes have no methods so use a simple class to test
+* WactPropertyInfo classes have no methods so use a simple class to test
 */
 class WactPropertyDictionaryTestCase extends UnitTestCase {
 
@@ -12,7 +12,7 @@
 
 	function setUp() {
 		$this->dict = new WactPropertyDictionary();
-		$this->PropertyInfo = new PropertyInfo('name', 'TESTtag', 'NoClass');
+		$this->PropertyInfo = new WactPropertyInfo('name', 'TESTtag', 'NoClass');
 		$this->dict->_registerProperty($this->PropertyInfo);
 	}
 

Modified: trunk/wact/template/compiler/property/extractor.inc.php
===================================================================
--- trunk/wact/template/compiler/property/extractor.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/extractor.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -35,7 +35,7 @@
     function beginClass($class, $parent_class) {
         $this->_validate();
 
-        $info = new PropertyInfo($this->annotations['property'],
+        $info = new WactPropertyInfo($this->annotations['property'],
                                   $this->annotations['tag'],
                                   $class);
 

Modified: trunk/wact/template/compiler/property/extractor.test.php
===================================================================
--- trunk/wact/template/compiler/property/extractor.test.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/extractor.test.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -36,7 +36,7 @@
 * @property Foo
 * @tag foo:BAR
 */
-class FooProperty extends CompilerProperty {
+class FooProperty extends WactTemplateProperty {
 }
 ?>
 EOD;
@@ -59,7 +59,7 @@
 * @property Foo
 * @tag foo:BAR
 */
-class FooProperty extends CompilerProperty {
+class FooProperty extends WactTemplateProperty {
 }
 
 /**
@@ -67,7 +67,7 @@
 * @property Bar
 * @tag foo:BAR
 */
-class BarProperty extends CompilerProperty {
+class BarProperty extends WactTemplateProperty {
 }
 ?>
 EOD;

Modified: trunk/wact/template/compiler/property/info.inc.php
===================================================================
--- trunk/wact/template/compiler/property/info.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/info.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -16,7 +16,7 @@
 
 /**
 */
-class PropertyInfo {
+class WactPropertyInfo {
     public $Property;
     public $Tag;
     public $PropertyClass;

Modified: trunk/wact/template/compiler/property/property.inc.php
===================================================================
--- trunk/wact/template/compiler/property/property.inc.php	2006-03-27 19:33:58 UTC (rev 87)
+++ trunk/wact/template/compiler/property/property.inc.php	2006-03-27 19:46:22 UTC (rev 88)
@@ -14,7 +14,7 @@
 * @version 0.9
 */
 
-class CompilerProperty {
+class WactTemplateProperty {
 
 	/**
 	* Calcluated values are considered active if they have been referenced


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.