Skip to content

Commit

Permalink
optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@zepumph
zepumph committed Jul 20, 2022
1 parent b0cce26 commit 8e5dabb
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 79 deletions.
4 changes: 2 additions & 2 deletions js/common/view/ComparisonStatementAccordionBox.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* @author John Blanco (PhET Interactive Simulations)
*/

import NLCConstants from '../../../../number-line-common/js/common/NLCConstants.js';
import merge from '../../../../phet-core/js/merge.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Text } from '../../../../scenery/js/imports.js';
import AccordionBox from '../../../../sun/js/AccordionBox.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import ComparisonStatementNode from './ComparisonStatementNode.js';
import NLCConstants from '../../../../number-line-common/js/common/NLCConstants.js';

const comparisonStatementString = numberLineIntegersStrings.comparisonStatement;

Expand Down
7 changes: 1 addition & 6 deletions js/common/view/ComparisonStatementNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ import { Shape } from '../../../../kite/js/imports.js';
import merge from '../../../../phet-core/js/merge.js';
import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { FireListener } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Path } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, FireListener, Node, Path, Rectangle, Text } from '../../../../scenery/js/imports.js';
import Animation from '../../../../twixt/js/Animation.js';
import Easing from '../../../../twixt/js/Easing.js';
import numberLineIntegers from '../../numberLineIntegers.js';
Expand Down
2 changes: 1 addition & 1 deletion js/explore/NLIExploreScreen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import ScreenIcon from '../../../joist/js/ScreenIcon.js';
import { Image } from '../../../scenery/js/imports.js';
import exploreScreenHome_png from '../../images/exploreScreenHome_png.js';
import exploreScreenNav_png from '../../images/exploreScreenNav_png.js';
import numberLineIntegersStrings from '../numberLineIntegersStrings.js';
import numberLineIntegers from '../numberLineIntegers.js';
import numberLineIntegersStrings from '../numberLineIntegersStrings.js';
import NLIExploreModel from './model/NLIExploreModel.js';
import NLIExploreScreenView from './view/NLIExploreScreenView.js';

Expand Down
4 changes: 2 additions & 2 deletions js/explore/model/BankSceneModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import LockToNumberLine from '../../../../number-line-common/js/common/model/LockToNumberLine.js';
import NumberLinePoint from '../../../../number-line-common/js/common/model/NumberLinePoint.js';
import PointController from '../../../../number-line-common/js/common/model/PointController.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import NLIConstants from '../../common/NLIConstants.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import BankAccount from './BankAccount.js';
Expand Down
2 changes: 1 addition & 1 deletion js/explore/model/ElevationPointController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import Utils from '../../../../dot/js/Utils.js';
import merge from '../../../../phet-core/js/merge.js';
import LockToNumberLine from '../../../../number-line-common/js/common/model/LockToNumberLine.js';
import NumberLinePoint from '../../../../number-line-common/js/common/model/NumberLinePoint.js';
import PointController from '../../../../number-line-common/js/common/model/PointController.js';
import merge from '../../../../phet-core/js/merge.js';
import numberLineIntegers from '../../numberLineIntegers.js';

class ElevationPointController extends PointController {
Expand Down
4 changes: 2 additions & 2 deletions js/explore/model/ElevationSceneModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import createObservableArray from '../../../../axon/js/createObservableArray.js'
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Range from '../../../../dot/js/Range.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import LockToNumberLine from '../../../../number-line-common/js/common/model/LockToNumberLine.js';
import PointController from '../../../../number-line-common/js/common/model/PointController.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import NLIConstants from '../../common/NLIConstants.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import ElevationPointController from './ElevationPointController.js';
Expand Down
2 changes: 1 addition & 1 deletion js/explore/model/SceneModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import Range from '../../../../dot/js/Range.js';
import merge from '../../../../phet-core/js/merge.js';
import SpatializedNumberLine from '../../../../number-line-common/js/common/model/SpatializedNumberLine.js';
import merge from '../../../../phet-core/js/merge.js';
import NLIConstants from '../../common/NLIConstants.js';
import numberLineIntegers from '../../numberLineIntegers.js';

Expand Down
9 changes: 4 additions & 5 deletions js/explore/model/TemperaturePointController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
*/

import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Multilink from '../../../../axon/js/Multilink.js';
import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Range from '../../../../dot/js/Range.js';
import Utils from '../../../../dot/js/Utils.js';
import merge from '../../../../phet-core/js/merge.js';
import { Color } from '../../../../scenery/js/imports.js';
import { PaintColorProperty } from '../../../../scenery/js/imports.js';
import LockToNumberLine from '../../../../number-line-common/js/common/model/LockToNumberLine.js';
import NumberLinePoint from '../../../../number-line-common/js/common/model/NumberLinePoint.js';
import PointController from '../../../../number-line-common/js/common/model/PointController.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import TemperatureToColorMapper from '../../../../number-line-common/js/explore/model/TemperatureToColorMapper.js';
import merge from '../../../../phet-core/js/merge.js';
import { Color, PaintColorProperty } from '../../../../scenery/js/imports.js';
import numberLineIntegers from '../../numberLineIntegers.js';

// constants
const TEMPERATURE_RANGE_ON_MAP = new Range( -60, 50 ); // in Celsius, must match range used to make map images
Expand Down
4 changes: 2 additions & 2 deletions js/explore/model/TemperatureSceneModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Range from '../../../../dot/js/Range.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import LockToNumberLine from '../../../../number-line-common/js/common/model/LockToNumberLine.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import NLIConstants from '../../common/NLIConstants.js';
import NLIQueryParameters from '../../common/NLIQueryParameters.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import reverseRobinsonProjector from './reverseRobinsonProjector.js';
import SceneModel from './SceneModel.js';
import temperatureDataSet from './temperatureDataSet.js';
Expand Down
8 changes: 2 additions & 6 deletions js/explore/view/AccountBalanceControllerNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@ import Emitter from '../../../../axon/js/Emitter.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import merge from '../../../../phet-core/js/merge.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Image } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { VBox } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, Image, Node, Text, VBox } from '../../../../scenery/js/imports.js';
import RoundPushButton from '../../../../sun/js/buttons/RoundPushButton.js';
import coinInHand_png from '../../../images/coinInHand_png.js';
import coinInSlot_png from '../../../images/coinInSlot_png.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';

