diff --git a/js/common/model/DensityBuoyancyModel.ts b/js/common/model/DensityBuoyancyModel.ts index 80afcedb..0af81dcd 100644 --- a/js/common/model/DensityBuoyancyModel.ts +++ b/js/common/model/DensityBuoyancyModel.ts @@ -28,8 +28,9 @@ import PhysicsEngine, { PhysicsEngineBody } from './PhysicsEngine.js'; import Mass from './Mass.js'; import Basin from './Basin.js'; import Cuboid from './Cuboid.js'; -import NumberProperty, { RangedProperty } from '../../../../axon/js/NumberProperty.js'; +import NumberProperty from '../../../../axon/js/NumberProperty.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import TRangedProperty from '../../../../axon/js/TRangedProperty.js'; // constants const BLOCK_SPACING = 0.01; @@ -53,7 +54,7 @@ export default class DensityBuoyancyModel { public readonly showBuoyancyForceProperty: Property; public readonly showContactForceProperty: Property; public readonly showForceValuesProperty: Property; - public readonly forceScaleProperty: RangedProperty; + public readonly forceScaleProperty: TRangedProperty; public readonly showMassesProperty: Property; public readonly gravityProperty: Property; public readonly liquidMaterialProperty: Property; diff --git a/js/density/view/ComparisonNumberControl.ts b/js/density/view/ComparisonNumberControl.ts index db207b7b..d5e52074 100644 --- a/js/density/view/ComparisonNumberControl.ts +++ b/js/density/view/ComparisonNumberControl.ts @@ -6,7 +6,6 @@ * @author Jonathan Olson */ -import { RangedProperty } from '../../../../axon/js/NumberProperty.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Utils from '../../../../dot/js/Utils.js'; @@ -18,12 +17,13 @@ import { Text } from '../../../../scenery/js/imports.js'; import SunConstants from '../../../../sun/js/SunConstants.js'; import DensityBuoyancyCommonConstants from '../../common/DensityBuoyancyCommonConstants.js'; import densityBuoyancyCommon from '../../densityBuoyancyCommon.js'; +import TRangedProperty from '../../../../axon/js/TRangedProperty.js'; export type ComparisonNumberControlOptions = NumberControlOptions; export default class ComparisonNumberControl extends NumberControl { public constructor( - property: RangedProperty, + property: TRangedProperty, titleStringProperty: TReadOnlyProperty, valuePatternStringProperty: TReadOnlyProperty, valueName: string,