Fixed breakage in template utility now that statics aren't inherited.

utils/template/uitest.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #import('dart:html');
 #import('template.dart');
 #import('../lib/file_system_memory.dart');
 
 String currSampleTemplate;
 
 void changeTemplate() {
   final Document doc = window.document;
   final SelectElement samples = doc.query('#templateSamples');
   final TextAreaElement template = doc.query('#template');
   template.value = sample(samples.value);
 }
 
 String sample(String sampleName) {
   final String each = '\${#each';
   final String endEach = '\${/each}';
   final String with = '\${#with';
   final String endWith = '\${/with}';
 
-  final String simpleTemplate = '''
+  final String simpleTemplate = @'''
 template NameEntry(String name, int age) {
   <div var=topDiv attr="test" attr1=test1 attr2='test2' attr3=test3>
-    <span var=spanElem>\${name}</span>
+    <span var=spanElem>${name}</span>
     <span>-</span>
-    <span>\${age}</span>
+    <span>${age}</span>
   </div>
 }
   ''';
 
-  final String simpleTemplate2 = '''
+  final String simpleTemplate2 = @'''
 template NameEntry(String name, int age) {
   <div var=topDiv attr="test" attr1=test1 attr2='test2' attr3=test3>
     <h1>
       <h2>
         <h3>
-          <span var=spanElem>\${name}</span>
+          <span var=spanElem>${name}</span>
           <span>-</span>
-          <span>\${age}</span>
+          <span>${age}</span>
         </h3>
       </h2>
     </h1>
   </div>
 }
   ''';
 
-  final String simpleTemplateCSS = '''
+  final String simpleTemplateCSS = @'''
 template NameEntry(String name, int age) {
   css {
     .foo {
       left: 10px;
     }
   }
   <div var=topDiv attr="test" attr1=test1 attr2='test2' attr3=test3>
-    <span var=spanElem>\${name}</span>
+    <span var=spanElem>${name}</span>
     <span>-</span>
-    <span>\${age}</span>
+    <span>${age}</span>
   </div>
 }
   ''';
 
 
-  final String eachTemplate = '''
+  final String eachTemplate = @'''
 template Applications(var products) {
   <div>
-    ${each} products}
+    ${each} products
       <div>
-        <span>\${name}</span>
+        <span>${name}</span>
         <span>-</span>
-        <span>\${users}</span>
+        <span>${users}</span>
       </div>
     ${endEach}
   </div>
 }
   ''';
 
-  final String withTemplate = '''
+  final String withTemplate = @'''
 template Product(Person person) {
   <div>
-    ${with} person}
+    ${with} person
       <div>
-        <span>\${name}</span>
+        <span>${name}</span>
         <span>-</span>
-        <span>\${age}</span>
+        <span>${age}</span>
       </div>
     ${endWith}
   </div>
 }
   ''';
 
-  final String withTemplate2 = '''
+  final String withTemplate2 = @'''
 template Product(Person person) {
   <div>
     <span var=a1>
       <h1>
-        ${with} person}
+        ${with} person
           <div>
-            <span>\${name}</span>
+            <span>${name}</span>
             <span>-</span>
-            <span>\${age}</span>
+            <span>${age}</span>
           </div>
         ${endWith}
       </h1>
     </span>
   </div>
 }
   ''';
 
-  final String complexTemplate = '''
+  final String complexTemplate = @'''
 template ProductsForPerson(Person person, var products) {
   <div>
-    ${with} person}
+    ${with} person person
       <div>
-        <span>\${name}</span>
+        <span>${person.name}</span>
         <span>-</span>
-        <span>\${age}</span>
+        <span>${person.age}</span>
       </div>
-      ${each} products}
+      ${each} products product
         <div>
-          <span>product=\${name},users=\${users}</span>
+          <span>product=${product.name},users=${product.users}</span>
         </div>
       ${endEach}
     ${endWith}
   </div>
 }
   ''';
 
-  final String complexTemplate2 = '''
+  final String complexTemplate2 = @'''
 template ProductsForPerson(Person person, var products) {
   <div>
-    ${with} person}
+    ${with} person person
       <div>
-        <span>\${name}</span>
+        <span>${person.name}</span>
         <span>-</span>
-        <span>\${age}</span>
+        <span>${person.age}</span>
       </div>
       <div>
-        ${each} products}
-          <span>product=\${name},users=\${users}</span>
+        ${each} products product
+          <span>product=${product.name},users=${product.users}</span>
         ${endEach}
       </div>
     ${endWith}
   </div>
 }
   ''';
 
-  final String complexTemplate3 = '''
+  final String complexTemplate3 = @'''
 template ProductsForPerson(Person person, var products) {
   css {
     .sales-item {
       font-family: arial;
       background-color: lightgray;
       margin-left: 10px;
       border-bottom: 1px solid white;
     }
     .ytd-sales {
       position: absolute;
       left: 100px;
     }
   }
   <div>
-    ${with} person}
+    ${with} person person
       <div>
-        <span>\${name}</span>
+        <span>${person.name}</span>
         <span>-</span>
-        <span>\${age}</span>
+        <span>${person.age}</span>
       </div>
       <div>
-        ${each} products}
-          <div>product=\${name},users=\${users}</div>
-          ${each} products.sales}
+        ${each} products product
+          <div>product=${product.name},users=${product.users}</div>
+          ${each} products.sales sale
             <div class="sales-item">
