Use ReferenceIO, see phetsims/tandem#215

phetsims · Nov 24, 2020 · e5aad97 · e5aad97
1 parent 060c75c
commit e5aad97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 38 deletions.
diff --git a/js/common/model/Body.js b/js/common/model/Body.js
@@ -8,6 +8,7 @@
  */
 
 import IOType from '../../../../tandem/js/types/IOType.js';
+import ReferenceIO from '../../../../tandem/js/types/ReferenceIO.js';
 import massesAndSprings from '../../massesAndSprings.js';
 import massesAndSpringsStrings from '../../massesAndSpringsStrings.js';
 import MassesAndSpringsConstants from '../MassesAndSpringsConstants.js';
@@ -46,16 +47,7 @@ Body.BODIES = [ Body.MOON, Body.EARTH, Body.JUPITER, Body.PLANET_X, Body.CUSTOM
 Body.BodyIO = new IOType( 'BodyIO', {
   valueType: Body,
   documentation: 'Planet which determines the force of gravity.',
-
-  // TODO: https://github.com/phetsims/tandem/issues/215 use ReferenceIO or equivalent
-  toStateObject: body => {
-    if ( body === null ) {
-      return null;
-    }
-    return {
-      body: body
-    };
-  }
+  supertype: ReferenceIO( IOType.ObjectIO )
 } );
 
 export default Body;
diff --git a/js/common/model/Mass.js b/js/common/model/Mass.js
@@ -16,7 +16,6 @@ import Range from '../../../../dot/js/Range.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import merge from '../../../../phet-core/js/merge.js';
-import IOType from '../../../../tandem/js/types/IOType.js';
 import NullableIO from '../../../../tandem/js/types/NullableIO.js';
 import Easing from '../../../../twixt/js/Easing.js';
 import massesAndSprings from '../../massesAndSprings.js';
@@ -367,20 +366,4 @@ class Mass {
 
 massesAndSprings.register( 'Mass', Mass );
 
-// TODO: This is currently unused
-Mass.MassIO = new IOType( 'MassIO', {
-  valueType: Mass,
-  documentation: 'Model element for one of the masses',
-  // TODO: https://github.com/phetsims/tandem/issues/215 use ReferenceIO or equivalent
-  toStateObject: mass => {
-    if ( mass === null ) {
-      return null;
-    }
-    return {
-      mass: mass.mass,
-      color: mass.color
-    };
-  }
-} );
-
 export default Mass;
diff --git a/js/common/model/Spring.js b/js/common/model/Spring.js
@@ -19,6 +19,7 @@ import Vector2 from '../../../../dot/js/Vector2.js';
 import Vector2Property from '../../../../dot/js/Vector2Property.js';
 import IOType from '../../../../tandem/js/types/IOType.js';
 import NumberIO from '../../../../tandem/js/types/NumberIO.js';
+import ReferenceIO from '../../../../tandem/js/types/ReferenceIO.js';
 import massesAndSprings from '../../massesAndSprings.js';
 import MassesAndSpringsConstants from '../MassesAndSpringsConstants.js';
 
@@ -613,17 +614,7 @@ massesAndSprings.register( 'Spring', Spring );
 Spring.SpringIO = new IOType( 'SpringIO', {
   valueType: Spring,
   documentation: 'Hangs from the ceiling and applies a force to any attached BodyIO',
-
-  // TODO: https://github.com/phetsims/tandem/issues/215 use ReferenceIO or equivalent
-  toStateObject: spring => {
-    if ( spring === null ) {
-      return null;
-    }
-    return {
-      position: spring.positionProperty.get(),
-      id: spring.tandem.phetioID
-    };
-  }
+  supertype: ReferenceIO( IOType.ObjectIO )
 } );
 
 export default Spring;