diff options
author | Artur Signell <artur@vaadin.com> | 2016-08-26 11:36:24 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-26 18:08:07 +0000 |
commit | 13b99cfa265913ab8cb2d948f2ab2bf152a959e4 (patch) | |
tree | b4268a68c0703839f10b559972f7e9a7be8fb9b7 | |
parent | 44cb252e45650c1a4686d7d695af99b04a284084 (diff) | |
download | vaadin-framework-13b99cfa265913ab8cb2d948f2ab2bf152a959e4.tar.gz vaadin-framework-13b99cfa265913ab8cb2d948f2ab2bf152a959e4.zip |
Move remaining Vaadin 7 classes to the compatibility package
Change-Id: I3be37350a638028d89fb527a3dfb09e74fdebeed
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java (renamed from server/src/main/java/com/vaadin/v7/data/Buffered.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java (renamed from server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/Property.java (renamed from server/src/main/java/com/vaadin/v7/data/Property.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java (renamed from server/src/main/java/com/vaadin/v7/data/Validatable.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java (renamed from server/src/main/java/com/vaadin/v7/data/Validator.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java (renamed from server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java (renamed from server/src/main/java/com/vaadin/v7/data/util/ListSet.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java (renamed from server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java (renamed from server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java (renamed from server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java (renamed from server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java (renamed from server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java (renamed from server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java (renamed from server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java (renamed from server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java (renamed from server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java (renamed from server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java) | 0 | ||||
-rw-r--r-- | compatibility-server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java (renamed from server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java) | 0 | ||||
-rw-r--r-- | server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java | 9 |
19 files changed, 5 insertions, 4 deletions
diff --git a/server/src/main/java/com/vaadin/v7/data/Buffered.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java index 025a43fbba..025a43fbba 100644 --- a/server/src/main/java/com/vaadin/v7/data/Buffered.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java diff --git a/server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java index ea0b3c0ebd..ea0b3c0ebd 100644 --- a/server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java diff --git a/server/src/main/java/com/vaadin/v7/data/Property.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java index 21129a64f9..21129a64f9 100644 --- a/server/src/main/java/com/vaadin/v7/data/Property.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java diff --git a/server/src/main/java/com/vaadin/v7/data/Validatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java index 5c75d594ba..5c75d594ba 100644 --- a/server/src/main/java/com/vaadin/v7/data/Validatable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java diff --git a/server/src/main/java/com/vaadin/v7/data/Validator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java index a6ad0331ed..a6ad0331ed 100644 --- a/server/src/main/java/com/vaadin/v7/data/Validator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java index 33d22777ad..33d22777ad 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/ListSet.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java index 2fd182238d..2fd182238d 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/ListSet.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java index 86fb0ae40d..86fb0ae40d 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java index dfffb5b189..dfffb5b189 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java index 38bf7300aa..38bf7300aa 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java index 7bbf6253a5..7bbf6253a5 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java index cd9f6c36c7..cd9f6c36c7 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java index c95f97a1f1..c95f97a1f1 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java index ce5bed8968..ce5bed8968 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java index 21afa4bc92..21afa4bc92 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java index 71c562d425..71c562d425 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java index 854f3666ac..854f3666ac 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java diff --git a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java index 775018642a..775018642a 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java index 3d6a6136dc..9ffc861373 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java @@ -1,5 +1,7 @@ package com.vaadin.tests.server.component.button; +import java.util.concurrent.atomic.AtomicInteger; + import org.junit.Assert; import org.junit.Test; @@ -7,7 +9,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.data.util.ObjectProperty; import com.vaadin.ui.UI; /** @@ -19,17 +20,17 @@ public class ButtonClickTest { @Test public void clickDetachedButton() { Button b = new Button(); - final ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0); + AtomicInteger counter = new AtomicInteger(0); b.addClickListener(new ClickListener() { @Override public void buttonClick(ClickEvent event) { - counter.setValue(counter.getValue() + 1); + counter.incrementAndGet(); } }); b.click(); - Assert.assertEquals(Integer.valueOf(1), counter.getValue()); + Assert.assertEquals(1, counter.get()); } @Test |