Reapply "Make Comparable generic."

utils/template/source.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // TODO(jimhug): This should be an interface to work better with tools.
 /**
  * Represents a file of source code.
  */
-class SourceFile implements Comparable {
+class SourceFile implements Comparable<SourceFile> {
   // TODO(terry): This filename for in memory buffer.  May need to rework if
   //              filename is used for more than informational.
   static String IN_MEMORY_FILE = '<buffer>';
 
   /** The name of the file. */
   final String filename;
 
   /** The text content of the file. */
   String _text;
 
@@ skipping 105 matching lines @@
   }
 }
 
 
 /**
  * A range of characters in a [SourceFile].  Used to represent the source
  * positions of [Token]s and [Node]s for error reporting or other tooling
  * work.
  */
  // TODO(jmesserly): Rename to Span - but first write cool refactoring tool
-class SourceSpan implements Comparable {
+class SourceSpan implements Comparable<SourceSpan> {
   /** The [SourceFile] that contains this span. */
   final SourceFile file;
 
   /** The character position of the start of this span. */
   final int start;
 
   /** The character position of the end of this span. */
   final int end;
 
   SourceSpan(this.file, this.start, this.end);
@@ skipping 31 matching lines @@
 
   /** Compares two source spans by file and position. Handles nulls. */
   int compareTo(SourceSpan other) {
     if (file == other.file) {
       int d = start - other.start;
       return d == 0 ? (end - other.end) : d;
     }
     return file.compareTo(other.file);
   }
 }