// constants
const MARGIN = 10;
Expand Down
13 changes: 5 additions & 8 deletions js/explore/view/BankPointControllerNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,18 @@
import Vector2 from '../../../../dot/js/Vector2.js';
import { Shape } from '../../../../kite/js/imports.js';
import NLCConstants from '../../../../number-line-common/js/common/NLCConstants.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import PiggyBankDecoration from '../../../../number-line-common/js/explore/model/PiggyBankDecoration.js';
import PiggyBankNode from '../../../../number-line-common/js/explore/view/PiggyBankNode.js';
import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import BackgroundNode from '../../../../scenery-phet/js/BackgroundNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Circle } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Circle, Color, Node, Text } from '../../../../scenery/js/imports.js';
import Animation from '../../../../twixt/js/Animation.js';
import Easing from '../../../../twixt/js/Easing.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import PiggyBankDecoration from '../../../../number-line-common/js/explore/model/PiggyBankDecoration.js';
import PiggyBankNode from '../../../../number-line-common/js/explore/view/PiggyBankNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';

// constants
const MIN_WIDTH = 80; // screen coords, empirically determined
Expand Down
10 changes: 4 additions & 6 deletions js/explore/view/BankSceneView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@
*/

import Dimension2 from '../../../../dot/js/Dimension2.js';
import PiggyBankDecoration from '../../../../number-line-common/js/explore/model/PiggyBankDecoration.js';
import PiggyBankNode from '../../../../number-line-common/js/explore/view/PiggyBankNode.js';
import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { HBox } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { HBox, Node, Text } from '../../../../scenery/js/imports.js';
import ABSwitch from '../../../../sun/js/ABSwitch.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import BankSceneModel from '../model/BankSceneModel.js';
import PiggyBankDecoration from '../../../../number-line-common/js/explore/model/PiggyBankDecoration.js';
import AccountBalanceControllerNode from './AccountBalanceControllerNode.js';
import BankPointControllerNode from './BankPointControllerNode.js';
import PiggyBankNode from '../../../../number-line-common/js/explore/view/PiggyBankNode.js';
import SceneView from './SceneView.js';

// constants
Expand Down
8 changes: 3 additions & 5 deletions js/explore/view/ElevationPointControllerNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@

import Multilink from '../../../../axon/js/Multilink.js';
import { Shape } from '../../../../kite/js/imports.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import BackgroundNode from '../../../../scenery-phet/js/BackgroundNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Path } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Node, Path, Text } from '../../../../scenery/js/imports.js';
import NLIConstants from '../../common/NLIConstants.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';

// constants
const IMAGE_DILATION = 20;
Expand Down
15 changes: 6 additions & 9 deletions js/explore/view/ElevationSceneView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,19 @@
*/

