Node will addInstance for you, phetsims/phet-io#1148

phetsims · Jul 6, 2017 · b68cb56 · b68cb56
1 parent a935490
commit b68cb56
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 29 deletions.
diff --git a/js/common/view/BatteryNode.js b/js/common/view/BatteryNode.js
@@ -23,7 +23,6 @@ define( function( require ) {
   var Text = require( 'SCENERY/nodes/Text' );
   var Vector2 = require( 'DOT/Vector2' );
   var capacitorLabBasics = require( 'CAPACITOR_LAB_BASICS/capacitorLabBasics' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // constants
   var LABEL_FONT = new PhetFont( 12 );
@@ -114,9 +113,10 @@ define( function( require ) {
       }
     } );
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'BatteryNode', BatteryNode );

diff --git a/js/common/view/CapacitorNode.js b/js/common/view/CapacitorNode.js
@@ -18,7 +18,6 @@ define( function( require ) {
   var Bounds2 = require( 'DOT/Bounds2' );
   var capacitorLabBasics = require( 'CAPACITOR_LAB_BASICS/capacitorLabBasics' );
   var Property = require( 'AXON/Property' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   /**
    * Constructor for a CapacitorNode.
@@ -64,9 +63,10 @@ define( function( require ) {
       eFieldNode.setVisible( visible );
     } );
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'CapacitorNode', CapacitorNode );

diff --git a/js/common/view/SwitchNode.js b/js/common/view/SwitchNode.js
@@ -27,7 +27,6 @@ define( function( require ) {
   var ButtonListener = require( 'SCENERY/input/ButtonListener' );
   var Vector2 = require( 'DOT/Vector2' );
   var WireNode = require( 'CAPACITOR_LAB_BASICS/common/view/WireNode' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // Images
   var switchCueArrowImage = require( 'image!CAPACITOR_LAB_BASICS/switch_cue_arrow.png' );
@@ -229,9 +228,10 @@ define( function( require ) {
       }
     } ) );
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'SwitchNode', SwitchNode );

diff --git a/js/common/view/control/VoltmeterToolBoxPanel.js b/js/common/view/control/VoltmeterToolBoxPanel.js
@@ -17,7 +17,6 @@ define( function( require ) {
   var CLBConstants = require( 'CAPACITOR_LAB_BASICS/common/CLBConstants' );
   var capacitorLabBasics = require( 'CAPACITOR_LAB_BASICS/capacitorLabBasics' );
   var Node = require( 'SCENERY/nodes/Node' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   /**
    * @constructor
@@ -78,9 +77,10 @@ define( function( require ) {
       }
     } );
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'VoltmeterToolBoxPanel', VoltmeterToolBoxPanel );

diff --git a/js/common/view/drag/PlateAreaDragHandleNode.js b/js/common/view/drag/PlateAreaDragHandleNode.js
@@ -24,7 +24,6 @@ define( function( require ) {
   var PlateAreaDragHandler = require( 'CAPACITOR_LAB_BASICS/common/view/drag/PlateAreaDragHandler' );
   var UnitsUtils = require( 'CAPACITOR_LAB_BASICS/common/model/util/UnitsUtils' );
   var Vector2 = require( 'DOT/Vector2' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // constants
   // endpoints for a vertical double-headed arrow, this will be rotated to point along the plate's pseudo-3D diagonal
@@ -120,8 +119,10 @@ define( function( require ) {
       self.updateOffset();
     } );
 
-    tandem.addInstance( this, TNode );
-  }
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );  }
 
   capacitorLabBasics.register( 'PlateAreaDragHandleNode', PlateAreaDragHandleNode );
 

diff --git a/js/common/view/drag/PlateSeparationDragHandleNode.js b/js/common/view/drag/PlateSeparationDragHandleNode.js
@@ -22,7 +22,6 @@ define( function( require ) {
   var PlateSeparationDragHandler = require( 'CAPACITOR_LAB_BASICS/common/view/drag/PlateSeparationDragHandler' );
   var UnitsUtils = require( 'CAPACITOR_LAB_BASICS/common/model/util/UnitsUtils' );
   var Vector2 = require( 'DOT/Vector2' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // constants
   // endpoints for vertical double-headed arrow
@@ -113,7 +112,10 @@ define( function( require ) {
       self.updateOffset();
     } );
 
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'PlateSeparationDragHandleNode', PlateSeparationDragHandleNode );

diff --git a/js/common/view/meters/BarMeterNode.js b/js/common/view/meters/BarMeterNode.js
@@ -25,7 +25,6 @@ define( function( require ) {
   var Util = require( 'DOT/Util' );
   var ArrowNode = require( 'SCENERY_PHET/ArrowNode' );
   var capacitorLabBasics = require( 'CAPACITOR_LAB_BASICS/capacitorLabBasics' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // constants
   var BASE_LINE_LENGTH = 25; // Length of vertical line at the origin (left end) of the bar
@@ -104,9 +103,10 @@ define( function( require ) {
 
     this.updateLayout();
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'BarMeterNode', BarMeterNode );

diff --git a/js/common/view/meters/VoltmeterNode.js b/js/common/view/meters/VoltmeterNode.js
@@ -27,7 +27,6 @@ define( function( require ) {
   var Path = require( 'SCENERY/nodes/Path' );
   var Shape = require( 'KITE/Shape' );
   var Text = require( 'SCENERY/nodes/Text' );
-  var TNode = require( 'SCENERY/nodes/TNode' );
 
   // strings
   var voltageString = require( 'string!CAPACITOR_LAB_BASICS/voltage' );
@@ -92,9 +91,10 @@ define( function( require ) {
       } ) );
     }
 
-    // Register with tandem.  No need to handle dispose/removeInstance since this
-    // exists for the lifetime of the simulation.
-    tandem.addInstance( this, TNode );
+    // tandem support
+    this.mutate( {
+      tandem: tandem
+    } );
   }
 
   capacitorLabBasics.register( 'VoltmeterNode', VoltmeterNode );