replace static methods with clone(), #80

phetsims · Feb 24, 2023 · fafd98f · fafd98f
1 parent e983009
commit fafd98f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/js/common/model/Substance.ts b/js/common/model/Substance.ts
@@ -59,17 +59,12 @@ export default class Substance {
   }
 
   /**
-   * Creates a shallow copy of a substance. AXON.Property observers are not copied.
+   * Creates a shallow copy of this Substance. AXON.Property observers are not copied.
+   * @param quantity - optional quantity, to override this.quantityProperty.value
    */
-  public static clone( substance: Substance ): Substance {
-    return new Substance( substance.coefficientProperty.value, substance.symbol, substance.iconProperty.value, substance.quantityProperty.value );
-  }
-
-  /**
-   * Creates a shallow copy of a substance with a specified quantity. AXON.Property observers are not copied.
-   */
-  public static withQuantity( substance: Substance, quantity: number ): Substance {
-    return new Substance( substance.coefficientProperty.value, substance.symbol, substance.iconProperty.value, quantity );
+  public clone( quantity?: number ): Substance {
+    return new Substance( this.coefficientProperty.value, this.symbol, this.iconProperty.value,
+      ( quantity === undefined ) ? this.quantityProperty.value : 0 );
   }
 }
 

diff --git a/js/game/model/GameGuess.js b/js/game/model/GameGuess.js
@@ -19,7 +19,6 @@
  */
 
 import BoxType from '../../common/model/BoxType.js';
-import Substance from '../../common/model/Substance.js';
 import reactantsProductsAndLeftovers from '../../reactantsProductsAndLeftovers.js';
 
 export default class GameGuess {
@@ -35,19 +34,19 @@ export default class GameGuess {
     // @public Clone reactants, quantities are initialized to zero for 'Before' challenges.
     this.reactants = [];
     reaction.reactants.forEach( reactant => {
-      this.reactants.push( ( interactiveBox === BoxType.BEFORE ) ? Substance.withQuantity( reactant, 0 ) : Substance.clone( reactant ) );
+      this.reactants.push( ( interactiveBox === BoxType.BEFORE ) ? reactant.clone( 0 ) : reactant.clone() );
     } );
 
     // @public Clone products, quantities are initialized to zero for 'After' challenges.
     this.products = [];
     reaction.products.forEach( product => {
-      this.products.push( ( interactiveBox === BoxType.AFTER ) ? Substance.withQuantity( product, 0 ) : Substance.clone( product ) );
+      this.products.push( ( interactiveBox === BoxType.AFTER ) ? product.clone( 0 ) : product.clone() );
     } );
 
     // @public Clone leftovers, quantities are initialized to zero for 'After' challenges.
     this.leftovers = [];
     reaction.leftovers.forEach( leftover => {
-      this.leftovers.push( ( interactiveBox === BoxType.AFTER ) ? Substance.withQuantity( leftover, 0 ) : Substance.clone( leftover ) );
+      this.leftovers.push( ( interactiveBox === BoxType.AFTER ) ? leftover.clone( 0 ) : leftover.clone() );
     } );
 
     assert && assert( this.reactants.length === reaction.reactants.length );