Add missing dependencies to Benchmarks & fix nits.

Change-Id: Ic237d1b87766c2bb8ba0dd9b5429aa7ed1cc06aa
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/lang/StringBuilderShortStringsBenchmark.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/lang/StringBuilderShortStringsBenchmark.gwt.xml
index 0c62be8..783de88 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/lang/StringBuilderShortStringsBenchmark.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/lang/StringBuilderShortStringsBenchmark.gwt.xml
@@ -14,6 +14,6 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.java.lang.Lang"/>
-  <entry-point class="com.google.gwt.benchmark.benchmarks.java.lang.shared.StringBuilderLongStringsBenchmark.EntryPoint"/>
+  <entry-point class="com.google.gwt.benchmark.benchmarks.java.lang.shared.StringBuilderShortStringsBenchmark.EntryPoint"/>
   <source path="shared" includes="StringBuilderShortStringsBenchmark.java" />
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/util/HashMapStringContainsKeyBenchmark.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/util/HashMapStringContainsKeyBenchmark.gwt.xml
index 71fef71..7c6ea35 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/util/HashMapStringContainsKeyBenchmark.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/java/util/HashMapStringContainsKeyBenchmark.gwt.xml
@@ -14,6 +14,6 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.java.util.Util"/>
-  <source path="shared" includes="HashMapStringGetBenchmark.java"/>
+  <source path="shared" includes="HashMapStringContainsKeyBenchmark.java"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.java.util.shared.HashMapStringContainsKeyBenchmark.EntryPoint"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkGWTD8JavaCollection.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkGWTJavaCollectionD8.gwt.xml
similarity index 100%
rename from benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkGWTD8JavaCollection.gwt.xml
rename to benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkGWTJavaCollectionD8.gwt.xml
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkJS.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkJS.gwt.xml
index 83f945f..fd3f809 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkJS.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/DeltaBlueBenchmarkJS.gwt.xml
@@ -14,6 +14,7 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.octane.Octane"/>
+  <inherits name="com.google.gwt.resources.Resources"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.octane.client.deltablue.js.DeltaBlueJSBenchmark.EntryPoint"/>
   <source path="client" includes="deltablue/js/*.java,deltablue/js/*.js"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/NavierStokesBenchmarkJS.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/NavierStokesBenchmarkJS.gwt.xml
index 677e66c..984c417 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/NavierStokesBenchmarkJS.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/NavierStokesBenchmarkJS.gwt.xml
@@ -14,6 +14,7 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.octane.Octane"/>
+  <inherits name="com.google.gwt.resources.Resources"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.octane.client.navierstokes.js.NavierStokesJsBenchmark.EntryPoint"/>
   <source path="client" includes="navierstokes/js/*.java,navierstokes/js/*.js"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RayTraceBenchmarkJS.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RayTraceBenchmarkJS.gwt.xml
index 28f81a4..c4bfd20 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RayTraceBenchmarkJS.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RayTraceBenchmarkJS.gwt.xml
@@ -14,6 +14,7 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.octane.Octane"/>
+  <inherits name="com.google.gwt.resources.Resources"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.octane.client.raytrace.js.RayTraceJsBenchmark.EntryPoint"/>
   <source path="client" includes="raytrace/js/*.java,raytrace/js/*.js"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RichardsBenchmarkJS.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RichardsBenchmarkJS.gwt.xml
index dacb45a..0254c5f 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RichardsBenchmarkJS.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/RichardsBenchmarkJS.gwt.xml
@@ -14,6 +14,7 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.octane.Octane"/>
+  <inherits name="com.google.gwt.resources.Resources"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.octane.client.richards.js.RichardsJSBenchmark.EntryPoint"/>
   <source path="client" includes="richards/js/*.java,richards/js/*.js"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/SplayBenchmarkJS.gwt.xml b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/SplayBenchmarkJS.gwt.xml
index 0272e9d..09a2345 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/SplayBenchmarkJS.gwt.xml
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/SplayBenchmarkJS.gwt.xml
@@ -14,6 +14,7 @@
 
 <module>
   <inherits name="com.google.gwt.benchmark.benchmarks.octane.Octane"/>
+  <inherits name="com.google.gwt.resources.Resources"/>
   <entry-point class="com.google.gwt.benchmark.benchmarks.octane.client.splay.js.SplayJSBenchmark.EntryPoint"/>
   <source path="client" includes="splay/js/*.java,splay/js/*.js"/>
 </module>
\ No newline at end of file
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/client/splay/gwt/SplayBenchmarkGWT.java b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/client/splay/gwt/SplayBenchmarkGWT.java
index 18e9fb0..306f999 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/client/splay/gwt/SplayBenchmarkGWT.java
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/benchmarks/octane/client/splay/gwt/SplayBenchmarkGWT.java
@@ -15,7 +15,6 @@
  */
 package com.google.gwt.benchmark.benchmarks.octane.client.splay.gwt;
 
-import com.google.gwt.benchmark.benchmarks.octane.client.splay.js.SplayJSBenchmark;
 import com.google.gwt.benchmark.framework.client.AbstractBenchmarkEntryPoint;
 import com.google.gwt.benchmark.framework.shared.AbstractBenchmark;
 
@@ -28,7 +27,7 @@
 
     @Override
     protected AbstractBenchmark getBenchmark() {
-      return new SplayJSBenchmark();
+      return new SplayBenchmarkGWT();
     }
   }
 
diff --git a/benchmarks/src/main/java/com/google/gwt/benchmark/framework/client/Injector.java b/benchmarks/src/main/java/com/google/gwt/benchmark/framework/client/Injector.java
index c63a164..269b929 100644
--- a/benchmarks/src/main/java/com/google/gwt/benchmark/framework/client/Injector.java
+++ b/benchmarks/src/main/java/com/google/gwt/benchmark/framework/client/Injector.java
@@ -57,7 +57,7 @@
     builder.append(js);
     for (int i = 0; i < mappings.length; i++) {
       builder.append(
-          "$wnd." + mappings[0].getGlobalName() + " = " + mappings[0].getLocalName() + ";\n");
+          "$wnd." + mappings[i].getGlobalName() + " = " + mappings[i].getLocalName() + ";\n");
     }
     builder.append("})();");