Skip to content

Commit

Permalink
Move PropertyIO to Property.js, see phetsims/tandem#212
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Sep 29, 2020
1 parent 9446055 commit 60820b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions js/common/model/GravityAndOrbitsModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js';
import Property from '../../../../axon/js/Property.js';
import PropertyIO from '../../../../axon/js/PropertyIO.js';
import PhysicalConstants from '../../../../phet-core/js/PhysicalConstants.js';
import TimeSpeed from '../../../../scenery-phet/js/TimeSpeed.js';
import Tandem from '../../../../tandem/js/Tandem.js';
Expand Down Expand Up @@ -74,7 +73,7 @@ class GravityAndOrbitsModel {
this.sceneProperty = new Property( this.sceneList.scenes[ 0 ], {
tandem: tandem.createTandem( 'sceneProperty' ),
validValues: this.sceneList.scenes,
phetioType: PropertyIO( ReferenceIO( IOType.ObjectIO ) )
phetioType: Property.PropertyIO( ReferenceIO( IOType.ObjectIO ) )
} );
}

Expand Down
4 changes: 2 additions & 2 deletions js/common/model/RewindablePropertyIO.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2020, University of Colorado Boulder

import PropertyIO from '../../../../axon/js/PropertyIO.js';
import Property from '../../../../axon/js/Property.js';
import IOType from '../../../../tandem/js/types/IOType.js';
import gravityAndOrbits from '../../gravityAndOrbits.js';
import RewindableProperty from './RewindableProperty.js';
Expand All @@ -27,7 +27,7 @@ function RewindablePropertyIO( parameterType ) {

if ( !cache.has( cacheKey ) ) {

const PropertyIOImpl = PropertyIO( parameterType );
const PropertyIOImpl = Property.PropertyIO( parameterType );
cache.set( cacheKey, new IOType( `RewindablePropertyIO<${parameterType.typeName}>`, {
valueType: RewindableProperty,
parameterTypes: [ parameterType ],
Expand Down

0 comments on commit 60820b4

Please sign in to comment.