use isDisposable: false instead of overridden dispose methods, phet…

…sims/axon#436
phetsims · Jul 10, 2023 · 8295f4f · 8295f4f
1 parent 8147cc9
commit 8295f4f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 23 deletions.
diff --git a/js/view/BatteryReverseButton.ts b/js/view/BatteryReverseButton.ts
@@ -73,14 +73,11 @@ export default class BatteryReverseButton extends CCKCRoundPushButton {
         else {
           assert && assert( false, 'selected circuit element should have been a battery' );
         }
-      }
+      },
+      isDisposable: false
     }, providedOptions );
     super( options );
   }
-
-  public override dispose(): void {
-    assert && assert( false, 'should not be disposed' );
-  }
 }
 
 circuitConstructionKitCommon.register( 'BatteryReverseButton', BatteryReverseButton );
diff --git a/js/view/CCKCTrashButton.ts b/js/view/CCKCTrashButton.ts
@@ -43,13 +43,10 @@ export default class CCKCTrashButton extends CCKCRoundPushButton {
           }
         }
       },
+      isDisposable: false,
       tandem: tandem
     }, providedOptions ) );
   }
-
-  public override dispose(): void {
-    assert && assert( false, 'should not be disposed' );
-  }
 }
 
 circuitConstructionKitCommon.register( 'CCKCTrashButton', CCKCTrashButton );
diff --git a/js/view/CircuitElementNumberControl.ts b/js/view/CircuitElementNumberControl.ts
@@ -73,6 +73,7 @@ export default class CircuitElementNumberControl extends HBox {
         trackSize: new Dimension2( 120, 4 )
       },
       tandem: Tandem.OPT_OUT,
+      isDisposable: false,
       getAdditionalVisibilityProperties: ( c: CircuitElement ) => {return [];}
     }, providedOptions );
     const numberControl = new NumberControl( title, valueProperty, range, options );
@@ -99,10 +100,6 @@ export default class CircuitElementNumberControl extends HBox {
       }
     } );
   }
-
-  public override dispose(): void {
-    assert && assert( false, 'Should not be disposed' );
-  }
 }
 
 circuitConstructionKitCommon.register( 'CircuitElementNumberControl', CircuitElementNumberControl );
diff --git a/js/view/ClearDynamicsButton.ts b/js/view/ClearDynamicsButton.ts
@@ -56,7 +56,8 @@ export default class ClearDynamicsButton extends CCKCRoundPushButton {
         if ( dynamicCircuitElement instanceof DynamicCircuitElement ) {
           dynamicCircuitElement.clear();
         }
-      }
+      },
+      isDisposable: false
     }, providedOptions );
 
     super( options );
@@ -72,10 +73,6 @@ export default class ClearDynamicsButton extends CCKCRoundPushButton {
       newCircuitElement instanceof DynamicCircuitElement && newCircuitElement.isClearableProperty.link( isClearableListener );
     } );
   }
-
-  public override dispose(): void {
-    assert && assert( false, 'should not be disposed' );
-  }
 }
 
 circuitConstructionKitCommon.register( 'ClearDynamicsButton', ClearDynamicsButton );
diff --git a/js/view/FuseRepairButton.ts b/js/view/FuseRepairButton.ts
@@ -51,7 +51,8 @@ export default class FuseRepairButton extends CCKCRoundPushButton {
           fuse.resetFuse();
           circuit.componentEditedEmitter.emit();
         }
-      }
+      },
+      isDisposable: false
     }, providedOptions );
 
     super( options );
@@ -65,10 +66,6 @@ export default class FuseRepairButton extends CCKCRoundPushButton {
       newCircuitElement instanceof Fuse && newCircuitElement.isTrippedProperty.link( isTrippedListener );
     } );
   }
-
-  public override dispose(): void {
-    assert && assert( false, 'should not be disposed' );
-  }
 }
 
 circuitConstructionKitCommon.register( 'FuseRepairButton', FuseRepairButton );