-              <span>\${country}</span>
-              <span class="ytd-sales">\\\$\${yearly}</span>
+              <span>${sale.country}</span>
+              <span class="ytd-sales">\$${sale.yearly}</span>
             </div>
           ${endEach}
         ${endEach}
       </div>
     ${endWith}
   </div>
 }
 
 
 template NameEntry(String name, int age) {
   css {
     .name-item {
       font-size: 18pt;
       font-weight: bold;
     }
   }
   <div var=topDiv class="name-item" attr="test" attr1=test1 attr2='test2' attr3=test3>
-    <span var=spanElem>\${name}</span>
+    <span var=spanElem>${name}</span>
     <span> - </span>
-    <span>\${age}</span>
+    <span>${age}</span>
   </div>
 }
 ''';
 
   // Test #each in a #each where the nested #each is a top-level child of the
   // outer #each.
-  final String complexTemplate4 = '''
+  final String complexTemplate4 = @'''
 template DivisionSales(var divisions) {
   <div>
-    \${#each divisions}
+    ${each} divisions division
       <div>
-        <span>\${name}</span>
+        <span>${division.name}</span>
         <span>-</span>
-        <span>\${id}</span>
+        <span>${division.id}</span>
       </div>
       <div>
-        \${#each divisions.products}
+        ${each} divisions.products divProduct
           <div>
             <span var=productItem>&#9654;</span>
             <span>Product</span>
-            <span>\${name}</span>
-            <span>\${users}&nbsp;users</span>
+            <span>${divProduct.name}</span>
+            <span>${divProduct.users}&nbsp;users</span>
           </div>
-          \${#each products.sales}
+          ${each} products.sales sale
             <div>
-              <span>\${country}</span>
-              <span>\\\$\${yearly}</span>
+              <span>${sale.country}</span>
+              <span>\$${sale.yearly}</span>
             </div>
-          \${/each}
-        \${/each}
+          ${endEach}
+        ${endEach}
       </div>
-    \${/each}
+    ${endEach}
   </div>
 }
 ''';
 
 
-  final String realWorldList = '''
+  final String realWorldList = @'''
 template DivisionSales(var divisions) {
   css {
     .division-item {
       background-color: #bbb;
       border-top: 2px solid white;
       line-height: 20pt;
       padding-left: 5px;
     }
     .product-item {
       background-color: lightgray;
@@ skipping 42 matching lines @@
       border-top: 1px solid white;
       line-height: 18pt;
       padding-left: 5px;
     }
     .ytd-sales {
       position: absolute;
       left: 100px;
     }
   }
   <div>
-    \${#each divisions}
+    ${each} divisions division
       <div class="division-item">
-        <span>\${name}</span>
+        <span>${division.name}</span>
         <span>-</span>
-        <span>\${id}</span>
+        <span>${division.id}</span>
       </div>
       <div>
-        \${#each divisions.products}
+        ${each} divisions.products divProduct
           <div class="product-item">
             <span var=productZippy class="expand-collapse expand">&#9660;</span>
             <span class='product-title'>Product</span>
-            <span class="product-name">\${name}</span>
-            <span class="product-users" align=right>\${users}&nbsp;users</span>
+            <span class="product-name">${divProduct.name}</span>
+            <span class="product-users" align=right>${divProduct.users
+              }&nbsp;users</span>
             <div class="show-sales">
-              \${#each products.sales}
+              ${each} products.sales sale
                 <div class="sales-item">
-                  <span>\${country}</span>
-                  <span class="ytd-sales">\\\$\${yearly}</span>
+                  <span>${sale.country}</span>
+                  <span class="ytd-sales">\$${sale.yearly}</span>
                 </div>
-              \${/each}
+              ${endEach}
             </div>
           </div>
-        \${/each}
+        ${endEach}
       </div>
-    \${/each}
+    ${endEach}
   </div>
 }
 
 template Header(String company, Date date) {
   css {
     .header {
       background-color: slateGray;
       font-family: arial;
       color: lightgray;
       font-weight: bold;
       padding-top: 20px;
     }
   }
   <div class='header' align=center>
-    <h2>\${company}</h2>
-    <div align=right>\${date}</div>
+    <h2>${company}</h2>
+    <div align=right>${date}</div>
   </div>
 }
 ''';
 
   switch (sampleName) {
     case "simple":
       return simpleTemplate;
     case "simple2":
       return simpleTemplate2;
     case "simpleCSS":
@@ skipping 39 matching lines @@
       }
 
       // Generate the Dart class(es) for all template(s).
       // Pass in filename of 'foo' for testing in UITest.
       code.add(Codegen.generate(templates, 'foo'));
     } catch (final htmlException) {
       // TODO(terry): TBD
       print("ERROR unhandled EXCEPTION");
     }
   }
-  
+
 /*
   if (!debug) {
     try {
       cssParseAndValidate(cssExpr, cssWorld);
     } catch (final cssException) {
       templateValid = false;
       dumpTree = cssException.toString();
     }
   } else if (parseOnly) {
     try {
@@ skipping 154 matching lines @@
   initHtmlWorld(false);
 
   // Don't display any colors in the UI.
   options.useColors = false;
 
   // Replace error handler bring up alert for any problems.
   world.printHandler = (String msg) {
     window.alert(msg);
   };
 }