From 4abd50416a427f31a2d914e7d1ea9b006cb98119 Mon Sep 17 00:00:00 2001 From: Sam Reid Date: Fri, 9 Jun 2023 11:00:41 -0600 Subject: [PATCH] Refactor view-related soccer things to soccer-common/view, see https://github.com/phetsims/center-and-variability/issues/222 --- js/common/view/AccordionBoxCheckboxFactory.ts | 2 +- js/common/view/CAVScreenView.ts | 8 ++++---- js/common/view/PlayAreaCheckboxFactory.ts | 2 +- .../view/MeanAndMedianAccordionBox.ts | 2 +- js/mean-and-median/view/MeanAndMedianPlotNode.ts | 4 ++-- js/median/view/CardNodeContainer.ts | 2 +- js/{common => soccer-common}/view/CAVPlotNode.ts | 6 +++--- js/{common => soccer-common}/view/DataPointNode.ts | 14 +++++++------- .../view/DragIndicatorArrowNode.ts | 4 ++-- .../view/NumberLineNode.ts | 4 ++-- js/{common => soccer-common}/view/SceneView.ts | 14 +++++++------- .../view/SoccerBallNode.ts | 12 ++++++------ .../view/SoccerPlayerNode.ts | 4 ++-- js/variability/view/IQRInfoNode.ts | 2 +- js/variability/view/IQRNode.ts | 4 ++-- js/variability/view/InfoDialog.ts | 2 +- js/variability/view/MADInfoNode.ts | 2 +- js/variability/view/MADNode.ts | 4 ++-- js/variability/view/RangeInfoNode.ts | 2 +- js/variability/view/RangeNode.ts | 4 ++-- js/variability/view/VariabilityAccordionBox.ts | 2 +- js/variability/view/VariabilityPlotNode.ts | 4 ++-- js/variability/view/VariabilityScreenView.ts | 2 +- 23 files changed, 53 insertions(+), 53 deletions(-) rename js/{common => soccer-common}/view/CAVPlotNode.ts (97%) rename js/{common => soccer-common}/view/DataPointNode.ts (88%) rename js/{common => soccer-common}/view/DragIndicatorArrowNode.ts (92%) rename js/{common => soccer-common}/view/NumberLineNode.ts (98%) rename js/{common => soccer-common}/view/SceneView.ts (92%) rename js/{common => soccer-common}/view/SoccerBallNode.ts (95%) rename js/{common => soccer-common}/view/SoccerPlayerNode.ts (98%) diff --git a/js/common/view/AccordionBoxCheckboxFactory.ts b/js/common/view/AccordionBoxCheckboxFactory.ts index b34c053b..4f549bb8 100644 --- a/js/common/view/AccordionBoxCheckboxFactory.ts +++ b/js/common/view/AccordionBoxCheckboxFactory.ts @@ -12,7 +12,7 @@ import { VerticalCheckboxGroupItem } from '../../../../sun/js/VerticalCheckboxGr import { AlignGroup, GridBox, Line, Node, Text } from '../../../../scenery/js/imports.js'; import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; import CAVConstants from '../CAVConstants.js'; -import NumberLineNode from './NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; import MedianBarNode from './MedianBarNode.js'; import CAVColors from '../CAVColors.js'; import Tandem from '../../../../tandem/js/Tandem.js'; diff --git a/js/common/view/CAVScreenView.ts b/js/common/view/CAVScreenView.ts index d4413541..ab277db6 100644 --- a/js/common/view/CAVScreenView.ts +++ b/js/common/view/CAVScreenView.ts @@ -16,7 +16,7 @@ import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransfo import { AlignBox, Node } from '../../../../scenery/js/imports.js'; import EraserButton from '../../../../scenery-phet/js/buttons/EraserButton.js'; import QuestionBar, { QuestionBarOptions } from '../../../../scenery-phet/js/QuestionBar.js'; -import NumberLineNode from './NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import BackgroundNode from './BackgroundNode.js'; import CAVAccordionBox from './CAVAccordionBox.js'; @@ -26,13 +26,13 @@ import Property from '../../../../axon/js/Property.js'; import Range from '../../../../dot/js/Range.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import CAVModel from '../model/CAVModel.js'; -import SceneView from './SceneView.js'; +import SceneView from '../../soccer-common/view/SceneView.js'; import KickButtonGroup from './KickButtonGroup.js'; import DynamicProperty from '../../../../axon/js/DynamicProperty.js'; -import SoccerPlayerNode, { SoccerPlayerImageSet } from './SoccerPlayerNode.js'; +import SoccerPlayerNode, { SoccerPlayerImageSet } from '../../soccer-common/view/SoccerPlayerNode.js'; import SoccerPlayer from '../../soccer-common/model/SoccerPlayer.js'; import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js'; -import DragIndicatorArrowNode from './DragIndicatorArrowNode.js'; +import DragIndicatorArrowNode from '../../soccer-common/view/DragIndicatorArrowNode.js'; import CAVObjectType from '../../soccer-common/model/CAVObjectType.js'; import ToggleNode from '../../../../sun/js/ToggleNode.js'; import PlayAreaMedianIndicatorNode from './PlayAreaMedianIndicatorNode.js'; diff --git a/js/common/view/PlayAreaCheckboxFactory.ts b/js/common/view/PlayAreaCheckboxFactory.ts index 5ec7a982..b3317852 100644 --- a/js/common/view/PlayAreaCheckboxFactory.ts +++ b/js/common/view/PlayAreaCheckboxFactory.ts @@ -16,7 +16,7 @@ import { AlignGroup, GridBox, Node, TColor, Text } from '../../../../scenery/js/ import CAVConstants from '../CAVConstants.js'; import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; import CAVColors from '../CAVColors.js'; -import NumberLineNode from './NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; import PredictionThumbNode from './PredictionThumbNode.js'; import LinkableProperty from '../../../../axon/js/LinkableProperty.js'; import VariabilityModel from '../../variability/model/VariabilityModel.js'; diff --git a/js/mean-and-median/view/MeanAndMedianAccordionBox.ts b/js/mean-and-median/view/MeanAndMedianAccordionBox.ts index acf266c4..26c92b59 100644 --- a/js/mean-and-median/view/MeanAndMedianAccordionBox.ts +++ b/js/mean-and-median/view/MeanAndMedianAccordionBox.ts @@ -19,7 +19,7 @@ import CAVColors from '../../common/CAVColors.js'; import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import AccordionBoxTitleText from '../../common/view/AccordionBoxTitleText.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class MeanAndMedianAccordionBox extends CAVAccordionBox { private readonly medianPlotNode: MeanAndMedianPlotNode; diff --git a/js/mean-and-median/view/MeanAndMedianPlotNode.ts b/js/mean-and-median/view/MeanAndMedianPlotNode.ts index 0650e074..7d7bc4e4 100644 --- a/js/mean-and-median/view/MeanAndMedianPlotNode.ts +++ b/js/mean-and-median/view/MeanAndMedianPlotNode.ts @@ -12,10 +12,10 @@ import centerAndVariability from '../../centerAndVariability.js'; import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js'; import MedianBarNode from '../../common/view/MedianBarNode.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import CAVPlotNode, { CAVPlotNodeOptions } from '../../common/view/CAVPlotNode.js'; +import CAVPlotNode, { CAVPlotNodeOptions } from '../../soccer-common/view/CAVPlotNode.js'; import MeanAndMedianModel from '../model/MeanAndMedianModel.js'; import { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; import { SoccerBallPhase } from '../../soccer-common/model/SoccerBallPhase.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/median/view/CardNodeContainer.ts b/js/median/view/CardNodeContainer.ts index 3e612408..3d62898f 100644 --- a/js/median/view/CardNodeContainer.ts +++ b/js/median/view/CardNodeContainer.ts @@ -32,7 +32,7 @@ import AsyncCounter from '../../common/model/AsyncCounter.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import Matrix3 from '../../../../dot/js/Matrix3.js'; -import DragIndicatorArrowNode from '../../common/view/DragIndicatorArrowNode.js'; +import DragIndicatorArrowNode from '../../soccer-common/view/DragIndicatorArrowNode.js'; import TEmitter from '../../../../axon/js/TEmitter.js'; import MedianModel from '../../median/model/MedianModel.js'; import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'; diff --git a/js/common/view/CAVPlotNode.ts b/js/soccer-common/view/CAVPlotNode.ts similarity index 97% rename from js/common/view/CAVPlotNode.ts rename to js/soccer-common/view/CAVPlotNode.ts index 760df156..83d774b4 100644 --- a/js/common/view/CAVPlotNode.ts +++ b/js/soccer-common/view/CAVPlotNode.ts @@ -10,15 +10,15 @@ import centerAndVariability from '../../centerAndVariability.js'; import { ManualConstraint, MatrixBetweenProperty, Node, NodeOptions, TColor, Text } from '../../../../scenery/js/imports.js'; import optionize from '../../../../phet-core/js/optionize.js'; -import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js'; +import CAVSceneModel from '../model/CAVSceneModel.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import NumberLineNode from './NumberLineNode.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; -import CAVConstants from '../CAVConstants.js'; +import CAVConstants from '../../common/CAVConstants.js'; import WithRequired from '../../../../phet-core/js/types/WithRequired.js'; import DataPointNode from './DataPointNode.js'; -import CAVModel from '../model/CAVModel.js'; +import CAVModel from '../../common/model/CAVModel.js'; import MeanAndMedianModel from '../../mean-and-median/model/MeanAndMedianModel.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import VariabilityModel from '../../variability/model/VariabilityModel.js'; diff --git a/js/common/view/DataPointNode.ts b/js/soccer-common/view/DataPointNode.ts similarity index 88% rename from js/common/view/DataPointNode.ts rename to js/soccer-common/view/DataPointNode.ts index f94debeb..956bc8a5 100644 --- a/js/common/view/DataPointNode.ts +++ b/js/soccer-common/view/DataPointNode.ts @@ -1,19 +1,19 @@ // Copyright 2023, University of Colorado Boulder -import CAVObjectNode, { CAVObjectNodeOptions } from './CAVObjectNode.js'; +import CAVObjectNode, { CAVObjectNodeOptions } from '../../common/view/CAVObjectNode.js'; import centerAndVariability from '../../centerAndVariability.js'; -import SoccerBall from '../../soccer-common/model/SoccerBall.js'; +import SoccerBall from '../model/SoccerBall.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import CAVObjectType from '../../soccer-common/model/CAVObjectType.js'; +import CAVObjectType from '../model/CAVObjectType.js'; import { Circle, Node, Path, TColor } from '../../../../scenery/js/imports.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import timesSolidShape from '../../../../sherpa/js/fontawesome-5/timesSolidShape.js'; -import CAVConstants, { DATA_POINT_SCALE_PROPERTY } from '../CAVConstants.js'; -import PlotType from '../model/PlotType.js'; -import CAVColors from '../CAVColors.js'; +import CAVConstants, { DATA_POINT_SCALE_PROPERTY } from '../../common/CAVConstants.js'; +import PlotType from '../../common/model/PlotType.js'; +import CAVColors from '../../common/CAVColors.js'; import Property from '../../../../axon/js/Property.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import { SoccerBallPhase } from '../../soccer-common/model/SoccerBallPhase.js'; +import { SoccerBallPhase } from '../model/SoccerBallPhase.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; type DataPointNodeOptions = CAVObjectNodeOptions & { fill: TColor }; diff --git a/js/common/view/DragIndicatorArrowNode.ts b/js/soccer-common/view/DragIndicatorArrowNode.ts similarity index 92% rename from js/common/view/DragIndicatorArrowNode.ts rename to js/soccer-common/view/DragIndicatorArrowNode.ts index 7c847c3d..59957536 100644 --- a/js/common/view/DragIndicatorArrowNode.ts +++ b/js/soccer-common/view/DragIndicatorArrowNode.ts @@ -8,8 +8,8 @@ */ import ArrowNode, { ArrowNodeOptions } from '../../../../scenery-phet/js/ArrowNode.js'; -import CAVColors from '../CAVColors.js'; -import CAVConstants from '../CAVConstants.js'; +import CAVColors from '../../common/CAVColors.js'; +import CAVConstants from '../../common/CAVConstants.js'; import centerAndVariability from '../../centerAndVariability.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; diff --git a/js/common/view/NumberLineNode.ts b/js/soccer-common/view/NumberLineNode.ts similarity index 98% rename from js/common/view/NumberLineNode.ts rename to js/soccer-common/view/NumberLineNode.ts index 31b9eb61..5ca302f5 100644 --- a/js/common/view/NumberLineNode.ts +++ b/js/soccer-common/view/NumberLineNode.ts @@ -18,10 +18,10 @@ import TickLabelSet from '../../../../bamboo/js/TickLabelSet.js'; import Utils from '../../../../dot/js/Utils.js'; import { Shape } from '../../../../kite/js/imports.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import CAVColors from '../CAVColors.js'; +import CAVColors from '../../common/CAVColors.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import CAVConstants from '../CAVConstants.js'; +import CAVConstants from '../../common/CAVConstants.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import Multilink from '../../../../axon/js/Multilink.js'; diff --git a/js/common/view/SceneView.ts b/js/soccer-common/view/SceneView.ts similarity index 92% rename from js/common/view/SceneView.ts rename to js/soccer-common/view/SceneView.ts index 10beb4a2..430187ea 100644 --- a/js/common/view/SceneView.ts +++ b/js/soccer-common/view/SceneView.ts @@ -9,19 +9,19 @@ import { Node } from '../../../../scenery/js/imports.js'; import SoccerBallNode from './SoccerBallNode.js'; -import { SoccerBallPhase } from '../../soccer-common/model/SoccerBallPhase.js'; -import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js'; +import { SoccerBallPhase } from '../model/SoccerBallPhase.js'; +import CAVSceneModel from '../model/CAVSceneModel.js'; import SoccerPlayerNode, { SoccerPlayerImageSet } from './SoccerPlayerNode.js'; import Tandem from '../../../../tandem/js/Tandem.js'; -import CAVModel from '../model/CAVModel.js'; +import CAVModel from '../../common/model/CAVModel.js'; import centerAndVariability from '../../centerAndVariability.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import SoccerBall from '../../soccer-common/model/SoccerBall.js'; +import SoccerBall from '../model/SoccerBall.js'; import { Shape } from '../../../../kite/js/imports.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; -import SoccerPlayer from '../../soccer-common/model/SoccerPlayer.js'; -import CAVAccordionBox from './CAVAccordionBox.js'; -import MedianHighlightLayer from './MedianHighlightLayer.js'; +import SoccerPlayer from '../model/SoccerPlayer.js'; +import CAVAccordionBox from '../../common/view/CAVAccordionBox.js'; +import MedianHighlightLayer from '../../common/view/MedianHighlightLayer.js'; /** * Renders view elements for a CAVSceneModel. Note that to satisfy the correct z-ordering, elements diff --git a/js/common/view/SoccerBallNode.ts b/js/soccer-common/view/SoccerBallNode.ts similarity index 95% rename from js/common/view/SoccerBallNode.ts rename to js/soccer-common/view/SoccerBallNode.ts index fda4c972..d3c14ab2 100644 --- a/js/common/view/SoccerBallNode.ts +++ b/js/soccer-common/view/SoccerBallNode.ts @@ -1,25 +1,25 @@ // Copyright 2023, University of Colorado Boulder -import CAVObjectNode, { CAVObjectNodeOptions } from './CAVObjectNode.js'; +import CAVObjectNode, { CAVObjectNodeOptions } from '../../common/view/CAVObjectNode.js'; import centerAndVariability from '../../centerAndVariability.js'; -import SoccerBall from '../../soccer-common/model/SoccerBall.js'; +import SoccerBall from '../model/SoccerBall.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; import TProperty from '../../../../axon/js/TProperty.js'; import { DragListener, Image, Node } from '../../../../scenery/js/imports.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; -import { SoccerBallPhase } from '../../soccer-common/model/SoccerBallPhase.js'; -import CAVObjectType from '../../soccer-common/model/CAVObjectType.js'; +import { SoccerBallPhase } from '../model/SoccerBallPhase.js'; +import CAVObjectType from '../model/CAVObjectType.js'; import ballDark_png from '../../../images/ballDark_png.js'; import ball_png from '../../../images/ball_png.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import AccessibleSlider, { AccessibleSliderOptions } from '../../../../sun/js/accessibility/AccessibleSlider.js'; import Property from '../../../../axon/js/Property.js'; -import CAVConstants from '../CAVConstants.js'; +import CAVConstants from '../../common/CAVConstants.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import DynamicProperty from '../../../../axon/js/DynamicProperty.js'; -import NumberTone from '../../soccer-common/model/NumberTone.js'; +import NumberTone from '../model/NumberTone.js'; import { Shape } from '../../../../kite/js/imports.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; diff --git a/js/common/view/SoccerPlayerNode.ts b/js/soccer-common/view/SoccerPlayerNode.ts similarity index 98% rename from js/common/view/SoccerPlayerNode.ts rename to js/soccer-common/view/SoccerPlayerNode.ts index 432d096a..04cd78af 100644 --- a/js/common/view/SoccerPlayerNode.ts +++ b/js/soccer-common/view/SoccerPlayerNode.ts @@ -72,11 +72,11 @@ import variabilityPlayer04Standing_png from '../../../images/variabilityPlayer04 import variabilityPlayer04PoisedToKick_png from '../../../images/variabilityPlayer04PoisedToKick_png.js'; import variabilityPlayer04Kicking_png from '../../../images/variabilityPlayer04Kicking_png.js'; -import SoccerPlayer from '../../soccer-common/model/SoccerPlayer.js'; +import SoccerPlayer from '../model/SoccerPlayer.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js'; -import Pose from '../../soccer-common/model/Pose.js'; +import Pose from '../model/Pose.js'; import Multilink from '../../../../axon/js/Multilink.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/variability/view/IQRInfoNode.ts b/js/variability/view/IQRInfoNode.ts index 6686df50..c28d65e5 100644 --- a/js/variability/view/IQRInfoNode.ts +++ b/js/variability/view/IQRInfoNode.ts @@ -15,7 +15,7 @@ import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import CAVColors from '../../common/CAVColors.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class IQRInfoNode extends VBox { public constructor( model: VariabilityModel, sceneModel: VariabilitySceneModel, playAreaNumberLineNode: NumberLineNode, options: PickRequired ) { diff --git a/js/variability/view/IQRNode.ts b/js/variability/view/IQRNode.ts index 81c19b1a..ee55ef69 100644 --- a/js/variability/view/IQRNode.ts +++ b/js/variability/view/IQRNode.ts @@ -6,14 +6,14 @@ import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js'; import centerAndVariability from '../../centerAndVariability.js'; import VariabilityModel from '../model/VariabilityModel.js'; import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; -import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js'; +import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import CAVColors from '../../common/CAVColors.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; import CAVConstants, { SHOW_OUTLIERS_PROPERTY } from '../../common/CAVConstants.js'; import optionize from '../../../../phet-core/js/optionize.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; type SelfOptions = { parentContext: 'accordion' | 'info'; diff --git a/js/variability/view/InfoDialog.ts b/js/variability/view/InfoDialog.ts index e77486df..3f73cbd5 100644 --- a/js/variability/view/InfoDialog.ts +++ b/js/variability/view/InfoDialog.ts @@ -11,7 +11,7 @@ import MADInfoNode from './MADInfoNode.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class InfoDialog extends Dialog { public constructor( model: VariabilityModel, sceneModel: VariabilitySceneModel, playAreaNumberLineNode: NumberLineNode, options: PickRequired ) { diff --git a/js/variability/view/MADInfoNode.ts b/js/variability/view/MADInfoNode.ts index 981e91d8..b5ee8b0f 100644 --- a/js/variability/view/MADInfoNode.ts +++ b/js/variability/view/MADInfoNode.ts @@ -14,7 +14,7 @@ import MADNode from './MADNode.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class MADInfoNode extends VBox { public constructor( model: VariabilityModel, sceneModel: VariabilitySceneModel, playAreaNumberLineNode: NumberLineNode, options: PickRequired ) { diff --git a/js/variability/view/MADNode.ts b/js/variability/view/MADNode.ts index beb91b86..1ef4563e 100644 --- a/js/variability/view/MADNode.ts +++ b/js/variability/view/MADNode.ts @@ -7,13 +7,13 @@ import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; import MedianBarNode from '../../common/view/MedianBarNode.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import Utils from '../../../../dot/js/Utils.js'; -import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js'; +import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js'; import CAVConstants from '../../common/CAVConstants.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import CAVColors from '../../common/CAVColors.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; import optionize from '../../../../phet-core/js/optionize.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; type SelfOptions = { parentContext: 'accordion' | 'info'; diff --git a/js/variability/view/RangeInfoNode.ts b/js/variability/view/RangeInfoNode.ts index df262c90..1ef89a10 100644 --- a/js/variability/view/RangeInfoNode.ts +++ b/js/variability/view/RangeInfoNode.ts @@ -11,7 +11,7 @@ import centerAndVariability from '../../centerAndVariability.js'; import RangeNode from './RangeNode.js'; import CAVConstants from '../../common/CAVConstants.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class RangeInfoNode extends VBox { public constructor( model: VariabilityModel, sceneModel: VariabilitySceneModel, playAreaNumberLineNode: NumberLineNode, options: PickRequired ) { diff --git a/js/variability/view/RangeNode.ts b/js/variability/view/RangeNode.ts index 0ec7ddcb..f250f4eb 100644 --- a/js/variability/view/RangeNode.ts +++ b/js/variability/view/RangeNode.ts @@ -11,14 +11,14 @@ import { ManualConstraint, Rectangle, Text } from '../../../../scenery/js/import import centerAndVariability from '../../centerAndVariability.js'; import VariabilityModel from '../model/VariabilityModel.js'; import CenterAndVariabilityStrings from '../../CenterAndVariabilityStrings.js'; -import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../common/view/CAVPlotNode.js'; +import CAVPlotNode, { CAVPlotNodeOptions, MIN_KICKS_TEXT_OFFSET, MIN_KICKS_TEXT_TOP_MARGIN } from '../../soccer-common/view/CAVPlotNode.js'; import CAVObjectType from '../../soccer-common/model/CAVObjectType.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import CAVConstants from '../../common/CAVConstants.js'; import CAVColors from '../../common/CAVColors.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; import optionize from '../../../../phet-core/js/optionize.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; import SoccerBall from '../../soccer-common/model/SoccerBall.js'; type SelfOptions = { diff --git a/js/variability/view/VariabilityAccordionBox.ts b/js/variability/view/VariabilityAccordionBox.ts index c89b36dc..a839df88 100644 --- a/js/variability/view/VariabilityAccordionBox.ts +++ b/js/variability/view/VariabilityAccordionBox.ts @@ -23,7 +23,7 @@ import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import VariabilityMeasureCheckbox from './VariabilityMeasureCheckbox.js'; import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'; import AccordionBoxTitleText from '../../common/view/AccordionBoxTitleText.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export default class VariabilityAccordionBox extends CAVAccordionBox { diff --git a/js/variability/view/VariabilityPlotNode.ts b/js/variability/view/VariabilityPlotNode.ts index 614d263e..d6e8dbf5 100644 --- a/js/variability/view/VariabilityPlotNode.ts +++ b/js/variability/view/VariabilityPlotNode.ts @@ -19,9 +19,9 @@ import MADNode from './MADNode.js'; import VariabilityMeasure from '../model/VariabilityMeasure.js'; import ToggleNode from '../../../../sun/js/ToggleNode.js'; import VariabilitySceneModel from '../model/VariabilitySceneModel.js'; -import CAVPlotNode from '../../common/view/CAVPlotNode.js'; +import CAVPlotNode from '../../soccer-common/view/CAVPlotNode.js'; import IntervalToolPlayAreaNode from './IntervalToolPlayAreaNode.js'; -import NumberLineNode from '../../common/view/NumberLineNode.js'; +import NumberLineNode from '../../soccer-common/view/NumberLineNode.js'; export type CAVPlotOptions = NodeOptions & PickRequired; diff --git a/js/variability/view/VariabilityScreenView.ts b/js/variability/view/VariabilityScreenView.ts index b4b67ba6..b4fb165e 100644 --- a/js/variability/view/VariabilityScreenView.ts +++ b/js/variability/view/VariabilityScreenView.ts @@ -23,7 +23,7 @@ import PlayAreaCheckboxFactory from '../../common/view/PlayAreaCheckboxFactory.j import CAVConstants from '../../common/CAVConstants.js'; import VerticalCheckboxGroup from '../../../../sun/js/VerticalCheckboxGroup.js'; import SoccerPlayer from '../../soccer-common/model/SoccerPlayer.js'; -import SoccerPlayerNode, { SoccerPlayerImageSet } from '../../common/view/SoccerPlayerNode.js'; +import SoccerPlayerNode, { SoccerPlayerImageSet } from '../../soccer-common/view/SoccerPlayerNode.js'; import CAVSceneModel from '../../soccer-common/model/CAVSceneModel.js'; import InfoDialog from './InfoDialog.js'; import Multilink from '../../../../axon/js/Multilink.js';