rename View -> ScreenView

phetsims · May 16, 2017 · be38ebd · be38ebd
1 parent 0e431b9
commit be38ebd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/js/macro/MacroScreen.js b/js/macro/MacroScreen.js
@@ -9,10 +9,10 @@ define( function( require ) {
   'use strict';
 
   // modules
-  var MacroModel = require( 'PH_SCALE/macro/model/MacroModel' );
-  var MacroView = require( 'PH_SCALE/macro/view/MacroView' );
   var Image = require( 'SCENERY/nodes/Image' );
   var inherit = require( 'PHET_CORE/inherit' );
+  var MacroModel = require( 'PH_SCALE/macro/model/MacroModel' );
+  var MacroScreenView = require( 'PH_SCALE/macro/view/MacroScreenView' );
   var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' );
   var phScale = require( 'PH_SCALE/phScale' );
   var PHScaleColors = require( 'PH_SCALE/common/PHScaleColors' );
@@ -41,7 +41,7 @@ define( function( require ) {
 
     Screen.call( this,
       function() { return new MacroModel( modelOptions ); },
-      function( model ) { return new MacroView( model, ModelViewTransform2.createIdentity() ); },
+      function( model ) { return new MacroScreenView( model, ModelViewTransform2.createIdentity() ); },
       options
     );
   }

diff --git a/js/macro/view/MacroView.js → js/macro/view/MacroScreenView.js b/js/macro/view/MacroView.js → js/macro/view/MacroScreenView.js
@@ -35,7 +35,7 @@ define( function( require ) {
    * @param {ModelViewTransform2} modelViewTransform
    * @constructor
    */
-  function MacroView( model, modelViewTransform ) {
+  function MacroScreenView( model, modelViewTransform ) {
 
     ScreenView.call( this, PHScaleConstants.SCREEN_VIEW_OPTIONS );
 
@@ -107,7 +107,7 @@ define( function( require ) {
     resetAllButton.bottom = this.layoutBounds.bottom - 20;
   }
 
-  phScale.register( 'MacroView', MacroView );
+  phScale.register( 'MacroScreenView', MacroScreenView );
 
-  return inherit( ScreenView, MacroView );
+  return inherit( ScreenView, MacroScreenView );
 } );
diff --git a/js/micro/MicroScreen.js b/js/micro/MicroScreen.js
@@ -12,7 +12,7 @@ define( function( require ) {
   var Image = require( 'SCENERY/nodes/Image' );
   var inherit = require( 'PHET_CORE/inherit' );
   var MicroModel = require( 'PH_SCALE/micro/model/MicroModel' );
-  var MicroView = require( 'PH_SCALE/micro/view/MicroView' );
+  var MicroScreenView = require( 'PH_SCALE/micro/view/MicroScreenView' );
   var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' );
   var phScale = require( 'PH_SCALE/phScale' );
   var PHScaleColors = require( 'PH_SCALE/common/PHScaleColors' );
@@ -40,7 +40,7 @@ define( function( require ) {
 
     Screen.call( this,
       function() { return new MicroModel(); },
-      function( model ) { return new MicroView( model, ModelViewTransform2.createIdentity() ); },
+      function( model ) { return new MicroScreenView( model, ModelViewTransform2.createIdentity() ); },
       options
     );
   }

diff --git a/js/micro/view/MicroView.js → js/micro/view/MicroScreenView.js b/js/micro/view/MicroView.js → js/micro/view/MicroScreenView.js
@@ -45,7 +45,7 @@ define( function( require ) {
    * @param {ModelViewTransform2} modelViewTransform
    * @constructor
    */
-  function MicroView( model, modelViewTransform ) {
+  function MicroScreenView( model, modelViewTransform ) {
 
     ScreenView.call( this, PHScaleConstants.SCREEN_VIEW_OPTIONS );
 
@@ -148,7 +148,7 @@ define( function( require ) {
     resetAllButton.bottom = this.layoutBounds.bottom - 20;
   }
 
-  phScale.register( 'MicroView', MicroView );
+  phScale.register( 'MicroScreenView', MicroScreenView );
 
-  return inherit( ScreenView, MicroView );
+  return inherit( ScreenView, MicroScreenView );
 } );
diff --git a/js/mysolution/MySolutionScreen.js b/js/mysolution/MySolutionScreen.js
@@ -13,7 +13,7 @@ define( function( require ) {
   var inherit = require( 'PHET_CORE/inherit' );
   var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' );
   var MySolutionModel = require( 'PH_SCALE/mysolution/model/MySolutionModel' );
-  var MySolutionView = require( 'PH_SCALE/mysolution/view/MySolutionView' );
+  var MySolutionScreenView = require( 'PH_SCALE/mysolution/view/MySolutionScreenView' );
   var phScale = require( 'PH_SCALE/phScale' );
   var PHScaleColors = require( 'PH_SCALE/common/PHScaleColors' );
   var Property = require( 'AXON/Property' );
@@ -40,7 +40,7 @@ define( function( require ) {
 
     Screen.call( this,
       function() { return new MySolutionModel(); },
-      function( model ) { return new MySolutionView( model, ModelViewTransform2.createIdentity() ); },
+      function( model ) { return new MySolutionScreenView( model, ModelViewTransform2.createIdentity() ); },
       options
     );
   }

diff --git a/js/mysolution/view/MySolutionView.js → js/mysolution/view/MySolutionScreenView.js b/js/mysolution/view/MySolutionView.js → js/mysolution/view/MySolutionScreenView.js
@@ -36,7 +36,7 @@ define( function( require ) {
    * @param {ModelViewTransform2} modelViewTransform
    * @constructor
    */
-  function MySolutionView( model, modelViewTransform ) {
+  function MySolutionScreenView( model, modelViewTransform ) {
 
     ScreenView.call( this, PHScaleConstants.SCREEN_VIEW_OPTIONS );
 
@@ -110,7 +110,7 @@ define( function( require ) {
     resetAllButton.bottom = this.layoutBounds.bottom - 20;
   }
 
-  phScale.register( 'MySolutionView', MySolutionView );
+  phScale.register( 'MySolutionScreenView', MySolutionScreenView );
 
-  return inherit( ScreenView, MySolutionView );
+  return inherit( ScreenView, MySolutionScreenView );
 } );