Use Vector2Property, see phetsims/dot#88

phetsims · Mar 6, 2019 · 4c7812f · 4c7812f
1 parent 631aac1
commit 4c7812f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/js/model/Ammeter.js b/js/model/Ammeter.js
@@ -17,7 +17,7 @@ define( require => {
   const Property = require( 'AXON/Property' );
   const PropertyIO = require( 'AXON/PropertyIO' );
   const Vector2 = require( 'DOT/Vector2' );
-  const Vector2IO = require( 'DOT/Vector2IO' );
+  const Vector2Property = require( 'DOT/Vector2Property' );
 
   class Ammeter extends Meter {
 
@@ -36,9 +36,8 @@ define( require => {
       } );
 
       // @public {Property.<Vector2>} - the position of the tip of the probe
-      this.probePositionProperty = new Property( Vector2.ZERO, {
-        tandem: tandem.createTandem( 'probePositionProperty' ),
-        phetioType: PropertyIO( Vector2IO )
+      this.probePositionProperty = new Vector2Property( Vector2.ZERO, {
+        tandem: tandem.createTandem( 'probePositionProperty' )
       } );
     }
 

diff --git a/js/model/Meter.js b/js/model/Meter.js
@@ -13,10 +13,8 @@ define( require => {
   const Bounds2 = require( 'DOT/Bounds2' );
   const circuitConstructionKitCommon = require( 'CIRCUIT_CONSTRUCTION_KIT_COMMON/circuitConstructionKitCommon' );
   const Emitter = require( 'AXON/Emitter' );
-  const Property = require( 'AXON/Property' );
-  const PropertyIO = require( 'AXON/PropertyIO' );
   const Vector2 = require( 'DOT/Vector2' );
-  const Vector2IO = require( 'DOT/Vector2IO' );
+  const Vector2Property = require( 'DOT/Vector2Property' );
 
   class Meter {
 
@@ -31,9 +29,8 @@ define( require => {
       } );
 
       // @public {Property.<Vector2>} - the location of the body of the meter
-      this.bodyPositionProperty = new Property( Vector2.ZERO, {
-        tandem: tandem.createTandem( 'bodyPositionProperty' ),
-        phetioType: PropertyIO( Vector2IO )
+      this.bodyPositionProperty = new Vector2Property( Vector2.ZERO, {
+        tandem: tandem.createTandem( 'bodyPositionProperty' )
       } );
 
       // @public {Property.<boolean>} When the meter is dragged from the toolbox, all pieces drag together.

diff --git a/js/model/Vertex.js b/js/model/Vertex.js
@@ -14,9 +14,8 @@ define( require => {
   const Emitter = require( 'AXON/Emitter' );
   const NumberProperty = require( 'AXON/NumberProperty' );
   const Property = require( 'AXON/Property' );
-  const PropertyIO = require( 'AXON/PropertyIO' );
   const Tandem = require( 'TANDEM/Tandem' );
-  const Vector2IO = require( 'DOT/Vector2IO' );
+  const Vector2Property = require( 'DOT/Vector2Property' );
 
   // Index counter for debugging
   let counter = 0;
@@ -47,9 +46,8 @@ define( require => {
       this.vertexTandem = options.tandem;
 
       // @public {Property.<Vector2>} - location of the vertex
-      this.positionProperty = new Property( position, {
+      this.positionProperty = new Vector2Property( position, {
         tandem: options.tandem && options.tandem.createTandem( 'positionProperty' ),
-        phetioType: PropertyIO( Vector2IO ),
         useDeepEquality: true,
         isValidValue: assert && ( p => !isNaN( p.x ) && !isNaN( p.y ) )
       } );

diff --git a/js/model/Voltmeter.js b/js/model/Voltmeter.js
@@ -17,7 +17,7 @@ define( require => {
   const Property = require( 'AXON/Property' );
   const PropertyIO = require( 'AXON/PropertyIO' );
   const Vector2 = require( 'DOT/Vector2' );
-  const Vector2IO = require( 'DOT/Vector2IO' );
+  const Vector2Property = require( 'DOT/Vector2Property' );
 
   class Voltmeter extends Meter {
 
@@ -35,15 +35,13 @@ define( require => {
       } );
 
       // @public {Property.<Vector2>} - the position of the tip of the red probe in model=view coordinates.
-      this.redProbePositionProperty = new Property( Vector2.ZERO, {
-        tandem: tandem.createTandem( 'redProbePositionProperty' ),
-        phetioType: PropertyIO( Vector2IO )
+      this.redProbePositionProperty = new Vector2Property( Vector2.ZERO, {
+        tandem: tandem.createTandem( 'redProbePositionProperty' )
       } );
 
       // @public {Property.<Vector2>} - the position of the black probe in model=view coordinates
       this.blackProbePositionProperty = new Property( Vector2.ZERO, {
-        tandem: tandem.createTandem( 'blackProbePositionProperty' ),
-        phetioType: PropertyIO( Vector2IO )
+        tandem: tandem.createTandem( 'blackProbePositionProperty' )
       } );
     }