Bug fixes and clean-up

pkg/analyzer/lib/src/task/general.dart

Index: pkg/analyzer/lib/src/task/general.dart
diff --git a/pkg/analyzer/lib/src/task/general.dart b/pkg/analyzer/lib/src/task/general.dart
index 8f883278ae176726cfcb1827e70f7c4495a54005..69a808ee386bb7f1a377e5617f286c72f5284764 100644
--- a/pkg/analyzer/lib/src/task/general.dart
+++ b/pkg/analyzer/lib/src/task/general.dart
@@ -5,10 +5,10 @@
 library analyzer.src.task.general;
 
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisTask;
+import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/task/general.dart';
 import 'package:analyzer/task/model.dart';
-import 'package:analyzer/src/generated/java_engine.dart';
 
 /**
  * A task that gets the contents of the source associated with an analysis
@@ -18,7 +18,7 @@ class GetContentTask extends SourceBasedAnalysisTask {
   /**
    * The task descriptor describing this kind of task.
    */
-  static final TaskDescriptor DESCRIPTOR = new TaskDescriptor('GET_CONTENT',
+  static final TaskDescriptor DESCRIPTOR = new TaskDescriptor('GetContentTask',
       createTask, buildInputs, <ResultDescriptor>[CONTENT, MODIFICATION_TIME]);
 
   /**