Rename setCurrentXyz() to setCurrent() (#9029)

4 files changed, 6 insertions, 6 deletions

diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
index b97f987ae3..4bd9cf0cf7 100644
--- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
@@ -49,7 +49,7 @@ public class ConverterFactory extends TestCase {
     }
 
     public void testApplicationConverterFactoryInBackgroundThread() {
-        Application.setCurrentApplication(null);
+        Application.setCurrent(null);
         final Application appWithCustomIntegerConverter = new Application();
         appWithCustomIntegerConverter
                 .setConverterFactory(new ConverterFactory42());
@@ -70,7 +70,7 @@ public class ConverterFactory extends TestCase {
         final Application appWithCustomIntegerConverter = new Application();
         appWithCustomIntegerConverter
                 .setConverterFactory(new ConverterFactory42());
-        Application.setCurrentApplication(appWithCustomIntegerConverter);
+        Application.setCurrent(appWithCustomIntegerConverter);
 
         TextField tf = new TextField("", "123");
         tf.setConverter(Integer.class);
@@ -83,7 +83,7 @@ public class ConverterFactory extends TestCase {
         final Application fieldAppWithCustomIntegerConverter = new Application();
         fieldAppWithCustomIntegerConverter
                 .setConverterFactory(new ConverterFactory42());
-        Application.setCurrentApplication(new Application());
+        Application.setCurrent(new Application());
 
         TextField tf = new TextField("", "123") {
             @Override
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
index 7305e022ee..446228583a 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
@@ -175,7 +175,7 @@ public class AbstractFieldValueConversions extends TestCase {
 
     public void testNumberDoubleConverterChange() {
         final Application a = new Application();
-        Application.setCurrentApplication(a);
+        Application.setCurrent(a);
         TextField tf = new TextField() {
             @Override
             public Application getApplication() {
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
index e39b5d6629..25430fc9a5 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
@@ -27,7 +27,7 @@ public class DefaultConverterFactory extends TestCase {
 
     public void testDefaultNumberConversion() {
         Application app = new Application();
-        Application.setCurrentApplication(app);
+        Application.setCurrent(app);
         TextField tf = new TextField();
         tf.setLocale(new Locale("en", "US"));
         tf.setPropertyDataSource(new MethodProperty<Integer>(paulaBean,
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
index e79bd84741..5ba15cac6c 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
@@ -25,7 +25,7 @@ public class LabelConverters extends TestCase {
     }
 
     public void testIntegerDataSource() {
-        Application.setCurrentApplication(new Application());
+        Application.setCurrent(new Application());
         Label l = new Label("Foo");
         Property ds = new MethodProperty<Integer>(Person.createTestPerson1(),
                 "age");