New analyzer snapshot.

editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java

Index: editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java
diff --git a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java
index 94f6db602b18092cde7fe84dd018351a7f14ecbd..a58f58a9a69bb483212294518e432186c8f7d6b1 100644
--- a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java
+++ b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/processor/CollectionSemanticProcessor.java
@@ -90,14 +90,14 @@ public class CollectionSemanticProcessor extends SemanticProcessor {
             node.getArgumentList().getArguments().clear();
             return null;
           }
-          // new HashMap(Map) -> new Map.from(Map)
+          // new HashMap(Map) -> new HashMap.from(Map)
           if (isMethodInClass2(methodBinding, "<init>(java.util.Map)", "java.util.HashMap")) {
             node.getConstructorName().setName(identifier("from"));
             return null;
           }
-          // new HashMap(5) -> new Map()
+          // new HashMap(5) -> new HashMap()
           if (JavaUtils.getQualifiedName(declaringClass).equals("java.util.HashMap")) {
-            ((SimpleIdentifier) node.getConstructorName().getType().getName()).setToken(token("Map"));
+            ((SimpleIdentifier) node.getConstructorName().getType().getName()).setToken(token("HashMap"));
             node.getArgumentList().getArguments().clear();
             return null;
           }
@@ -305,7 +305,7 @@ public class CollectionSemanticProcessor extends SemanticProcessor {
             return null;
           }
           if ("HashMap".equals(name)) {
-            nameNode.setToken(token("Map"));
+            nameNode.setToken(token("HashMap"));
             return null;
           }
           if (JavaUtils.isTypeNamed(binding, "java.util.Map.Entry")) {