Use Property specific subclasses and specify values, see #191

phetsims · Nov 28, 2018 · 311c93d · 311c93d
1 parent d103662
commit 311c93d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/js/common/model/Scene.js b/js/common/model/Scene.js
@@ -259,7 +259,9 @@ define( require => {
       if ( this.waveSpatialType === WaveSpatialType.PLANE ) {
 
         // @public {Property.<BarrierTypeEnum>} - type of the barrier in the lattice
-        this.barrierTypeProperty = new Property( BarrierTypeEnum.ONE_SLIT );
+        this.barrierTypeProperty = new Property( BarrierTypeEnum.ONE_SLIT, {
+          validValues: BarrierTypeEnum.VALUES
+        } );
 
         // When the barrier moves, it creates a lot of artifacts, so clear the wave to the right of the barrier
         // when it moves

diff --git a/js/common/view/WaterEmitterNode.js b/js/common/view/WaterEmitterNode.js
@@ -11,9 +11,11 @@ define( require => {
   'use strict';
 
   // modules
+  const BooleanProperty = require( 'AXON/BooleanProperty' );
   const EmitterNode = require( 'WAVE_INTERFERENCE/common/view/EmitterNode' );
   const FaucetNode = require( 'SCENERY_PHET/FaucetNode' );
   const Property = require( 'AXON/Property' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
   const waveInterference = require( 'WAVE_INTERFERENCE/waveInterference' );
   const WaveInterferenceUtils = require( 'WAVE_INTERFERENCE/common/WaveInterferenceUtils' );
 
@@ -37,11 +39,11 @@ define( require => {
         1,
 
         // Flow rate is managed by this simulation and not depicted by the FaucetNode
-        new Property( 0 ),
+        new NumberProperty( 0 ),
 
         // Faucet is enabled but not interactive
-        new Property( true ), {
-          interactiveProperty: new Property( false ),
+        new BooleanProperty( true ), {
+          interactiveProperty: new BooleanProperty( false ),
 
           // Adjusted based on the dimension of the faucet image to align with the horizontal water drop location.
           // The vertical offset is adjusted with FAUCET_VERTICAL_OFFSET

diff --git a/js/common/view/WaveInterferenceSceneIcons.js b/js/common/view/WaveInterferenceSceneIcons.js
@@ -10,6 +10,7 @@ define( require => {
 
   // modules
   const BooleanProperty = require( 'AXON/BooleanProperty' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
   const FaucetNode = require( 'SCENERY_PHET/FaucetNode' );
   const Image = require( 'SCENERY/nodes/Image' );
   const LaserPointerNode = require( 'SCENERY_PHET/LaserPointerNode' );
@@ -22,8 +23,8 @@ define( require => {
     constructor() {
 
       // @public {FaucetNode} - Faucet icon, rasterized to clip out invisible parts (like the ShooterNode)
-      this.faucetIcon = new FaucetNode( 1, new Property( 0 ), new Property( true ), {
-        interactiveProperty: new Property( false )
+      this.faucetIcon = new FaucetNode( 1, new NumberProperty( 0 ), new BooleanProperty( true ), {
+        interactiveProperty: new BooleanProperty( false )
       } ).rasterized();
 
       // @public - Speaker icon

diff --git a/js/waves/model/WavesScreenModel.js b/js/waves/model/WavesScreenModel.js
@@ -206,7 +206,7 @@ define( require => {
 
       // @public {Property.<Scene>} - selected scene
       this.sceneProperty = new Property( this.waterScene, {
-        validValues: [ this.waterScene, this.soundScene, this.lightScene ]
+        validValues: this.scenes
       } );
 
       // @public {BooleanProperty} - whether the wave area should be displayed