re-order constructors (#47)

Author: devoncarew

lib/device/device.dart

@@ -14,14 +14,6 @@ import '../ui/elements.dart';
 // TODO(devoncarew): set toggle values on a full restart (when we see a new isolate)
 
 class DeviceScreen extends Screen {
-  StatusItem deviceStatus;
-
-  SetStateMixin framesChartStateMixin = new SetStateMixin();
-  ExtensionTracker extensionTracker;
-
-  CoreElement togglesDiv;
-  Map<String, bool> boolValues = <String, bool>{};
-
   DeviceScreen()
       : super(
             name: 'Device', id: 'device', iconClass: 'octicon-device-mobile') {
@@ -34,6 +26,14 @@ class DeviceScreen extends Screen {
     addStatusItem(deviceStatus);
   }
 
+  StatusItem deviceStatus;
+
+  SetStateMixin framesChartStateMixin = new SetStateMixin();
+  ExtensionTracker extensionTracker;
+
+  CoreElement togglesDiv;
+  Map<String, bool> boolValues = <String, bool>{};
+
   @override
   void createContent(Framework framework, CoreElement mainDiv) {
     mainDiv.add(<CoreElement>[
@@ -129,14 +129,6 @@ class DeviceScreen extends Screen {
 }
 
 class ExtensionTracker {
-  final StreamController<Null> _changeController =
-      new StreamController<Null>.broadcast();
-
-  VmService service;
-
-  Map<String, Set<IsolateRef>> extensionToIsolatesMap =
-      <String, Set<IsolateRef>>{};
-
   ExtensionTracker(this.service) {
     service.onIsolateEvent.listen((Event e) {
       if (e.kind == 'ServiceExtensionAdded') {
@@ -149,6 +141,14 @@ class ExtensionTracker {
     serviceInfo.isolateManager.onIsolateExited.listen(_removeIsolate);
   }
 
+  final StreamController<Null> _changeController =
+      new StreamController<Null>.broadcast();
+
+  VmService service;
+
+  Map<String, Set<IsolateRef>> extensionToIsolatesMap =
+      <String, Set<IsolateRef>>{};
+
   bool get hasConnection => service != null;
 
   Stream<Null> get onChange => _changeController.stream;

lib/framework/framework.dart

@@ -16,11 +16,6 @@ import '../ui/primer.dart';
 import '../utils.dart';
 
 class Framework {
-  final List<Screen> screens = <Screen>[];
-  Screen current;
-  StatusLine globalStatus;
-  StatusLine pageStatus;
-
   Framework() {
     window.onPopState.listen(handlePopState);
     globalStatus =
@@ -29,6 +24,12 @@ class Framework {
         new StatusLine(new CoreElement.from(querySelector('#page-status')));
   }
 
+  final List<Screen> screens = <Screen>[];
+
+  Screen current;
+  StatusLine globalStatus;
+  StatusLine pageStatus;
+
   void addScreen(Screen screen) {
     screens.add(screen);
   }
@@ -181,11 +182,11 @@ class Framework {
 }
 
 class StatusLine {
+  StatusLine(this.element);
+
   final CoreElement element;
   final List<StatusItem> _items = <StatusItem>[];
 
-  StatusLine(this.element);
-
   void add(StatusItem item) {
     _items.add(item);
 
@@ -231,6 +232,12 @@ void toast(String message) {
 }
 
 abstract class Screen {
+  Screen({
+    @required this.name,
+    @required this.id,
+    this.iconClass,
+  });
+
   final String name;
   final String id;
   final String iconClass;
@@ -241,12 +248,6 @@ abstract class Screen {
 
   final List<StatusItem> statusItems = <StatusItem>[];
 
-  Screen({
-    @required this.name,
-    @required this.id,
-    this.iconClass,
-  });
-
   String get ref => id == '/' ? id : '/$id';
 
   bool get visible => _visible.value;
@@ -289,17 +290,17 @@ class SetStateMixin {
 }
 
 class HelpInfo {
-  final String title;
-  final String url;
-
   HelpInfo({
     @required this.title,
     @required this.url,
   });
+
+  final String title;
+  final String url;
 }
 
 class StatusItem {
-  final CoreElement element;
-
   StatusItem() : element = span();
+
+  final CoreElement element;
 }

lib/logging/logging.dart

@@ -27,10 +27,6 @@ const int kMaxLogItemsUpperBound = 5500;
 DateFormat timeFormat = new DateFormat('HH:mm:ss.SSS');
 
 class LoggingScreen extends Screen {
-  Table<LogData> loggingTable;
-  StatusItem logCountStatus;
-  SetStateMixin loggingStateMixin = new SetStateMixin();
-
   LoggingScreen()
       : super(name: 'Logs', id: 'logs', iconClass: 'octicon-clippy') {
     logCountStatus = new StatusItem();
@@ -44,6 +40,10 @@ class LoggingScreen extends Screen {
     serviceInfo.onConnectionClosed.listen(_handleConnectionStop);
   }
 
+  Table<LogData> loggingTable;
+  StatusItem logCountStatus;
+  SetStateMixin loggingStateMixin = new SetStateMixin();
+
   @override
   void createContent(Framework framework, CoreElement mainDiv) {
     this.framework = framework;
@@ -324,15 +324,15 @@ class LoggingScreen extends Screen {
 /// we wait for up to 1ms when we get the `foo` event, to see if the next event
 /// is a single newline. If so, we add the newline to the previous log message.
 class _StdoutEventHandler {
+  _StdoutEventHandler(this.loggingScreen, this.name, {this.isError = false});
+
   final LoggingScreen loggingScreen;
   final String name;
   final bool isError;
 
   LogData buffer;
   Timer timer;
 
-  _StdoutEventHandler(this.loggingScreen, this.name, {this.isError = false});
-
   void handle(Event e) {
     final String message = decodeBase64(e.bytes);
 
@@ -409,15 +409,6 @@ String _valueAsString(InstanceRef ref) {
 /// data is calculated, the log entry will be modified to contain the calculated
 /// `details` data.
 class LogData {
-  final String kind;
-  final int timestamp;
-  final bool isError;
-  final String summary;
-  final String summaryHtml;
-
-  String _details;
-  Future<String> detailsComputer;
-
   LogData(
     this.kind,
     this._details,
@@ -428,6 +419,15 @@ class LogData {
     this.detailsComputer,
   });
 
+  final String kind;
+  final int timestamp;
+  final bool isError;
+  final String summary;
+  final String summaryHtml;
+
+  String _details;
+  Future<String> detailsComputer;
+
   String get details => _details;
 
   bool get needsComputing => detailsComputer != null;
@@ -523,13 +523,6 @@ String getCssClassForEventKind(LogData item) {
 }
 
 class LogDetailsUI extends CoreElement {
-  static const JsonEncoder jsonEncoder = JsonEncoder.withIndent('  ');
-
-  LogData data;
-
-  CoreElement content;
-  CoreElement message;
-
   LogDetailsUI() : super('div') {
     layoutVertical();
 
@@ -539,6 +532,13 @@ class LogDetailsUI extends CoreElement {
     ]);
   }
 
+  static const JsonEncoder jsonEncoder = JsonEncoder.withIndent('  ');
+
+  LogData data;
+
+  CoreElement content;
+  CoreElement message;
+
   void setData(LogData data) {
     // Reset the vertical scroll value if any.
     content.element.scrollTop = 0;

lib/performance/performance.dart

@@ -16,18 +16,6 @@ import '../ui/primer.dart';
 import '../utils.dart';
 
 class PerformanceScreen extends Screen {
-  StatusItem sampleCountStatus;
-  StatusItem sampleFreqStatus;
-
-  PButton loadSnapshotButton;
-  PButton resetButton;
-  CoreElement progressElement;
-  Table<PerfData> perfTable;
-
-  CpuChart cpuChart;
-  SetStateMixin cpuChartStateMixin = new SetStateMixin();
-  CpuTracker cpuTracker;
-
   PerformanceScreen()
       : super(
             name: 'Performance',
@@ -40,6 +28,18 @@ class PerformanceScreen extends Screen {
     addStatusItem(sampleFreqStatus);
   }
 
+  StatusItem sampleCountStatus;
+  StatusItem sampleFreqStatus;
+
+  PButton loadSnapshotButton;
+  PButton resetButton;
+  CoreElement progressElement;
+  Table<PerfData> perfTable;
+
+  CpuChart cpuChart;
+  SetStateMixin cpuChartStateMixin = new SetStateMixin();
+  CpuTracker cpuTracker;
+
   @override
   void createContent(Framework framework, CoreElement mainDiv) {
     mainDiv.add(<CoreElement>[
@@ -250,6 +250,8 @@ class CpuChart extends LineChart<CpuTracker> {
 }
 
 class CpuTracker {
+  CpuTracker(this.service);
+
   static const Duration kMaxGraphTime = Duration(minutes: 1);
   static const Duration kUpdateDelay = Duration(seconds: 1);
 
@@ -259,8 +261,6 @@ class CpuTracker {
       new StreamController<Null>.broadcast();
   List<int> samples = <int>[];
 
-  CpuTracker(this.service);
-
   bool get hasConnection => service != null;
 
   Stream<Null> get onChange => _changeController.stream;
@@ -299,13 +299,13 @@ class CpuTracker {
 }
 
 class PerfData {
+  PerfData(this.kind, this.name, this.self, this.inclusive);
+
   final String kind;
   final String name;
   final double self;
   final double inclusive;
 
-  PerfData(this.kind, this.name, this.self, this.inclusive);
-
   @override
   String toString() => '[$kind] $name';
 }
@@ -352,10 +352,10 @@ class PerfColumnMethodName extends Column<PerfData> {
 }
 
 class _CalcProfile {
-  final CpuProfile profile;
-
   _CalcProfile(this.profile);
 
+  final CpuProfile profile;
+
   Future<void> calc() async {
     // TODO:
     //profile.exclusiveCodeTrie;

lib/timeline/timeline.dart

@@ -258,12 +258,6 @@ class TimelineScreen extends Screen {
 }
 
 class TimelineFramesUI extends CoreElement {
-  TimelineFrameUI selectedFrame;
-  TimelineData timelineData;
-
-  final StreamController<TimelineFrame> _selectedFrameController =
-      new StreamController<TimelineFrame>.broadcast();
-
   TimelineFramesUI(TimelineFramesBuilder timelineFramesBuilder)
       : super('div', classes: 'timeline-frames') {
     timelineFramesBuilder.onFrameAdded.listen((TimelineFrame frame) {
@@ -283,6 +277,12 @@ class TimelineFramesUI extends CoreElement {
     });
   }
 
+  TimelineFrameUI selectedFrame;
+  TimelineData timelineData;
+
+  final StreamController<TimelineFrame> _selectedFrameController =
+      new StreamController<TimelineFrame>.broadcast();
+
   bool hasStarted() => timelineData != null;
 
   Stream<TimelineFrame> get onSelectedFrame => _selectedFrameController.stream;
@@ -303,9 +303,6 @@ class TimelineFramesUI extends CoreElement {
 }
 
 class TimelineFrameUI extends CoreElement {
-  final TimelineFramesUI framesUI;
-  final TimelineFrame frame;
-
   TimelineFrameUI(this.framesUI, this.frame)
       : super('div', classes: 'timeline-frame') {
     add(<CoreElement>[
@@ -348,6 +345,9 @@ class TimelineFrameUI extends CoreElement {
     });
   }
 
+  final TimelineFramesUI framesUI;
+  final TimelineFrame frame;
+
   void setSelected(bool selected) {
     toggleClass('selected', selected);
   }
@@ -464,10 +464,6 @@ class TimelineFramesBuilder {
 }
 
 class FrameDetailsUI extends CoreElement {
-  TimelineFrameData data;
-
-  CoreElement content;
-
   FrameDetailsUI() : super('div') {
     layoutVertical();
     flex();
@@ -490,6 +486,9 @@ class FrameDetailsUI extends CoreElement {
     content.element.style.overflow = 'scroll';
   }
 
+  TimelineFrameData data;
+  CoreElement content;
+
   void updateData(TimelineFrameData data) {
     this.data = data;