From bde2470ed6eab0ddd691ea9edd9bc8fb67e04e9d Mon Sep 17 00:00:00 2001 From: Hixie Date: Wed, 27 May 2015 09:13:37 -0700 Subject: [PATCH] [Effen] Point the stocks2 and components2 files at the forked libraries. R=abarth@chromium.org Review URL: https://codereview.chromium.org/1153223003 --- examples/stocks2/lib/stock_app.dart | 26 +++++++++---------- examples/stocks2/lib/stock_list.dart | 4 +-- examples/stocks2/lib/stock_menu.dart | 8 +++--- examples/stocks2/lib/stock_row.dart | 6 ++--- .../components2/animated_component.dart | 2 +- sdk/lib/framework/components2/button.dart | 2 +- .../framework/components2/button_base.dart | 2 +- sdk/lib/framework/components2/checkbox.dart | 4 +-- sdk/lib/framework/components2/drawer.dart | 2 +- .../framework/components2/drawer_header.dart | 4 +-- .../components2/fixed_height_scrollable.dart | 2 +- .../components2/floating_action_button.dart | 2 +- sdk/lib/framework/components2/icon.dart | 2 +- .../framework/components2/icon_button.dart | 2 +- sdk/lib/framework/components2/ink_splash.dart | 4 +-- sdk/lib/framework/components2/ink_well.dart | 4 +-- sdk/lib/framework/components2/input.dart | 4 +-- sdk/lib/framework/components2/material.dart | 2 +- .../framework/components2/menu_divider.dart | 2 +- sdk/lib/framework/components2/menu_item.dart | 4 +-- .../framework/components2/modal_overlay.dart | 2 +- sdk/lib/framework/components2/popup_menu.dart | 2 +- .../components2/popup_menu_item.dart | 2 +- sdk/lib/framework/components2/radio.dart | 2 +- sdk/lib/framework/components2/scaffold.dart | 6 ++--- sdk/lib/framework/components2/scrollable.dart | 2 +- sdk/lib/framework/components2/tool_bar.dart | 4 +-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/examples/stocks2/lib/stock_app.dart b/examples/stocks2/lib/stock_app.dart index 9678b82e456..3855af940f5 100644 --- a/examples/stocks2/lib/stock_app.dart +++ b/examples/stocks2/lib/stock_app.dart @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// import 'package:sky/framework/components/tool_bar.dart'; -// import 'package:sky/framework/components/drawer.dart'; -// import 'package:sky/framework/components/drawer_header.dart'; -// import 'package:sky/framework/components/floating_action_button.dart'; -// import 'package:sky/framework/components/icon.dart'; -// import 'package:sky/framework/components/icon_button.dart'; -// import 'package:sky/framework/components/input.dart'; -// import 'package:sky/framework/components/menu_divider.dart'; -// import 'package:sky/framework/components/menu_item.dart'; -// import 'package:sky/framework/components/modal_overlay.dart'; -// import 'package:sky/framework/components/popup_menu.dart'; -// import 'package:sky/framework/components/radio.dart'; -// import 'package:sky/framework/components/scaffold.dart'; +// import 'package:sky/framework/components2/tool_bar.dart'; +// import 'package:sky/framework/components2/drawer.dart'; +// import 'package:sky/framework/components2/drawer_header.dart'; +// import 'package:sky/framework/components2/floating_action_button.dart'; +// import 'package:sky/framework/components2/icon.dart'; +// import 'package:sky/framework/components2/icon_button.dart'; +// import 'package:sky/framework/components2/input.dart'; +// import 'package:sky/framework/components2/menu_divider.dart'; +// import 'package:sky/framework/components2/menu_item.dart'; +// import 'package:sky/framework/components2/modal_overlay.dart'; +// import 'package:sky/framework/components2/popup_menu.dart'; +// import 'package:sky/framework/components2/radio.dart'; +// import 'package:sky/framework/components2/scaffold.dart'; import 'package:sky/framework/fn2.dart'; import 'package:sky/framework/theme/typography.dart' as typography; import 'package:sky/framework/theme/colors.dart'; diff --git a/examples/stocks2/lib/stock_list.dart b/examples/stocks2/lib/stock_list.dart index c0fbe44ee07..b7644e99646 100644 --- a/examples/stocks2/lib/stock_list.dart +++ b/examples/stocks2/lib/stock_list.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/framework/components/fixed_height_scrollable.dart'; -import 'package:sky/framework/fn.dart'; +import 'package:sky/framework/components2/fixed_height_scrollable.dart'; +import 'package:sky/framework/fn2.dart'; import 'stock_data.dart'; import 'stock_row.dart'; diff --git a/examples/stocks2/lib/stock_menu.dart b/examples/stocks2/lib/stock_menu.dart index 33d19831685..ed022fefa2e 100644 --- a/examples/stocks2/lib/stock_menu.dart +++ b/examples/stocks2/lib/stock_menu.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/framework/fn.dart'; -import 'package:sky/framework/layout.dart'; -import 'package:sky/framework/components/popup_menu.dart'; -import 'package:sky/framework/components/checkbox.dart'; +import 'package:sky/framework/fn2.dart'; +import 'package:sky/framework/layout2.dart'; +import 'package:sky/framework/components2/popup_menu.dart'; +import 'package:sky/framework/components2/checkbox.dart'; import 'package:sky/framework/theme/view_configuration.dart'; class StockMenu extends Component { diff --git a/examples/stocks2/lib/stock_row.dart b/examples/stocks2/lib/stock_row.dart index a0ef8bcf297..a6faa3ea445 100644 --- a/examples/stocks2/lib/stock_row.dart +++ b/examples/stocks2/lib/stock_row.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/framework/components/ink_well.dart'; -import 'package:sky/framework/fn.dart'; -import 'package:sky/framework/layout.dart'; +import 'package:sky/framework/components2/ink_well.dart'; +import 'package:sky/framework/fn2.dart'; +import 'package:sky/framework/layout2.dart'; import 'package:sky/framework/theme/typography.dart' as typography; import 'stock_arrow.dart'; import 'stock_data.dart'; diff --git a/sdk/lib/framework/components2/animated_component.dart b/sdk/lib/framework/components2/animated_component.dart index 34d906f2a0e..79aabef0e08 100644 --- a/sdk/lib/framework/components2/animated_component.dart +++ b/sdk/lib/framework/components2/animated_component.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import '../animation/animated_value.dart'; -import '../fn.dart'; +import '../fn2.dart'; import 'dart:mirrors'; abstract class AnimatedComponent extends Component { diff --git a/sdk/lib/framework/components2/button.dart b/sdk/lib/framework/components2/button.dart index e4e5f2d56ce..3b2fd5f1311 100644 --- a/sdk/lib/framework/components2/button.dart +++ b/sdk/lib/framework/components2/button.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 '../fn.dart'; +import '../fn2.dart'; import 'ink_well.dart'; import 'material.dart'; diff --git a/sdk/lib/framework/components2/button_base.dart b/sdk/lib/framework/components2/button_base.dart index df9e2c336c4..ca00617d4d8 100644 --- a/sdk/lib/framework/components2/button_base.dart +++ b/sdk/lib/framework/components2/button_base.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 '../fn.dart'; +import '../fn2.dart'; abstract class ButtonBase extends Component { bool highlight = false; diff --git a/sdk/lib/framework/components2/checkbox.dart b/sdk/lib/framework/components2/checkbox.dart index 1924f5cd6b9..85e593b84cb 100644 --- a/sdk/lib/framework/components2/checkbox.dart +++ b/sdk/lib/framework/components2/checkbox.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import 'button_base.dart'; import 'dart:sky' as sky; diff --git a/sdk/lib/framework/components2/drawer.dart b/sdk/lib/framework/components2/drawer.dart index 5959bab73c4..0a348c5b09c 100644 --- a/sdk/lib/framework/components2/drawer.dart +++ b/sdk/lib/framework/components2/drawer.dart @@ -5,7 +5,7 @@ import 'animated_component.dart'; import '../animation/animated_value.dart'; import '../animation/curves.dart'; -import '../fn.dart'; +import '../fn2.dart'; import '../theme/colors.dart'; import 'dart:math' as math; import 'dart:sky' as sky; diff --git a/sdk/lib/framework/components2/drawer_header.dart b/sdk/lib/framework/components2/drawer_header.dart index ba3aae6d95e..7709047f1d5 100644 --- a/sdk/lib/framework/components2/drawer_header.dart +++ b/sdk/lib/framework/components2/drawer_header.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import '../theme/colors.dart'; import '../theme/view_configuration.dart'; diff --git a/sdk/lib/framework/components2/fixed_height_scrollable.dart b/sdk/lib/framework/components2/fixed_height_scrollable.dart index e54ebafa2a9..b73692ced2b 100644 --- a/sdk/lib/framework/components2/fixed_height_scrollable.dart +++ b/sdk/lib/framework/components2/fixed_height_scrollable.dart @@ -4,7 +4,7 @@ import '../animation/scroll_behavior.dart'; import '../debug/tracing.dart'; -import '../fn.dart'; +import '../fn2.dart'; import 'dart:math' as math; import 'dart:async'; import 'scrollable.dart'; diff --git a/sdk/lib/framework/components2/floating_action_button.dart b/sdk/lib/framework/components2/floating_action_button.dart index b16190f5a73..711ae188705 100644 --- a/sdk/lib/framework/components2/floating_action_button.dart +++ b/sdk/lib/framework/components2/floating_action_button.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 '../fn.dart'; +import '../fn2.dart'; import '../theme/colors.dart'; import 'ink_well.dart'; import 'material.dart'; diff --git a/sdk/lib/framework/components2/icon.dart b/sdk/lib/framework/components2/icon.dart index 28eab6f513d..460ad8a7333 100644 --- a/sdk/lib/framework/components2/icon.dart +++ b/sdk/lib/framework/components2/icon.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 '../fn.dart'; +import '../fn2.dart'; // TODO(eseidel): This should use package:. const String kAssetBase = '/packages/sky/assets/material-design-icons'; diff --git a/sdk/lib/framework/components2/icon_button.dart b/sdk/lib/framework/components2/icon_button.dart index 7ed8d390204..8eab14a609d 100644 --- a/sdk/lib/framework/components2/icon_button.dart +++ b/sdk/lib/framework/components2/icon_button.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 '../fn.dart'; +import '../fn2.dart'; import 'icon.dart'; class IconButton extends Component { diff --git a/sdk/lib/framework/components2/ink_splash.dart b/sdk/lib/framework/components2/ink_splash.dart index 3bd18e1dfb2..652d45823d5 100644 --- a/sdk/lib/framework/components2/ink_splash.dart +++ b/sdk/lib/framework/components2/ink_splash.dart @@ -4,11 +4,11 @@ import '../animation/animated_value.dart'; import '../animation/curves.dart'; -import '../fn.dart'; +import '../fn2.dart'; import '../theme/view_configuration.dart' as config; import 'dart:async'; import 'dart:math' as math; -import '../layout.dart'; +import '../layout2.dart'; const double _kSplashConfirmedDuration = 350.0; const double _kSplashUnconfirmedDuration = config.kDefaultLongPressTimeout; diff --git a/sdk/lib/framework/components2/ink_well.dart b/sdk/lib/framework/components2/ink_well.dart index 47d745e029c..1b492633b0f 100644 --- a/sdk/lib/framework/components2/ink_well.dart +++ b/sdk/lib/framework/components2/ink_well.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import 'dart:collection'; import 'dart:sky' as sky; import 'ink_splash.dart'; diff --git a/sdk/lib/framework/components2/input.dart b/sdk/lib/framework/components2/input.dart index 111d582a330..d69e76e17b3 100644 --- a/sdk/lib/framework/components2/input.dart +++ b/sdk/lib/framework/components2/input.dart @@ -5,8 +5,8 @@ import '../editing/editable_string.dart'; import '../editing/editable_text.dart'; import '../editing/keyboard.dart'; -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import '../theme/colors.dart'; import '../theme/typography.dart' as typography; import 'dart:sky' as sky; diff --git a/sdk/lib/framework/components2/material.dart b/sdk/lib/framework/components2/material.dart index 482ffb6b182..6371e29381c 100644 --- a/sdk/lib/framework/components2/material.dart +++ b/sdk/lib/framework/components2/material.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 '../fn.dart'; +import '../fn2.dart'; import '../theme/shadows.dart'; class Material extends Component { diff --git a/sdk/lib/framework/components2/menu_divider.dart b/sdk/lib/framework/components2/menu_divider.dart index bfe4483af2b..de61104432c 100644 --- a/sdk/lib/framework/components2/menu_divider.dart +++ b/sdk/lib/framework/components2/menu_divider.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 '../fn.dart'; +import '../fn2.dart'; class MenuDivider extends Component { static final Style _style = new Style(''' diff --git a/sdk/lib/framework/components2/menu_item.dart b/sdk/lib/framework/components2/menu_item.dart index eb46a07900b..9abae2764c1 100644 --- a/sdk/lib/framework/components2/menu_item.dart +++ b/sdk/lib/framework/components2/menu_item.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import 'button_base.dart'; import 'icon.dart'; import 'ink_well.dart'; diff --git a/sdk/lib/framework/components2/modal_overlay.dart b/sdk/lib/framework/components2/modal_overlay.dart index a5f5089d35a..79c47722b83 100644 --- a/sdk/lib/framework/components2/modal_overlay.dart +++ b/sdk/lib/framework/components2/modal_overlay.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 '../fn.dart'; +import '../fn2.dart'; class ModalOverlay extends Component { static final Style _style = new Style(''' diff --git a/sdk/lib/framework/components2/popup_menu.dart b/sdk/lib/framework/components2/popup_menu.dart index 90e09949620..6ca3c44fb15 100644 --- a/sdk/lib/framework/components2/popup_menu.dart +++ b/sdk/lib/framework/components2/popup_menu.dart @@ -4,7 +4,7 @@ import 'animated_component.dart'; import '../animation/animated_value.dart'; -import '../fn.dart'; +import '../fn2.dart'; import '../theme/colors.dart'; import 'dart:async'; import 'dart:math' as math; diff --git a/sdk/lib/framework/components2/popup_menu_item.dart b/sdk/lib/framework/components2/popup_menu_item.dart index e610be69a1d..8f7076c7be4 100644 --- a/sdk/lib/framework/components2/popup_menu_item.dart +++ b/sdk/lib/framework/components2/popup_menu_item.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 '../fn.dart'; +import '../fn2.dart'; import 'ink_well.dart'; class PopupMenuItem extends Component { diff --git a/sdk/lib/framework/components2/radio.dart b/sdk/lib/framework/components2/radio.dart index 548bfa7e12d..b065dfe87f2 100644 --- a/sdk/lib/framework/components2/radio.dart +++ b/sdk/lib/framework/components2/radio.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 '../fn.dart'; +import '../fn2.dart'; import 'button_base.dart'; import 'ink_well.dart'; diff --git a/sdk/lib/framework/components2/scaffold.dart b/sdk/lib/framework/components2/scaffold.dart index d66e5e00b06..0b4e4ce61f7 100644 --- a/sdk/lib/framework/components2/scaffold.dart +++ b/sdk/lib/framework/components2/scaffold.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import 'drawer.dart'; import 'floating_action_button.dart'; -import 'package:sky/framework/theme/typography.dart' as typography; +import '../theme/typography.dart' as typography; class Scaffold extends Component { static final Style _style = new Style(''' diff --git a/sdk/lib/framework/components2/scrollable.dart b/sdk/lib/framework/components2/scrollable.dart index 3858a25fbf1..1bad1700f85 100644 --- a/sdk/lib/framework/components2/scrollable.dart +++ b/sdk/lib/framework/components2/scrollable.dart @@ -5,7 +5,7 @@ import '../animation/generators.dart'; import '../animation/mechanics.dart'; import '../animation/scroll_behavior.dart'; -import '../fn.dart'; +import '../fn2.dart'; import '../theme/view_configuration.dart' as config; import 'dart:math' as math; import 'dart:sky' as sky; diff --git a/sdk/lib/framework/components2/tool_bar.dart b/sdk/lib/framework/components2/tool_bar.dart index 3e1cf4d329e..283c85c1e45 100644 --- a/sdk/lib/framework/components2/tool_bar.dart +++ b/sdk/lib/framework/components2/tool_bar.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import '../fn.dart'; -import '../layout.dart'; +import '../fn2.dart'; +import '../layout2.dart'; import '../theme/view_configuration.dart'; import 'material.dart';