From 59ae905a8a9bb1a17617070e79400461a8ac466d Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Fri, 11 Nov 2011 13:11:01 +0200
Subject: Eliminate more Field and Property related raw type warnings.

Eliminate some more warnings for use of raw types (Field, Property,
Class), mostly by changing API method return types.
---
 tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java  | 6 +++---
 .../com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/server-side/com/vaadin/data')

diff --git a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java b/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
index d722a9e23b..14e70d76d4 100644
--- a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
@@ -34,8 +34,8 @@ public class PropertyDescriptorTest extends TestCase {
         VaadinPropertyDescriptor<Person> descriptor2 = (VaadinPropertyDescriptor<Person>) new ObjectInputStream(
                 new ByteArrayInputStream(baos.toByteArray())).readObject();
 
-        Property property = descriptor2
-                .createProperty(new Person("John", null));
+        Property<?> property = descriptor2.createProperty(new Person("John",
+                null));
         Assert.assertEquals("John", property.getValue());
     }
 
@@ -49,7 +49,7 @@ public class PropertyDescriptorTest extends TestCase {
         VaadinPropertyDescriptor<Person> pd2 = (VaadinPropertyDescriptor<Person>) new ObjectInputStream(
                 new ByteArrayInputStream(baos.toByteArray())).readObject();
 
-        Property property = pd2.createProperty(new Person("John", null));
+        Property<?> property = pd2.createProperty(new Person("John", null));
         Assert.assertEquals("John", property.getValue());
     }
 }
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index 5faa859b67..da4cfe4522 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
@@ -12,7 +12,7 @@ import com.vaadin.data.util.filter.Between;
 public class BetweenTest {
 
     private Item itemWithPropertyValue(Object propertyId, Object value) {
-        Property property = EasyMock.createMock(Property.class);
+        Property<?> property = EasyMock.createMock(Property.class);
         property.getValue();
         EasyMock.expectLastCall().andReturn(value).anyTimes();
         EasyMock.replay(property);
-- 
cgit v1.2.3