Clean up super calls in swarm.

Remove redundant super calls and move all other super calls to the end
of the initializer list, as required by Dart 2.

Change-Id: I2b0968b9c6508d00a3379c225470d5d9c0ec9f78
Reviewed-on: https://dart-review.googlesource.com/69967
Reviewed-by: Stephen Adams <sra@google.com>
Commit-Queue: Stephen Adams <sra@google.com>

samples-dev/swarm/SwarmApp.dart

@@ -23,9 +23,7 @@ class Swarm extends App {
   /** Observable UI state. */
   SwarmState state;
 
-  Swarm({bool useCannedData: false})
-      : super(),
-        onLoadFired = false {
+  Swarm({bool useCannedData: false}) : onLoadFired = false {
     Sections.initializeFromUrl(useCannedData, (currSections) {
       sections = currSections;
       state = new SwarmState(sections);

samples-dev/swarm/SwarmState.dart

@@ -54,8 +54,7 @@ class SwarmState extends UIState {
   BiIterator<Section> _sectionIterator;
 
   SwarmState(this._dataModel)
-      : super(),
-        currentArticle = new ObservableValue<Article>(null),
+      : currentArticle = new ObservableValue<Article>(null),
         selectedArticle = new ObservableValue<Article>(null),
         storyMaximized = new ObservableValue<bool>(false),
         storyTextMode = new ObservableValue<bool>(true) {

samples-dev/swarm/SwarmViews.dart

@@ -55,8 +55,7 @@ class FrontView extends CompositeView {
   final Set previousPageKeyPresses;
 
   FrontView(this.swarm)
-      : super('front-view fullpage'),
-        downKeyPresses = new Set.from([74 /*j*/, 40 /*down*/]),
+      : downKeyPresses = new Set.from([74 /*j*/, 40 /*down*/]),
         upKeyPresses = new Set.from([75 /*k*/, 38 /*up*/]),
         rightKeyPresses = new Set.from([39 /*right*/, 68 /*d*/, 76 /*l*/]),
         leftKeyPresses = new Set.from([37 /*left*/, 65 /*a*/, 72 /*h*/]),
@@ -64,7 +63,8 @@ class FrontView extends CompositeView {
         backKeyPresses = new Set.from([8 /*delete*/, 27 /*escape*/]),
         nextPageKeyPresses = new Set.from([78 /*n*/]),
         previousPageKeyPresses = new Set.from([80 /*p*/]),
-        nextPrevShown = false {
+        nextPrevShown = false,
+        super('front-view fullpage') {
     topView = new CompositeView('top-view', false, false, false);
 
     headerView = new HeaderView(swarm);
@@ -324,7 +324,7 @@ void _backToMain(SwarmState state) {
 class SwarmBackButton extends View {
   Swarm swarm;
 
-  SwarmBackButton(this.swarm) : super();
+  SwarmBackButton(this.swarm);
 
   Element render() => new Element.html('<div class="back-arrow button"></div>');
 
@@ -470,7 +470,7 @@ class HeaderView extends CompositeView {
 // TODO(rnystrom): We have nearly identical versions of this littered through
 // the sample apps. Should consolidate into one.
 class WebBackButton extends View {
-  WebBackButton() : super();
+  WebBackButton();
 
   Element render() {
     return new Element.html('<div class="web-back-button button"></div>');
@@ -493,7 +493,7 @@ class WebBackButton extends View {
 // TODO(rnystrom): We have nearly identical versions of this littered through
 // the sample apps. Should consolidate into one.
 class WebForwardButton extends View {
-  WebForwardButton() : super();
+  WebForwardButton();
 
   Element render() {
     return new Element.html('<div class="web-forward-button button"></div>');
@@ -572,9 +572,7 @@ class ToggleButton extends View {
   EventListeners onChanged;
   List<String> states;
 
-  ToggleButton(this.states)
-      : super(),
-        onChanged = new EventListeners();
+  ToggleButton(this.states) : onChanged = new EventListeners();
 
   Element render() => new Element.tag('button');
 
@@ -711,7 +709,7 @@ class ArticleView extends View {
   final Swarm swarm;
   final ArticleViewLayout articleLayout;
 
-  ArticleView(this.item, this.swarm, this.articleLayout) : super();
+  ArticleView(this.item, this.swarm, this.articleLayout);
 
   Element render() {
     Element node;
@@ -853,7 +851,7 @@ class StoryContentView extends View {
 
   View _pagedStory;
 
-  StoryContentView(this.swarm, this.item) : super();
+  StoryContentView(this.swarm, this.item);
 
   get childViews => [_pagedStory];
 
@@ -906,9 +904,9 @@ class SectionView extends CompositeView {
   final PageState pageState;
 
   SectionView(this.swarm, this.section, this._viewFactory)
-      : super('section-view'),
-        loadingText = new View.html('<div class="loading-section"></div>'),
-        pageState = new PageState() {
+      : loadingText = new View.html('<div class="loading-section"></div>'),
+        pageState = new PageState(),
+        super('section-view') {
     addChild(loadingText);
   }
 

samples-dev/swarm/Views.dart

@@ -51,7 +51,7 @@ class EventListeners {
  * elements.
  */
 class _PlaceholderView extends View {
-  _PlaceholderView() : super() {}
+  _PlaceholderView();
 
   Element render() => new Element.tag('div');
 }
@@ -146,8 +146,7 @@ class GenericListView<D> extends View {
       this._removeClippedViews,
       this._showScrollbar,
       this._pages)
-      : super(),
-        _activeInterval = new Interval(0, 0),
+      : _activeInterval = new Interval(0, 0),
         _itemViews = new Map<int, View>() {
     // TODO(rnystrom): Move this into enterDocument once we have an exitDocument
     // that we can use to unregister it.
@@ -930,7 +929,7 @@ class VariableSizeListView<D> extends GenericListView<D> {
 
 /** A back button that is equivalent to clicking "back" in the browser. */
 class BackButton extends View {
-  BackButton() : super();
+  BackButton();
 
   Element render() => new Element.html('<div class="back-arrow button"></div>');
 
@@ -946,7 +945,7 @@ class PushButtonView extends View {
   final String _cssClass;
   final _clickHandler;
 
-  PushButtonView(this._text, this._cssClass, this._clickHandler) : super();
+  PushButtonView(this._text, this._cssClass, this._clickHandler);
 
   Element render() {
     return new Element.html('<button class="${_cssClass}">${_text}</button>');
@@ -968,7 +967,7 @@ class DialogView extends View {
   Element container;
   PushButtonView _done;
 
-  DialogView(this._title, this._cssName, this._content) : super() {}
+  DialogView(this._title, this._cssName, this._content);
 
   Element render() {
     final node = new Element.html('''

samples-dev/swarm/swarm_ui_lib/layout/GridLayout.dart

@@ -71,14 +71,14 @@ class GridLayout extends ViewLayout {
   Dimension _dimension;
 
   GridLayout(Positionable view)
-      : super(view),
-        rows = _GridTrackParser.parse(view.customStyle['grid-rows']),
+      : rows = _GridTrackParser.parse(view.customStyle['grid-rows']),
         columns = _GridTrackParser.parse(view.customStyle['grid-columns']),
         template = _GridTemplateParser.parse(view.customStyle['grid-template']),
         rowSizing = _GridTrackParser
             .parseTrackSizing(view.customStyle['grid-row-sizing']),
         columnSizing = _GridTrackParser
-            .parseTrackSizing(view.customStyle['grid-column-sizing']) {
+            .parseTrackSizing(view.customStyle['grid-column-sizing']),
+        super(view) {
     _rowTracks = rows != null ? rows.tracks : new List<GridTrack>();
     _columnTracks = columns != null ? columns.tracks : new List<GridTrack>();
   }

samples-dev/swarm/swarm_ui_lib/layout/GridLayoutParser.dart

@@ -330,9 +330,9 @@ class _GridTrackParser extends _Parser {
   final Map<String, int> _lineNames;
 
   _GridTrackParser._internal(String src)
-      : super(src),
-        _tracks = new List<GridTrack>(),
-        _lineNames = new Map<String, int>();
+      : _tracks = new List<GridTrack>(),
+        _lineNames = new Map<String, int>(),
+        super(src);
 
   /** Parses the grid-rows and grid-columns CSS properties into object form. */
   static GridTrackList parse(String str) {

samples-dev/swarm/swarm_ui_lib/layout/SizingFunctions.dart

@@ -41,9 +41,7 @@ class FixedSizing extends SizingFunction {
   // we need to correctly track whether we're content sized during a layout
   bool _contentSized;
 
-  FixedSizing(this.length, [this.units = 'px'])
-      : super(),
-        _contentSized = false {
+  FixedSizing(this.length, [this.units = 'px']) : _contentSized = false {
     if (units != 'px' && units != '%') {
       // TODO(jmesserly): support other unit types
       throw new UnsupportedError('Units other than px and %');
@@ -80,7 +78,7 @@ class FixedSizing extends SizingFunction {
  */
 class FractionSizing extends SizingFunction {
   final num fractionValue;
-  FractionSizing(this.fractionValue) : super() {}
+  FractionSizing(this.fractionValue);
 
   bool get isFraction => true;
 
@@ -88,7 +86,7 @@ class FractionSizing extends SizingFunction {
 }
 
 class MinContentSizing extends SizingFunction {
-  const MinContentSizing() : super();
+  const MinContentSizing();
 
   bool get isMinContentSized => true;
 
@@ -96,7 +94,7 @@ class MinContentSizing extends SizingFunction {
 }
 
 class MaxContentSizing extends SizingFunction {
-  const MaxContentSizing() : super();
+  const MaxContentSizing();
 
   bool get isMaxContentSized {
     return true;

samples-dev/swarm/swarm_ui_lib/observable/observable.dart

@@ -134,8 +134,8 @@ class ObservableList<T> extends AbstractObservable
   List<T> _internal;
 
   ObservableList([Observable parent = null])
-      : super(parent),
-        _internal = new List<T>();
+      : _internal = new List<T>(),
+        super(parent);
 
   T operator [](int index) => _internal[index];
 
@@ -371,8 +371,8 @@ class ObservableList<T> extends AbstractObservable
 /** A wrapper around a single value whose change can be observed. */
 class ObservableValue<T> extends AbstractObservable {
   ObservableValue(T value, [Observable parent = null])
-      : super(parent),
-        _value = value;
+      : _value = value,
+        super(parent);
 
   T get value => _value;
 

samples-dev/swarm/swarm_ui_lib/view/CompositeView.dart

@@ -29,8 +29,7 @@ class CompositeView extends View {
       scrollable = false,
       vertical = false,
       showScrollbar = false])
-      : super(),
-        _nestedContainer = nestedContainer,
+      : _nestedContainer = nestedContainer,
         _scrollable = scrollable,
         _vertical = vertical,
         _showScrollbar = showScrollbar,

samples-dev/swarm/swarm_ui_lib/view/ConveyorView.dart

@@ -26,8 +26,8 @@ class ConveyorView extends CompositeView {
   Timer animationTimer;
 
   ConveyorView()
-      : super('conveyor-view', true),
-        animationTimer = null {}
+      : animationTimer = null,
+        super('conveyor-view', true) {}
 
   Element render() {
     final result = super.render();

samples-dev/swarm/swarm_ui_lib/view/PagedViews.dart

@@ -20,8 +20,8 @@ class PagedContentView extends CompositeView {
   final PageState pages;
 
   PagedContentView(this.content)
-      : super('paged-content'),
-        pages = new PageState() {
+      : pages = new PageState(),
+        super('paged-content') {
     addChild(new PagedColumnView(pages, content));
     addChild(new PageNumberView(pages));
   }
@@ -33,7 +33,7 @@ class PageNumberView extends View {
   Element _label;
   Element _left, _right;
 
-  PageNumberView(this.pages) : super();
+  PageNumberView(this.pages);
 
   Element render() {
     // TODO(jmesserly): this was supposed to use the somewhat flatter unicode
@@ -95,7 +95,7 @@ class PagedColumnView extends View {
   int _viewportSize;
   Scroller scroller;
 
-  PagedColumnView(this.pages, this.contentView) : super();
+  PagedColumnView(this.pages, this.contentView);
 
   Element render() {
     final node = new Element.html('''

samples-dev/swarm/swarm_ui_lib/view/SliderMenu.dart

@@ -30,7 +30,7 @@ class SliderMenu extends View {
 
   List<String> _menuItems;
 
-  SliderMenu(this._menuItems, this.onSelect) : super() {}
+  SliderMenu(this._menuItems, this.onSelect);
 
   Element render() {
     // Create a div for each menu item.

samples-dev/swarm/test/swarm_ui_lib/view/view_test.dart

@@ -210,9 +210,7 @@ class TestView extends View {
   Function exitDocumentFn;
   List<View> childViews;
 
-  TestView()
-      : super(),
-        childViews = [] {
+  TestView() : childViews = [] {
     // Default behavior.
     renderFn = () => new Element.html('<div class="test"></div>');
     afterRenderFn = (node) {};