From 7a679e20b23b0e55f7be2acee70603a1a14abeda Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Fri, 27 Mar 2015 15:44:43 -0700
Subject: [PATCH] refactor

---
 lib/coverage.dart      | 12 +++---------
 lib/src/formatter.dart |  6 +++++-
 lib/src/hitmap.dart    |  9 +++++++--
 lib/src/resolver.dart  | 12 +++++++++---
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/lib/coverage.dart b/lib/coverage.dart
index 8fe01765..f18cfc1b 100644
--- a/lib/coverage.dart
+++ b/lib/coverage.dart
@@ -1,11 +1,5 @@
 library coverage;
 
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'package:path/path.dart';
-import 'dart:isolate';
-
-part 'src/formatter.dart';
-part 'src/hitmap.dart';
-part 'src/resolver.dart';
+export 'src/hitmap.dart';
+export 'src/formatter.dart';
+export 'src/resolver.dart';
diff --git a/lib/src/formatter.dart b/lib/src/formatter.dart
index ca027e96..58bd8fdb 100644
--- a/lib/src/formatter.dart
+++ b/lib/src/formatter.dart
@@ -1,4 +1,8 @@
-part of coverage;
+library coverage.formatter;
+
+import 'dart:async';
+
+import 'resolver.dart';
 
 abstract class Formatter {
   Future<String> format(Map json);
diff --git a/lib/src/hitmap.dart b/lib/src/hitmap.dart
index 04adc0bd..904ff9c1 100644
--- a/lib/src/hitmap.dart
+++ b/lib/src/hitmap.dart
@@ -1,4 +1,9 @@
-part of coverage;
+library coverage.hitmap;
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:isolate';
 
 /// Creates a single hitmap from a raw json object. Throws away all entries that
 /// are not resolvable.
@@ -72,7 +77,7 @@ Future<Map> parseCoverage(List<File> files, int workers) {
   })).then((_) => globalHitmap);
 }
 
-Future<Map> _spawnWorker(name, files) {
+Future<Map> _spawnWorker(String name, List files) {
   RawReceivePort port = new RawReceivePort();
   var completer = new Completer();
   port.handler = ((Map hitmap) {
diff --git a/lib/src/resolver.dart b/lib/src/resolver.dart
index e118118d..ba42871e 100644
--- a/lib/src/resolver.dart
+++ b/lib/src/resolver.dart
@@ -1,4 +1,10 @@
-part of coverage;
+library coverage.resolver;
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
 
 /// [Resolver] resolves imports with respect to a given environment.
 class Resolver {
@@ -52,7 +58,7 @@ class Resolver {
       return resolveSymbolicLinks('$pkgRoot/$path');
     }
     if (uri.startsWith(FILE_PREFIX)) {
-      return resolveSymbolicLinks(fromUri(Uri.parse(uri)));
+      return resolveSymbolicLinks(p.fromUri(Uri.parse(uri)));
     }
     if (uri.startsWith(HTTP_PREFIX)) {
       return uri;
@@ -63,7 +69,7 @@ class Resolver {
   }
 
   String resolveSymbolicLinks(String path) {
-    return new File(normalize(path)).resolveSymbolicLinksSync();
+    return new File(p.normalize(path)).resolveSymbolicLinksSync();
   }
 }