chore(rename): rename View and Template concepts for #1244

modules/angular2/src/render/dom/view/element_binder.js

@@ -6,7 +6,7 @@ import * as protoViewModule from './proto_view';
 export class ElementBinder {
   contentTagSelector: string;
   textNodeIndices: List<number>;
-  nestedProtoView: protoViewModule.ProtoView;
+  nestedProtoView: protoViewModule.RenderProtoView;
   eventLocals: AST;
   eventNames: List<string>;
   componentId: string;

modules/angular2/src/render/dom/view/proto_view.js

@@ -6,7 +6,7 @@ import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection
 import {ElementBinder} from './element_binder';
 import {NG_BINDING_CLASS} from '../util';
 
-export class ProtoView {
+export class RenderProtoView {
   element;
   elementBinders:List<ElementBinder>;
   isTemplateElement:boolean;
@@ -25,7 +25,7 @@ export class ProtoView {
     this.rootBindingOffset = (isPresent(this.element) && DOM.hasClass(this.element, NG_BINDING_CLASS)) ? 1 : 0;
   }
 
-  mergeChildComponentProtoViews(componentProtoViews:List<ProtoView>) {
+  mergeChildComponentProtoViews(componentProtoViews:List<RenderProtoView>) {
     var componentProtoViewIndex = 0;
     for (var i=0; i<this.elementBinders.length; i++) {
       var eb = this.elementBinders[i];

modules/angular2/src/render/dom/view/proto_view_builder.js

@@ -7,7 +7,7 @@ import {
 } from 'angular2/change_detection';
 import {SetterFn} from 'angular2/src/reflection/types';
 
-import {ProtoView} from './proto_view';
+import {RenderProtoView} from './proto_view';
 import {ElementBinder} from './element_binder';
 import {setterFactory} from './property_setter_factory';
 
@@ -39,7 +39,7 @@ export class ProtoViewBuilder {
 
   bindVariable(name, value) {
     // Store the variable map from value to variable, reflecting how it will be used later by
-    // View. When a local is set to the view, a lookup for the variable name will take place keyed
+    // RenderView. When a local is set to the view, a lookup for the variable name will take place keyed
     // by the "value", or exported identifier. For example, ng-repeat sets a view local of "index".
     // When this occurs, a lookup keyed by "index" must occur to find if there is a var referencing
     // it.
@@ -50,7 +50,7 @@ export class ProtoViewBuilder {
     this.isRootView = value;
   }
 
-  build():api.ProtoView {
+  build():api.ProtoViewDto {
     var renderElementBinders = [];
 
     var apiElementBinders = [];
@@ -91,8 +91,8 @@ export class ProtoViewBuilder {
         propertySetters: propertySetters
       }));
     });
-    return new api.ProtoView({
-      render: new directDomRenderer.DirectDomProtoViewRef(new ProtoView({
+    return new api.ProtoViewDto({
+      render: new directDomRenderer.DirectDomProtoViewRef(new RenderProtoView({
         element: this.rootElement,
         elementBinders: renderElementBinders,
         isRootView: this.isRootView
@@ -183,7 +183,7 @@ export class ElementBinderBuilder {
       this.nestedProtoView.bindVariable(name, value);
     } else {
       // Store the variable map from value to variable, reflecting how it will be used later by
-      // View. When a local is set to the view, a lookup for the variable name will take place keyed
+      // RenderView. When a local is set to the view, a lookup for the variable name will take place keyed
       // by the "value", or exported identifier. For example, ng-repeat sets a view local of "index".
       // When this occurs, a lookup keyed by "index" must occur to find if there is a var referencing
       // it.
@@ -283,4 +283,4 @@ export class EventLocalsAstSplitter extends AstTransformer {
   buildEventNames() {
     return this.eventNames;
   }
-}
+}

modules/angular2/src/render/dom/view/view.js

@@ -3,7 +3,7 @@ import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src
 import {int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 
 import {ViewContainer} from './view_container';
-import {ProtoView} from './proto_view';
+import {RenderProtoView} from './proto_view';
 import {LightDom} from '../shadow_dom/light_dom';
 import {Content} from '../shadow_dom/content_tag';
 
@@ -16,7 +16,7 @@ const NG_BINDING_CLASS = 'ng-binding';
 /**
  * Const of making objects: http://jsperf.com/instantiate-size-of-object
  */
-export class View {
+export class RenderView {
   boundElements:List;
   boundTextNodes:List;
   /// When the view is part of render tree, the DocumentFragment is empty, which is why we need
@@ -24,16 +24,16 @@ export class View {
   rootNodes:List;
   // TODO(tbosch): move componentChildViews, viewContainers, contentTags, lightDoms into
   // a single array with records inside
-  componentChildViews: List<View>;
+  componentChildViews: List<RenderView>;
   viewContainers: List<ViewContainer>;
   contentTags: List<Content>;
   lightDoms: List<LightDom>;
-  proto: ProtoView;
+  proto: RenderProtoView;
   _hydrated: boolean;
   _eventDispatcher: any/*EventDispatcher*/;
 
   constructor(
-      proto:ProtoView, rootNodes:List,
+      proto:RenderProtoView, rootNodes:List,
       boundTextNodes: List, boundElements:List, viewContainers:List, contentTags:List) {
     this.proto = proto;
     this.rootNodes = rootNodes;
@@ -61,7 +61,7 @@ export class View {
   }
 
   setComponentView(strategy: ShadowDomStrategy,
-      elementIndex:number, childView:View) {
+      elementIndex:number, childView:RenderView) {
     var element = this.boundElements[elementIndex];
     var lightDom = strategy.constructLightDom(this, childView, element);
     strategy.attachTemplate(element, childView);

modules/angular2/src/render/dom/view/view_container.js

@@ -9,7 +9,7 @@ import * as vfModule from './view_factory';
 export class ViewContainer {
   _viewFactory: vfModule.ViewFactory;
   templateElement;
-  _views: List<viewModule.View>;
+  _views: List<viewModule.RenderView>;
   _lightDom: ldModule.LightDom;
   _hostLightDom: ldModule.LightDom;
   _hydrated: boolean;
@@ -53,7 +53,7 @@ export class ViewContainer {
     this._hydrated = false;
   }
 
-  get(index: number): viewModule.View {
+  get(index: number): viewModule.RenderView {
     return this._views[index];
   }
 
@@ -71,7 +71,7 @@ export class ViewContainer {
         'Cannot change dehydrated ViewContainer');
   }
 
-  insert(view, atIndex=-1): viewModule.View {
+  insert(view, atIndex=-1): viewModule.RenderView {
     if (!view.hydrated()) {
       view.hydrate(this._hostLightDom);
     }

modules/angular2/src/render/dom/view/view_factory.js

@@ -19,7 +19,7 @@ export const VIEW_POOL_CAPACITY = 'render.ViewFactory.viewPoolCapacity';
 @Injectable()
 export class ViewFactory {
   _poolCapacity:number;
-  _pooledViews:List<viewModule.View>;
+  _pooledViews:List<viewModule.RenderView>;
   _eventManager:EventManager;
   _shadowDomStrategy:ShadowDomStrategy;
 
@@ -30,7 +30,7 @@ export class ViewFactory {
     this._shadowDomStrategy = shadowDomStrategy;
   }
 
-  getView(protoView:pvModule.ProtoView):viewModule.View {
+  getView(protoView:pvModule.RenderProtoView):viewModule.RenderView {
     // TODO(tbosch): benchmark this scanning of views and maybe
     // replace it with a fancy LRU Map/List combination...
     var view;
@@ -46,7 +46,7 @@ export class ViewFactory {
     return view;
   }
 
-  returnView(view:viewModule.View) {
+  returnView(view:viewModule.RenderView) {
     if (view.hydrated()) {
       view.dehydrate();
     }
@@ -56,7 +56,7 @@ export class ViewFactory {
     }
   }
 
-  _createView(protoView:pvModule.ProtoView): viewModule.View {
+  _createView(protoView:pvModule.RenderProtoView): viewModule.RenderView {
     var rootElementClone = protoView.isRootView ? protoView.element : DOM.importIntoDoc(protoView.element);
     var elementsWithBindingsDynamic;
     if (protoView.isTemplateElement) {
@@ -73,7 +73,7 @@ export class ViewFactory {
     var viewRootNodes;
     if (protoView.isTemplateElement) {
       var childNode = DOM.firstChild(DOM.content(rootElementClone));
-      viewRootNodes = []; // TODO(perf): Should be fixed size, since we could pre-compute in in pvModule.ProtoView
+      viewRootNodes = []; // TODO(perf): Should be fixed size, since we could pre-compute in in pvModule.RenderProtoView
       // Note: An explicit loop is the fastest way to convert a DOM array into a JS array!
       while(childNode != null) {
         ListWrapper.push(viewRootNodes, childNode);
@@ -121,7 +121,7 @@ export class ViewFactory {
       contentTags[binderIdx] = contentTag;
     }
 
-    var view = new viewModule.View(
+    var view = new viewModule.RenderView(
       protoView, viewRootNodes,
       boundTextNodes, boundElements, viewContainers, contentTags
     );
@@ -156,4 +156,4 @@ export class ViewFactory {
       view.dispatchEvent(elementIndex, eventName, event);
     });
   }
-}
+}