From e8cafd9d7124bf2698d10f21ddb038463d38ddf9 Mon Sep 17 00:00:00 2001 From: Hixie Date: Tue, 2 Jun 2015 13:55:20 -0700 Subject: [PATCH] Rename rendering/render_*.dart to rendering/*.dart R=eseidel@chromium.org Review URL: https://codereview.chromium.org/1166773003 --- examples/raw/ink_well.dart | 4 ++-- examples/raw/render_paragraph.dart | 8 ++++---- examples/raw/sector_layout.dart | 4 ++-- examples/raw/touch_demo.dart | 4 ++-- sdk/BUILD.gn | 10 +++++----- sdk/lib/framework/app.dart | 4 ++-- sdk/lib/framework/components2/icon_button.dart | 1 + sdk/lib/framework/components2/scaffold.dart | 4 ++-- sdk/lib/framework/fn2.dart | 10 +++++----- .../rendering/{render_block.dart => block.dart} | 4 ++-- .../framework/rendering/{render_box.dart => box.dart} | 2 +- .../rendering/{render_flex.dart => flex.dart} | 4 ++-- .../rendering/{render_node.dart => node.dart} | 0 .../{render_paragraph.dart => paragraph.dart} | 4 ++-- tests/raw/render_box.dart | 2 +- tests/raw/render_flex.dart | 6 +++--- tests/resources/display_list.dart | 4 ++-- 17 files changed, 38 insertions(+), 37 deletions(-) rename sdk/lib/framework/rendering/{render_block.dart => block.dart} (98%) rename sdk/lib/framework/rendering/{render_box.dart => box.dart} (99%) rename sdk/lib/framework/rendering/{render_flex.dart => flex.dart} (98%) rename sdk/lib/framework/rendering/{render_node.dart => node.dart} (100%) rename sdk/lib/framework/rendering/{render_paragraph.dart => paragraph.dart} (97%) diff --git a/examples/raw/ink_well.dart b/examples/raw/ink_well.dart index ebdee701b9..d2ff9f8228 100644 --- a/examples/raw/ink_well.dart +++ b/examples/raw/ink_well.dart @@ -4,8 +4,8 @@ import 'dart:sky' as sky; import 'package:sky/framework/app.dart'; -import 'package:sky/framework/rendering/render_box.dart'; -import 'package:sky/framework/rendering/render_node.dart'; +import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/rendering/node.dart'; import 'package:sky/framework/animation/animated_value.dart'; import 'package:sky/framework/animation/curves.dart'; diff --git a/examples/raw/render_paragraph.dart b/examples/raw/render_paragraph.dart index 519ce32a72..24cb1d596c 100644 --- a/examples/raw/render_paragraph.dart +++ b/examples/raw/render_paragraph.dart @@ -4,10 +4,10 @@ import 'dart:sky'; import 'package:sky/framework/app.dart'; -import 'package:sky/framework/rendering/render_box.dart'; -import 'package:sky/framework/rendering/render_node.dart'; -import 'package:sky/framework/rendering/render_flex.dart'; -import 'package:sky/framework/rendering/render_paragraph.dart'; +import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/rendering/node.dart'; +import 'package:sky/framework/rendering/flex.dart'; +import 'package:sky/framework/rendering/paragraph.dart'; class RenderSolidColor extends RenderDecoratedBox { final Size desiredSize; diff --git a/examples/raw/sector_layout.dart b/examples/raw/sector_layout.dart index 9e998a3897..968c4f5d51 100644 --- a/examples/raw/sector_layout.dart +++ b/examples/raw/sector_layout.dart @@ -5,8 +5,8 @@ import 'dart:math' as math; import 'dart:sky' as sky; import 'package:sky/framework/app.dart'; -import 'package:sky/framework/rendering/render_box.dart'; -import 'package:sky/framework/rendering/render_node.dart'; +import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/rendering/node.dart'; const double kTwoPi = 2 * math.PI; diff --git a/examples/raw/touch_demo.dart b/examples/raw/touch_demo.dart index 1eac7fa103..f4c5659404 100644 --- a/examples/raw/touch_demo.dart +++ b/examples/raw/touch_demo.dart @@ -5,8 +5,8 @@ import 'dart:math'; import 'dart:sky'; import 'package:sky/framework/app.dart'; -import 'package:sky/framework/rendering/render_box.dart'; -import 'package:sky/framework/rendering/render_node.dart'; +import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/rendering/node.dart'; // Material design colors. :p List colors = [ diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index a0de9f5013..760a1b2dac 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -96,11 +96,11 @@ dart_pkg("sdk") { "lib/framework/net/image_cache.dart", "lib/framework/node.dart", "lib/framework/reflect.dart", - "lib/framework/rendering/render_block.dart", - "lib/framework/rendering/render_box.dart", - "lib/framework/rendering/render_flex.dart", - "lib/framework/rendering/render_node.dart", - "lib/framework/rendering/render_paragraph.dart", + "lib/framework/rendering/block.dart", + "lib/framework/rendering/box.dart", + "lib/framework/rendering/flex.dart", + "lib/framework/rendering/node.dart", + "lib/framework/rendering/paragraph.dart", "lib/framework/scheduler.dart", "lib/framework/shell.dart", "lib/framework/theme/colors.dart", diff --git a/sdk/lib/framework/app.dart b/sdk/lib/framework/app.dart index 89b5fed768..62b76d838b 100644 --- a/sdk/lib/framework/app.dart +++ b/sdk/lib/framework/app.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'rendering/render_box.dart'; -import 'rendering/render_node.dart'; +import 'rendering/box.dart'; +import 'rendering/node.dart'; import 'scheduler.dart' as scheduler; class AppView { diff --git a/sdk/lib/framework/components2/icon_button.dart b/sdk/lib/framework/components2/icon_button.dart index 8eab14a609..765f75bf80 100644 --- a/sdk/lib/framework/components2/icon_button.dart +++ b/sdk/lib/framework/components2/icon_button.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import '../fn2.dart'; +import '../rendering/box.dart'; import 'icon.dart'; class IconButton extends Component { diff --git a/sdk/lib/framework/components2/scaffold.dart b/sdk/lib/framework/components2/scaffold.dart index 79b641b65b..b1f992cad8 100644 --- a/sdk/lib/framework/components2/scaffold.dart +++ b/sdk/lib/framework/components2/scaffold.dart @@ -5,8 +5,8 @@ import '../fn2.dart'; import '../theme/typography.dart' as typography; import 'dart:sky' as sky; -import '../rendering/render_box.dart'; -import '../rendering/render_node.dart'; +import '../rendering/box.dart'; +import '../rendering/node.dart'; // RenderNode class RenderScaffold extends RenderBox { diff --git a/sdk/lib/framework/fn2.dart b/sdk/lib/framework/fn2.dart index 9a4538bcae..e4fbb47c70 100644 --- a/sdk/lib/framework/fn2.dart +++ b/sdk/lib/framework/fn2.dart @@ -10,11 +10,11 @@ import 'dart:mirrors'; import 'dart:sky' as sky; import 'reflect.dart' as reflect; import 'app.dart'; -import 'rendering/render_block.dart'; -import 'rendering/render_box.dart'; -import 'rendering/render_flex.dart'; -import 'rendering/render_node.dart'; -import 'rendering/render_paragraph.dart'; +import 'rendering/block.dart'; +import 'rendering/box.dart'; +import 'rendering/flex.dart'; +import 'rendering/node.dart'; +import 'rendering/paragraph.dart'; // final sky.Tracing _tracing = sky.window.tracing; diff --git a/sdk/lib/framework/rendering/render_block.dart b/sdk/lib/framework/rendering/block.dart similarity index 98% rename from sdk/lib/framework/rendering/render_block.dart rename to sdk/lib/framework/rendering/block.dart index 065e2110fd..8bc53939b5 100644 --- a/sdk/lib/framework/rendering/render_block.dart +++ b/sdk/lib/framework/rendering/block.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'render_box.dart'; -import 'render_node.dart'; +import 'box.dart'; +import 'node.dart'; class BlockParentData extends BoxParentData with ContainerParentDataMixin { } diff --git a/sdk/lib/framework/rendering/render_box.dart b/sdk/lib/framework/rendering/box.dart similarity index 99% rename from sdk/lib/framework/rendering/render_box.dart rename to sdk/lib/framework/rendering/box.dart index dc081e1a15..57ad99cb9c 100644 --- a/sdk/lib/framework/rendering/render_box.dart +++ b/sdk/lib/framework/rendering/box.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'render_node.dart'; +import 'node.dart'; import 'dart:sky' as sky; // GENERIC BOX RENDERING diff --git a/sdk/lib/framework/rendering/render_flex.dart b/sdk/lib/framework/rendering/flex.dart similarity index 98% rename from sdk/lib/framework/rendering/render_flex.dart rename to sdk/lib/framework/rendering/flex.dart index 5ef24fdf98..385c0cb7e4 100644 --- a/sdk/lib/framework/rendering/render_flex.dart +++ b/sdk/lib/framework/rendering/flex.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'render_box.dart'; -import 'render_node.dart'; +import 'box.dart'; +import 'node.dart'; class FlexBoxParentData extends BoxParentData with ContainerParentDataMixin { int flex; diff --git a/sdk/lib/framework/rendering/render_node.dart b/sdk/lib/framework/rendering/node.dart similarity index 100% rename from sdk/lib/framework/rendering/render_node.dart rename to sdk/lib/framework/rendering/node.dart diff --git a/sdk/lib/framework/rendering/render_paragraph.dart b/sdk/lib/framework/rendering/paragraph.dart similarity index 97% rename from sdk/lib/framework/rendering/render_paragraph.dart rename to sdk/lib/framework/rendering/paragraph.dart index 6580f84c7e..da95ce43e1 100644 --- a/sdk/lib/framework/rendering/render_paragraph.dart +++ b/sdk/lib/framework/rendering/paragraph.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'render_box.dart'; -import 'render_node.dart'; +import 'box.dart'; +import 'node.dart'; class RenderInline extends RenderNode { String data; diff --git a/tests/raw/render_box.dart b/tests/raw/render_box.dart index c2a068531c..bf44896174 100644 --- a/tests/raw/render_box.dart +++ b/tests/raw/render_box.dart @@ -6,7 +6,7 @@ import '../resources/third_party/unittest/unittest.dart'; import '../resources/unit.dart'; import '../resources/display_list.dart'; import 'dart:sky' as sky; -import 'package:sky/framework/rendering/render_box.dart'; +import 'package:sky/framework/rendering/box.dart'; void main() { initUnit(); diff --git a/tests/raw/render_flex.dart b/tests/raw/render_flex.dart index 5a019fe8c4..60d0cb82cb 100644 --- a/tests/raw/render_flex.dart +++ b/tests/raw/render_flex.dart @@ -7,9 +7,9 @@ import '../resources/unit.dart'; import '../resources/display_list.dart'; import 'dart:sky' as sky; import 'package:sky/framework/app.dart'; -import 'package:sky/framework/rendering/render_block.dart'; -import 'package:sky/framework/rendering/render_box.dart'; -import 'package:sky/framework/rendering/render_flex.dart'; +import 'package:sky/framework/rendering/block.dart'; +import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/rendering/flex.dart'; class RenderSolidColor extends RenderDecoratedBox { final sky.Size desiredSize; diff --git a/tests/resources/display_list.dart b/tests/resources/display_list.dart index 3f4ae2b24c..070af593c9 100644 --- a/tests/resources/display_list.dart +++ b/tests/resources/display_list.dart @@ -1,6 +1,6 @@ -import 'package:sky/framework/rendering/render_node.dart'; -import 'package:sky/framework/rendering/render_box.dart'; +import 'package:sky/framework/rendering/node.dart'; +import 'package:sky/framework/rendering/box.dart'; import 'dart:sky' as sky; typedef void Logger (String s); -- GitLab