use isDisposable:false where appropriate, phetsims/axon#436

js/common/model/DirectFocalLengthModel.ts

@@ -8,7 +8,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import { OpticSurfaceType } from './OpticSurfaceType.js';
 import FocalLengthModel from './FocalLengthModel.js';
 import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
@@ -45,6 +44,7 @@ export default class DirectFocalLengthModel extends PhetioObject implements Foca
     const options = optionize<DirectFocalLengthModelOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false,
       phetioDocumentation: 'Model of focal length that is used when ' +
                            `${GOPreferences.focalLengthModelTypeProperty.tandem.phetioID} ` +
@@ -103,11 +103,6 @@ export default class DirectFocalLengthModel extends PhetioObject implements Foca
   public reset(): void {
     this.resetDirectFocalLengthModel();
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 geometricOptics.register( 'DirectFocalLengthModel', DirectFocalLengthModel );

js/common/model/GOScene.ts

@@ -6,7 +6,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import Range from '../../../../dot/js/Range.js';
 import geometricOptics from '../../geometricOptics.js';
 import Optic from './Optic.js';
@@ -49,6 +48,7 @@ export default abstract class GOScene extends PhetioObject {
     const options = optionize<GOSceneOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -70,11 +70,6 @@ export default abstract class GOScene extends PhetioObject {
     };
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   public reset(): void {
     this.resetGOObjectScene();
   }

js/common/model/IndirectFocalLengthModel.ts

@@ -8,7 +8,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import { OpticSurfaceType } from './OpticSurfaceType.js';
 import FocalLengthModel from './FocalLengthModel.js';
 import RangeWithValue from '../../../../dot/js/RangeWithValue.js';
@@ -51,6 +50,7 @@ export default class IndirectFocalLengthModel extends PhetioObject implements Fo
       indexOfRefractionPropertyFeatured: true,
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false,
       phetioDocumentation: 'Model of focal length that is used when ' +
                            `${GOPreferences.focalLengthModelTypeProperty.tandem.phetioID} ` +
@@ -111,11 +111,6 @@ export default class IndirectFocalLengthModel extends PhetioObject implements Fo
   public reset(): void {
     this.resetIndirectFocalLengthModel();
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 geometricOptics.register( 'IndirectFocalLengthModel', IndirectFocalLengthModel );

js/common/model/LightSpot.ts

@@ -9,7 +9,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import Utils from '../../../../dot/js/Utils.js';
@@ -60,6 +59,7 @@ export default class LightSpot extends PhetioObject {
     const options = optionize<LightSpotOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -124,11 +124,6 @@ export default class LightSpot extends PhetioObject {
         phetioValueType: BooleanIO
       } );
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 /**

js/common/model/Optic.ts

@@ -7,7 +7,6 @@
  * @author Martin Veillette
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import StringUnionProperty from '../../../../axon/js/StringUnionProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
@@ -123,6 +122,7 @@ export default abstract class Optic extends PhetioObject {
       radiusOfCurvaturePropertyFeatured: true,
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -318,11 +318,6 @@ export default abstract class Optic extends PhetioObject {
     this.resetOptic();
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   /**
    * Determines whether the optic is converging for the specified optical surface type.
    */

js/common/model/OpticalImage.ts

@@ -10,7 +10,6 @@
  * @author Martin Veillette
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
@@ -80,6 +79,7 @@ export default class OpticalImage extends PhetioObject {
       magnificationPropertyFeatured: true,
 
       // PhetioObject options
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -185,11 +185,6 @@ export default class OpticalImage extends PhetioObject {
   public reset(): void {
     this.resetOpticalImage();
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 geometricOptics.register( 'OpticalImage', OpticalImage );

js/common/model/OpticalObject.ts

@@ -14,7 +14,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
@@ -63,6 +62,7 @@ export default class OpticalObject extends PhetioObject {
       position: Vector2.ZERO,
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -96,11 +96,6 @@ export default class OpticalObject extends PhetioObject {
     };
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   public reset(): void {
     this.resetOpticalObject();
   }

js/common/model/ProjectionScreen.ts

@@ -8,7 +8,6 @@
  * @author Martin Veillette
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Matrix3 from '../../../../dot/js/Matrix3.js';
@@ -53,6 +52,7 @@ export default class ProjectionScreen extends PhetioObject {
     const options = optionize<ProjectionScreenOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -85,11 +85,6 @@ export default class ProjectionScreen extends PhetioObject {
     };
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   public reset(): void {
     this.resetProjectionScreen();
   }

js/common/model/SecondPoint.ts

@@ -7,7 +7,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js';
 import NumberProperty from '../../../../axon/js/NumberProperty.js';
@@ -46,6 +45,7 @@ export default class SecondPoint extends PhetioObject {
     const options = optionize<SecondPointOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -74,11 +74,6 @@ export default class SecondPoint extends PhetioObject {
     };
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   public reset(): void {
     this.resetSecondPoint();
   }

js/common/model/tools/GOTool.ts

@@ -6,7 +6,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../../axon/js/Disposable.js';
 import BooleanProperty from '../../../../../axon/js/BooleanProperty.js';
 import Property from '../../../../../axon/js/Property.js';
 import Vector2 from '../../../../../dot/js/Vector2.js';
@@ -36,6 +35,7 @@ class GOTool extends PhetioObject {
     const options = optionize<GOToolOptions, SelfOptions, PhetioObjectOptions>()( {
 
       // PhetioObjectOptions
+      isDisposable: false,
       phetioState: false
     }, providedOptions );
 
@@ -58,11 +58,6 @@ class GOTool extends PhetioObject {
     };
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   public reset(): void {
     this.resetGOTool();
   }

js/common/view/CueingArrowsNode.ts

@@ -6,7 +6,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import geometricOptics from '../../geometricOptics.js';
 import { NodeTranslationOptions, Path, PathOptions } from '../../../../scenery/js/imports.js';
 import ArrowShape from '../../../../scenery-phet/js/ArrowShape.js';
@@ -43,7 +42,8 @@ export default class CueingArrowsNode extends Path {
 
       // PathOptions
       fill: 'rgb( 0, 200, 0 )',
-      stroke: 'black'
+      stroke: 'black',
+      isDisposable: false
 
     }, providedOptions );
 
@@ -61,11 +61,6 @@ export default class CueingArrowsNode extends Path {
     this.shape = createArrowsShape( direction, this.length );
   }
 
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
-
   /**
    * Common method of creating the visibleProperty for cueing arrows when they are associated with a draggable Node.
    * @param inputEnabledProperty - is input enabled for the associated Node?

js/common/view/FocalLengthControl.ts

@@ -7,7 +7,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import NumberControl, { NumberControlOptions } from '../../../../scenery-phet/js/NumberControl.js';
 import geometricOptics from '../../geometricOptics.js';
 import GeometricOpticsStrings from '../../GeometricOpticsStrings.js';
@@ -59,18 +58,14 @@ export default class FocalLengthControl extends NumberControl {
           keyboardStep: GOConstants.FOCAL_LENGTH_KEYBOARD_STEP, // used by all alternative-input devices
           shiftKeyboardStep: GOConstants.FOCAL_LENGTH_SHIFT_KEYBOARD_STEP, // finer grain, used by keyboard only
           pageKeyboardStep: GOConstants.FOCAL_LENGTH_PAGE_KEYBOARD_STEP
-        }
+        },
+        isDisposable: false
       }, providedOptions );
 
     super( titleStringProperty, focalLengthMagnitudeProperty, range, options );
 
     this.addLinkedElement( focalLengthMagnitudeProperty );
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 geometricOptics.register( 'FocalLengthControl', FocalLengthControl );

js/common/view/FocalPointNode.ts

@@ -7,7 +7,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Disposable from '../../../../axon/js/Disposable.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
 import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
@@ -31,7 +30,8 @@ export default class FocalPointNode extends Node {
 
       // NodeOptions
       children: [ FocalPointNode.createIcon() ],
-      phetioVisiblePropertyInstrumented: false
+      phetioVisiblePropertyInstrumented: false,
+      isDisposable: false
     }, providedOptions );
 
     super( options );
@@ -58,11 +58,6 @@ export default class FocalPointNode extends Node {
       children: [ circleNode, centerPointNode ]
     } );
   }
-
-  public override dispose(): void {
-    Disposable.assertNotDisposable();
-    super.dispose();
-  }
 }
 
 geometricOptics.register( 'FocalPointNode', FocalPointNode );