From 48a72cf20ee592f2a34bd0e702f0dfd8098e0b0f Mon Sep 17 00:00:00 2001 From: Michael Barlow Date: Thu, 15 Mar 2018 10:59:37 -0600 Subject: [PATCH] make type names consistent, see https://github.com/phetsims/gravity-force-lab-basics/issues/54 --- .../{GFLBMassNode.js => GravityForceLabBasicsMassNode.js} | 6 +++--- .../view/GravityForceLabBasicsScreenView.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename js/gravity-force-lab-basics/view/{GFLBMassNode.js => GravityForceLabBasicsMassNode.js} (90%) diff --git a/js/gravity-force-lab-basics/view/GFLBMassNode.js b/js/gravity-force-lab-basics/view/GravityForceLabBasicsMassNode.js similarity index 90% rename from js/gravity-force-lab-basics/view/GFLBMassNode.js rename to js/gravity-force-lab-basics/view/GravityForceLabBasicsMassNode.js index d6abf4d..461e30e 100644 --- a/js/gravity-force-lab-basics/view/GFLBMassNode.js +++ b/js/gravity-force-lab-basics/view/GravityForceLabBasicsMassNode.js @@ -28,7 +28,7 @@ define( function( require ) { * @param {Object} [options] * @constructor */ - function GFLBMassNode( model, massModel, layoutBounds, modelViewTransform, options ) { + function GravityForceLabBasicsMassNode( model, massModel, layoutBounds, modelViewTransform, options ) { options = _.extend( { arrowLabelFill: 'black', @@ -58,9 +58,9 @@ define( function( require ) { ISLCObjectNode.call( this, model, massModel, layoutBounds, modelViewTransform, pullForceRange, options ); } - gravityForceLabBasics.register( 'GFLBMassNode', GFLBMassNode ); + gravityForceLabBasics.register( 'GravityForceLabBasicsMassNode', GravityForceLabBasicsMassNode ); - return inherit( ISLCObjectNode, GFLBMassNode, { + return inherit( ISLCObjectNode, GravityForceLabBasicsMassNode, { /** * Redraws the white gradient on the mass objects with their radius. diff --git a/js/gravity-force-lab-basics/view/GravityForceLabBasicsScreenView.js b/js/gravity-force-lab-basics/view/GravityForceLabBasicsScreenView.js index 68a5997..cf1c394 100644 --- a/js/gravity-force-lab-basics/view/GravityForceLabBasicsScreenView.js +++ b/js/gravity-force-lab-basics/view/GravityForceLabBasicsScreenView.js @@ -13,7 +13,7 @@ define( function( require ) { var Bounds2 = require( 'DOT/Bounds2' ); var Color = require( 'SCENERY/util/Color' ); var DistanceArrowNode = require( 'GRAVITY_FORCE_LAB_BASICS/gravity-force-lab-basics/view/DistanceArrowNode' ); - var GFLBMassNode = require( 'GRAVITY_FORCE_LAB_BASICS/gravity-force-lab-basics/view/GFLBMassNode' ); + var GravityForceLabBasicsMassNode = require( 'GRAVITY_FORCE_LAB_BASICS/gravity-force-lab-basics/view/GravityForceLabBasicsMassNode' ); var gravityForceLabBasics = require( 'GRAVITY_FORCE_LAB_BASICS/gravityForceLabBasics' ); var GravityForceLabBasicsConstants = require( 'GRAVITY_FORCE_LAB_BASICS/gravity-force-lab-basics/GravityForceLabBasicsConstants' ); var HBox = require( 'SCENERY/nodes/HBox' ); @@ -97,7 +97,7 @@ define( function( require ) { this.addChild( massControlBox ); // add the mass nodes to the view - var mass1Node = new GFLBMassNode( model, model.object1, this.layoutBounds, modelViewTransform, { + var mass1Node = new GravityForceLabBasicsMassNode( model, model.object1, this.layoutBounds, modelViewTransform, { label: mass1LabelString, otherObjectLabel: mass2LabelString, defaultDirection: 'left', @@ -106,7 +106,7 @@ define( function( require ) { tandem: tandem.createTandem( 'mass1Node' ) } ); - var mass2Node = new GFLBMassNode( model, model.object2, this.layoutBounds, modelViewTransform, { + var mass2Node = new GravityForceLabBasicsMassNode( model, model.object2, this.layoutBounds, modelViewTransform, { label: mass2LabelString, otherObjectLabel: mass1LabelString, defaultDirection: 'right',