remove control panel sub directories, move files to /view, see #182

phetsims · Nov 10, 2015 · 30b6e66 · 30b6e66
1 parent a901f36
commit 30b6e66
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/...ew/right-control-panel/BodyMassControl.js → js/common/view/BodyMassControl.js b/...ew/right-control-panel/BodyMassControl.js → js/common/view/BodyMassControl.js
diff --git a/...n/view/bottom-control-panel/DayCounter.js → js/common/view/DayCounter.js b/...n/view/bottom-control-panel/DayCounter.js → js/common/view/DayCounter.js
diff --git a/js/common/view/GravityAndOrbitsCanvas.js b/js/common/view/GravityAndOrbitsCanvas.js
@@ -25,10 +25,10 @@ define( function( require ) {
   var GrabbableVectorNode = require( 'GRAVITY_AND_ORBITS/common/view/GrabbableVectorNode' );
   var Rectangle = require( 'SCENERY/nodes/Rectangle' );
   var ExplosionNode = require( 'GRAVITY_AND_ORBITS/common/view/ExplosionNode' );
-  var DayCounter = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/DayCounter' );
+  var DayCounter = require( 'GRAVITY_AND_ORBITS/common/view/DayCounter' );
   var ScaleSlider = require( 'GRAVITY_AND_ORBITS/common/view/ScaleSlider' );
   var PhetColorScheme = require( 'SCENERY_PHET/PhetColorScheme' );
-  var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/TimeControlPanel' );
+  var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/TimeControlPanel' );
   var MeasuringTape = require( 'SCENERY_PHET/MeasuringTape' );
 
   // strings

diff --git a/js/common/view/GravityAndOrbitsScreenView.js b/js/common/view/GravityAndOrbitsScreenView.js
@@ -13,9 +13,9 @@ define( function( require ) {
   var inherit = require( 'PHET_CORE/inherit' );
   var ScreenView = require( 'JOIST/ScreenView' );
   var ResetAllButton = require( 'SCENERY_PHET/buttons/ResetAllButton' );
-  var RightControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/RightControlPanel' );
-  var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/SpeedRadioButtons' );
-  var MassControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/MassControlPanel' );
+  var RightControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/RightControlPanel' );
+  var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/common/view/SpeedRadioButtons' );
+  var MassControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/MassControlPanel' );
 
   // constants
   var MARGIN = 5;

diff --git a/...ew/right-control-panel/GravityModeMenu.js → js/common/view/GravityModeMenu.js b/...ew/right-control-panel/GravityModeMenu.js → js/common/view/GravityModeMenu.js
diff --git a/...w/right-control-panel/MassControlPanel.js → js/common/view/MassControlPanel.js b/...w/right-control-panel/MassControlPanel.js → js/common/view/MassControlPanel.js
@@ -18,7 +18,7 @@ define( function( require ) {
   var HStrut = require( 'SCENERY/nodes/HStrut' );
   var VBox = require( 'SCENERY/nodes/VBox' );
   var HBox = require( 'SCENERY/nodes/HBox' );
-  var BodyMassControl = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/BodyMassControl' );
+  var BodyMassControl = require( 'GRAVITY_AND_ORBITS/common/view/BodyMassControl' );
   var Text = require( 'SCENERY/nodes/Text' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
 

diff --git a/...iew/right-control-panel/PlanetModeMenu.js → js/common/view/PlanetModeMenu.js b/...iew/right-control-panel/PlanetModeMenu.js → js/common/view/PlanetModeMenu.js
diff --git a/.../right-control-panel/RightControlPanel.js → js/common/view/RightControlPanel.js b/.../right-control-panel/RightControlPanel.js → js/common/view/RightControlPanel.js
@@ -13,9 +13,9 @@ define( function( require ) {
   var Panel = require( 'SUN/Panel' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Rectangle = require( 'SCENERY/nodes/Rectangle' );
-  var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/PlanetModeMenu' );
-  var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/GravityModeMenu' );
-  var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/SpaceObjectsPropertyCheckbox' );
+  var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/PlanetModeMenu' );
+  var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/GravityModeMenu' );
+  var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/SpaceObjectsPropertyCheckbox' );
   var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' );
   var VBox = require( 'SCENERY/nodes/VBox' );
 

diff --git a/...rol-panel/SpaceObjectsPropertyCheckbox.js → ...mmon/view/SpaceObjectsPropertyCheckbox.js b/...rol-panel/SpaceObjectsPropertyCheckbox.js → ...mmon/view/SpaceObjectsPropertyCheckbox.js
diff --git a/...bottom-control-panel/SpeedRadioButtons.js → js/common/view/SpeedRadioButtons.js b/...bottom-control-panel/SpeedRadioButtons.js → js/common/view/SpeedRadioButtons.js
diff --git a/.../bottom-control-panel/TimeControlPanel.js → js/common/view/TimeControlPanel.js b/.../bottom-control-panel/TimeControlPanel.js → js/common/view/TimeControlPanel.js