Rename Javascript -> JavaScript

3 files changed, 15 insertions, 15 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavascriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index 2240fc246b..4de80aaf9d 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavascriptComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
@@ -11,11 +11,11 @@ import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 import com.vaadin.tests.components.AbstractTestRoot;
-import com.vaadin.ui.AbstractJavascriptComponent;
+import com.vaadin.ui.AbstractJavaScriptComponent;
 import com.vaadin.ui.Root;
 
 @LoadScripts({ "/statictestfiles/jsconnector.js" })
-public class BasicJavascriptComponent extends AbstractTestRoot {
+public class BasicJavaScriptComponent extends AbstractTestRoot {
 
     public interface ExampleClickRpc extends ServerRpc {
         public void onClick(String message);
@@ -33,7 +33,7 @@ public class BasicJavascriptComponent extends AbstractTestRoot {
         }
     }
 
-    public static class ExampleWidget extends AbstractJavascriptComponent {
+    public static class ExampleWidget extends AbstractJavaScriptComponent {
         public ExampleWidget() {
             registerRpc(new ExampleClickRpc() {
                 public void onClick(String message) {
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
index 0270f7ed8f..be4675eb2d 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestRoot;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.JavaScript;
-import com.vaadin.ui.JavascriptCallback;
+import com.vaadin.ui.JavaScriptCallback;
 
 public class JavascriptManagerTest extends AbstractTestRoot {
 
@@ -21,7 +21,7 @@ public class JavascriptManagerTest extends AbstractTestRoot {
     protected void setup(WrappedRequest request) {
         addComponent(log);
         JavaScript js = JavaScript.getCurrent();
-        js.addCallback("testing", new JavascriptCallback() {
+        js.addCallback("testing", new JavaScriptCallback() {
             public void call(JSONArray arguments) throws JSONException {
                 log.log("Got " + arguments.length() + " arguments");
                 log.log("Argument 1 as a number: " + arguments.getInt(0));
diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavascriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index 92c134efb0..983520ee93 100644
--- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavascriptExtensionTest.java
+++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
@@ -5,7 +5,7 @@
 package com.vaadin.tests.extensions;
 
 import com.vaadin.annotations.LoadScripts;
-import com.vaadin.terminal.AbstractJavascriptExtension;
+import com.vaadin.terminal.AbstractJavaScriptExtension;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.gwt.client.communication.ClientRpc;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
@@ -16,9 +16,9 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Root;
 
 @LoadScripts({ "/statictestfiles/jsextension.js" })
-public class SimpleJavascriptExtensionTest extends AbstractTestRoot {
+public class SimpleJavaScriptExtensionTest extends AbstractTestRoot {
 
-    public static class SimpleJavascriptExtensionState extends SharedState {
+    public static class SimpleJavaScriptExtensionState extends SharedState {
         private String prefix;
 
         public void setPrefix(String prefix) {
@@ -30,21 +30,21 @@ public class SimpleJavascriptExtensionTest extends AbstractTestRoot {
         }
     }
 
-    public static interface SimpleJavascriptExtensionClientRpc extends
+    public static interface SimpleJavaScriptExtensionClientRpc extends
             ClientRpc {
         public void greet(String message);
     }
 
-    public static interface SimpleJavascriptExtensionServerRpc extends
+    public static interface SimpleJavaScriptExtensionServerRpc extends
             ServerRpc {
         public void greet(String message);
     }
 
     public static class SimpleJavascriptExtension extends
-            AbstractJavascriptExtension {
+            AbstractJavaScriptExtension {
 
         public SimpleJavascriptExtension() {
-            registerRpc(new SimpleJavascriptExtensionServerRpc() {
+            registerRpc(new SimpleJavaScriptExtensionServerRpc() {
                 public void greet(String message) {
                     Root.getCurrentRoot().showNotification(
                             getState().getPrefix() + message);
@@ -53,8 +53,8 @@ public class SimpleJavascriptExtensionTest extends AbstractTestRoot {
         }
 
         @Override
-        public SimpleJavascriptExtensionState getState() {
-            return (SimpleJavascriptExtensionState) super.getState();
+        public SimpleJavaScriptExtensionState getState() {
+            return (SimpleJavaScriptExtensionState) super.getState();
         }
 
         public void setPrefix(String prefix) {
@@ -63,7 +63,7 @@ public class SimpleJavascriptExtensionTest extends AbstractTestRoot {
         }
 
         public void greet(String message) {
-            getRpcProxy(SimpleJavascriptExtensionClientRpc.class)
+            getRpcProxy(SimpleJavaScriptExtensionClientRpc.class)
                     .greet(message);
         }
     }