import Vector2 from '../../../../dot/js/Vector2.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Image } from '../../../../scenery/js/imports.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import birdInAir_png from '../../../../number-line-common/images/birdInAir_png.js';
import birdInWater_png from '../../../../number-line-common/images/birdInWater_png.js';
import elevationBackground_png from '../../../images/elevationBackground_png.js';
import fishInAir_png from '../../../../number-line-common/images/fishInAir_png.js';
import fishInWater_png from '../../../../number-line-common/images/fishInWater_png.js';
import girlInAir_png from '../../../images/girlInAir_png.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Image, Node, Rectangle, Text } from '../../../../scenery/js/imports.js';
import elevationBackground_png from '../../../images/elevationBackground_png.js';
import girlHiking_png from '../../../images/girlHiking_png.js';
import girlInAir_png from '../../../images/girlInAir_png.js';
import girlInWater_png from '../../../images/girlInWater_png.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import ElevationPointControllerNode from './ElevationPointControllerNode.js';
import SceneView from './SceneView.js';

Expand Down
10 changes: 4 additions & 6 deletions js/explore/view/TemperaturePointControllerNode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@
import Multilink from '../../../../axon/js/Multilink.js';
import StringProperty from '../../../../axon/js/StringProperty.js';
import Range from '../../../../dot/js/Range.js';
import ColorizedReadoutNode from '../../../../number-line-common/js/common/view/ColorizedReadoutNode.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import merge from '../../../../phet-core/js/merge.js';
import StringUtils from '../../../../phetcommon/js/util/StringUtils.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import TemperatureAndColorSensorNode from '../../../../scenery-phet/js/TemperatureAndColorSensorNode.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import { Color, Node, Text } from '../../../../scenery/js/imports.js';
import NLIConstants from '../../common/NLIConstants.js';
import ColorizedReadoutNode from '../../../../number-line-common/js/common/view/ColorizedReadoutNode.js';
import PointControllerNode from '../../../../number-line-common/js/common/view/PointControllerNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';

// constants
const TOUCH_DILATION = 5;
Expand Down
11 changes: 4 additions & 7 deletions js/explore/view/TemperatureSceneView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,17 @@
* @author Arnab Purkayastha
*/

import Property from '../../../../axon/js/Property.js';
import Multilink from '../../../../axon/js/Multilink.js';
import Property from '../../../../axon/js/Property.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import ColorizedReadoutNode from '../../../../number-line-common/js/common/view/ColorizedReadoutNode.js';
import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
import { Node } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { RichText } from '../../../../scenery/js/imports.js';
import { Text } from '../../../../scenery/js/imports.js';
import { Node, Rectangle, RichText, Text } from '../../../../scenery/js/imports.js';
import Panel from '../../../../sun/js/Panel.js';
import VerticalAquaRadioButtonGroup from '../../../../sun/js/VerticalAquaRadioButtonGroup.js';
import NLIConstants from '../../common/NLIConstants.js';
import ColorizedReadoutNode from '../../../../number-line-common/js/common/view/ColorizedReadoutNode.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import numberLineIntegersStrings from '../../numberLineIntegersStrings.js';
import TemperatureSceneModel from '../model/TemperatureSceneModel.js';
import MonthsComboBox from './MonthsComboBox.js';
import SceneView from './SceneView.js';
Expand Down
10 changes: 4 additions & 6 deletions js/explore/view/sceneIconFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@

import NumberProperty from '../../../../axon/js/NumberProperty.js';
import Dimension2 from '../../../../dot/js/Dimension2.js';
import ThermometerNode from '../../../../scenery-phet/js/ThermometerNode.js';
import { Image } from '../../../../scenery/js/imports.js';
import { Rectangle } from '../../../../scenery/js/imports.js';
import { Color } from '../../../../scenery/js/imports.js';
import birdInAir_png from '../../../../number-line-common/images/birdInAir_png.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import NLIScene from '../model/NLIScene.js';
import PiggyBankDecoration from '../../../../number-line-common/js/explore/model/PiggyBankDecoration.js';
import PiggyBankNode from '../../../../number-line-common/js/explore/view/PiggyBankNode.js';
import ThermometerNode from '../../../../scenery-phet/js/ThermometerNode.js';
import { Color, Image, Rectangle } from '../../../../scenery/js/imports.js';
import numberLineIntegers from '../../numberLineIntegers.js';
import NLIScene from '../model/NLIScene.js';

// constants
const ICON_SIZE = new Dimension2( 38, 38 );
Expand Down
4 changes: 2 additions & 2 deletions js/generic/model/NLIGenericModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import Property from '../../../../axon/js/Property.js';
import Bounds2 from '../../../../dot/js/Bounds2.js';
import Range from '../../../../dot/js/Range.js';
import Vector2 from '../../../../dot/js/Vector2.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import PointController from '../../../../number-line-common/js/common/model/PointController.js';
import SpatializedNumberLine from '../../../../number-line-common/js/common/model/SpatializedNumberLine.js';
import Orientation from '../../../../phet-core/js/Orientation.js';
import { Color } from '../../../../scenery/js/imports.js';
import NLIConstants from '../../common/NLIConstants.js';
import numberLineIntegers from '../../numberLineIntegers.js';

Expand Down
Loading

0 comments on commit 8e5dabb

Please sign in to comment.