diff --git a/js/atomic-interactions/model/DualAtomModel.js b/js/atomic-interactions/model/DualAtomModel.js index ecfceb53..18a86e4b 100644 --- a/js/atomic-interactions/model/DualAtomModel.js +++ b/js/atomic-interactions/model/DualAtomModel.js @@ -4,7 +4,7 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import EnumerationDeprecatedProperty from '../../../../axon/js/EnumerationDeprecatedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; -import Property from '../../../../axon/js/Property.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import TimeSpeed from '../../../../scenery-phet/js/TimeSpeed.js'; import AtomType from '../../common/model/AtomType.js'; @@ -145,7 +145,7 @@ class DualAtomModel { } ); // update the LJ potential parameters when the adjustable attraction atom is in use - Property.multilink( + Multilink.multilink( [ this.atomPairProperty, this.adjustableAtomInteractionStrengthProperty, this.adjustableAtomDiameterProperty ], ( atomPair, interactionStrength, atomDiameter ) => { if ( atomPair === AtomPair.ADJUSTABLE ) { diff --git a/js/atomic-interactions/view/InteractivePotentialGraph.js b/js/atomic-interactions/view/InteractivePotentialGraph.js index 6c29c619..c00f050f 100644 --- a/js/atomic-interactions/view/InteractivePotentialGraph.js +++ b/js/atomic-interactions/view/InteractivePotentialGraph.js @@ -7,7 +7,7 @@ * @author John Blanco */ -import Property from '../../../../axon/js/Property.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import { Shape } from '../../../../kite/js/imports.js'; import merge from '../../../../phet-core/js/merge.js'; @@ -251,7 +251,7 @@ class InteractivePotentialGraph extends PotentialGraphNode { this.positionMarker.changeColor( dualAtomModel.movableAtom.color ); } ); - Property.multilink( + Multilink.multilink( [ dualAtomModel.atomPairProperty, dualAtomModel.adjustableAtomInteractionStrengthProperty, dualAtomModel.adjustableAtomDiameterProperty ], () => { this.setLjPotentialParameters( dualAtomModel.getSigma(), dualAtomModel.getEpsilon() ); diff --git a/js/phase-changes/view/EpsilonControlPotentialGraph.js b/js/phase-changes/view/EpsilonControlPotentialGraph.js index 8f9b150e..d216d17f 100644 --- a/js/phase-changes/view/EpsilonControlPotentialGraph.js +++ b/js/phase-changes/view/EpsilonControlPotentialGraph.js @@ -8,7 +8,7 @@ * @author Siddhartha Chinthapally (Actual Concepts) */ -import Property from '../../../../axon/js/Property.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Utils from '../../../../dot/js/Utils.js'; import merge from '../../../../phet-core/js/merge.js'; @@ -159,7 +159,7 @@ class EpsilonControlPotentialGraph extends PotentialGraphNode { } ); // Update the graph when the substance or interaction strength changes. - Property.multilink( + Multilink.multilink( [ phaseChangesModel.substanceProperty, phaseChangesModel.adjustableAtomInteractionStrengthProperty ], substance => { this.interactionEnabled = substance === SubstanceType.ADJUSTABLE_ATOM; diff --git a/js/phase-changes/view/PhaseChangesScreenView.js b/js/phase-changes/view/PhaseChangesScreenView.js index 53a4a681..62ccfde5 100644 --- a/js/phase-changes/view/PhaseChangesScreenView.js +++ b/js/phase-changes/view/PhaseChangesScreenView.js @@ -10,6 +10,7 @@ import createObservableArray from '../../../../axon/js/createObservableArray.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import Property from '../../../../axon/js/Property.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Range from '../../../../dot/js/Range.js'; @@ -111,7 +112,7 @@ class PhaseChangesScreenView extends ScreenView { this.addChild( heaterCoolerNode ); // control when the heater/cooler node is enabled for input - Property.multilink( + Multilink.multilink( [ model.isPlayingProperty, model.isExplodedProperty ], ( isPlaying, isExploded ) => { if ( !isPlaying || isExploded ) { @@ -340,7 +341,7 @@ class PhaseChangesScreenView extends ScreenView { } ); // Update layout based on the visibility and bounds of the various control panels and accordion boxes. - Property.multilink( + Multilink.multilink( [ this.phaseDiagramAccordionBox.visibleProperty, moleculesControlPanel.boundsProperty ], ( phaseDiagramVisible, moleculeControlPanelBounds ) => { if ( isPotentialGraphEnabled ) { diff --git a/js/states/view/StatesScreenView.js b/js/states/view/StatesScreenView.js index 33d9ad69..4f21723c 100644 --- a/js/states/view/StatesScreenView.js +++ b/js/states/view/StatesScreenView.js @@ -8,7 +8,7 @@ * @author Siddhartha Chinthapally (Actual Concepts) */ -import Property from '../../../../axon/js/Property.js'; +import Multilink from '../../../../axon/js/Multilink.js'; import merge from '../../../../phet-core/js/merge.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; @@ -79,7 +79,7 @@ class StatesScreenView extends ScreenView { this.addChild( heaterCoolerNode ); // control when the heater/cooler node is enabled for input - Property.multilink( + Multilink.multilink( [ multipleParticleModel.isPlayingProperty, multipleParticleModel.isExplodedProperty ], ( isPlaying, isExploded ) => { if ( !isPlaying || isExploded ) {