rename GeometricOpticsRuler to match associated Node name, #263

phetsims · Dec 7, 2021 · b0e249b · b0e249b
1 parent c53bb4a
commit b0e249b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/js/common/model/GeometricOpticsModel.ts b/js/common/model/GeometricOpticsModel.ts
@@ -19,7 +19,7 @@ import LightRays from './LightRays.js';
 import Optic from './Optic.js';
 import RaysModeEnum, { RaysModeValues } from './RaysModeEnum.js';
 import Representation, { RepresentationStaticInstances } from './Representation.js';
-import Ruler from './GeometricOpticsRuler.js';
+import GeometricOpticsRuler from './GeometricOpticsRuler.js';
 import SecondPoint from './SecondPoint.js';
 import SourceObject from './SourceObject.js';
 import Target from './Target.js';
@@ -60,8 +60,8 @@ class GeometricOpticsModel {
   readonly secondLightRays: LightRays;
 
   // rulers
-  readonly horizontalRuler: Ruler;
-  readonly verticalRuler: Ruler;
+  readonly horizontalRuler: GeometricOpticsRuler;
+  readonly verticalRuler: GeometricOpticsRuler;
 
   /**
    * @param optic
@@ -126,12 +126,12 @@ class GeometricOpticsModel {
       options.barrier
     );
 
-    this.horizontalRuler = new Ruler( 'horizontal',
+    this.horizontalRuler = new GeometricOpticsRuler( 'horizontal',
       GeometricOpticsConstants.HORIZONTAL_RULER_INITIAL_POSITION,
       GeometricOpticsConstants.HORIZONTAL_RULER_LENGTH
     );
 
-    this.verticalRuler = new Ruler( 'vertical',
+    this.verticalRuler = new GeometricOpticsRuler( 'vertical',
       GeometricOpticsConstants.VERTICAL_RULER_INITIAL_POSITION,
       GeometricOpticsConstants.VERTICAL_RULER_LENGTH
     );

diff --git a/js/common/view/GeometricOpticsRulerNode.ts b/js/common/view/GeometricOpticsRulerNode.ts
@@ -24,7 +24,7 @@ import { Node } from '../../../../scenery/js/imports.js';
 import geometricOptics from '../../geometricOptics.js';
 import geometricOpticsStrings from '../../geometricOpticsStrings.js';
 import GeometricOpticsConstants from '../GeometricOpticsConstants.js';
-import Ruler from '../model/GeometricOpticsRuler.js';
+import GeometricOpticsRuler from '../model/GeometricOpticsRuler.js';
 import { SceneryEvent } from '../../../../scenery/js/imports.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 
@@ -33,7 +33,7 @@ const MINIMUM_VISIBLE_LENGTH = GeometricOpticsConstants.RULER_MINIMUM_VISIBLE_LE
 
 class GeometricOpticsRulerNode extends Node {
 
-  private readonly ruler: Ruler;
+  private readonly ruler: GeometricOpticsRuler;
   private toolboxBounds: Bounds2;
   private readonly dragListener: DragListener;
 
@@ -44,7 +44,7 @@ class GeometricOpticsRulerNode extends Node {
    * @param visibleBoundsProperty
    * @param options
    */
-  constructor( ruler: Ruler, zoomTransformProperty: Property<ModelViewTransform2>,
+  constructor( ruler: GeometricOpticsRuler, zoomTransformProperty: Property<ModelViewTransform2>,
                zoomScaleProperty: Property<number>, visibleBoundsProperty: Property<Bounds2>,
                options?: any ) {