Use simple class names

41 files changed, 136 insertions, 112 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
index 5ed6f9f7b2..d670f09aff 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.v7.data.util;
 
+import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -212,7 +213,7 @@ public class BeanItem<BT> extends PropertysetItem {
                     pdMap.put(pd.getName(), vaadinPropertyDescriptor);
                 }
             }
-        } catch (final java.beans.IntrospectionException ignored) {
+        } catch (final IntrospectionException ignored) {
         }
 
         return pdMap;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
index bf4dcc1a06..a8220202f8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
@@ -50,7 +50,7 @@ import com.vaadin.v7.data.Property;
 @Deprecated
 public class DefaultItemSorter implements ItemSorter {
 
-    private java.lang.Object[] sortPropertyIds;
+    private Object[] sortPropertyIds;
     private boolean[] sortDirections;
     private Container container;
     private Comparator<Object> propertyValueComparator;
diff --git a/compatibility-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 0e564087bf..d982d98c3f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
@@ -19,6 +19,8 @@ package com.vaadin.v7.data.util;
 import static com.vaadin.util.ReflectTools.convertPrimitiveType;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -100,7 +102,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
     private static final Object[] DEFAULT_SET_ARGS = new Object[1];
 
     /* Special serialization to handle method references */
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         out.defaultWriteObject();
         SerializerHelper.writeClass(out, type);
@@ -126,7 +128,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
     }
 
     /* Special serialization to handle method references */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         try {
@@ -203,7 +205,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
         getMethod = null;
         try {
             getMethod = initGetterMethod(beanPropertyName, beanClass);
-        } catch (final java.lang.NoSuchMethodException ignored) {
+        } catch (final NoSuchMethodException ignored) {
             throw new MethodException(this,
                     "Bean property " + beanPropertyName + " can not be found");
         }
@@ -216,7 +218,7 @@ public class MethodProperty<T> extends AbstractProperty<T> {
         try {
             setMethod = beanClass.getMethod("set" + beanPropertyName,
                     new Class[] { returnType });
-        } catch (final java.lang.NoSuchMethodException skipped) {
+        } catch (final NoSuchMethodException skipped) {
         }
 
         // Gets the return type from get method
@@ -545,11 +547,11 @@ public class MethodProperty<T> extends AbstractProperty<T> {
         try {
             getMethod = beanClass.getMethod("get" + propertyName,
                     new Class[] {});
-        } catch (final java.lang.NoSuchMethodException ignored) {
+        } catch (final NoSuchMethodException ignored) {
             try {
                 getMethod = beanClass.getMethod("is" + propertyName,
                         new Class[] {});
-            } catch (final java.lang.NoSuchMethodException ignoredAsWell) {
+            } catch (final NoSuchMethodException ignoredAsWell) {
                 getMethod = beanClass.getMethod("are" + propertyName,
                         new Class[] {});
             }
diff --git a/compatibility-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 06a23b5d86..62f464e622 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java
@@ -16,6 +16,8 @@
 package com.vaadin.v7.data.util;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -67,7 +69,7 @@ public class MethodPropertyDescriptor<BT>
     }
 
     /* Special serialization to handle method references */
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         out.defaultWriteObject();
         SerializerHelper.writeClass(out, propertyType);
@@ -96,7 +98,7 @@ public class MethodPropertyDescriptor<BT>
     }
 
     /* Special serialization to handle method references */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         try {
diff --git a/compatibility-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 42764b90ae..b7c838c09e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
@@ -18,6 +18,8 @@ package com.vaadin.v7.data.util;
 import static com.vaadin.util.ReflectTools.convertPrimitiveType;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -68,7 +70,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     private Class<? extends T> type;
 
     /* Special serialization to handle method references */
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         out.defaultWriteObject();
         // getMethods and setMethod are reconstructed on read based on
@@ -76,7 +78,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
     }
 
     /* Special serialization to handle method references */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
 
@@ -152,7 +154,7 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
                             simplePropertyName, propertyClass);
                     propertyClass = getter.getReturnType();
                     getMethods.add(getter);
-                } catch (final java.lang.NoSuchMethodException e) {
+                } catch (final NoSuchMethodException e) {
                     throw new IllegalArgumentException("Bean property '"
                             + simplePropertyName + "' not found", e);
                 }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
index e858ae7f5a..f0916d54cf 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
@@ -16,6 +16,7 @@
 package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
+import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -55,7 +56,7 @@ class CacheFlushNotifier implements Serializable {
      * Removes dead references from instance list
      */
     private static void removeDeadReferences() {
-        java.lang.ref.Reference<? extends SQLContainer> dead = deadInstances
+        Reference<? extends SQLContainer> dead = deadInstances
                 .poll();
         while (dead != null) {
             allInstances.remove(dead);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
index 0dc34f1e7a..5750de6b36 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
@@ -16,6 +16,8 @@
 package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -1682,12 +1684,12 @@ public class SQLContainer implements Container, Container.Filterable,
         return refdCont.getItem(getReferencedItemId(itemId, refdCont));
     }
 
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         out.defaultWriteObject();
     }
 
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         if (notificationsEnabled) {
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 096ecd5494..4021ff0100 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
@@ -16,6 +16,7 @@
 package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.io.IOException;
+import java.io.ObjectOutputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -175,7 +176,7 @@ public class SimpleJDBCConnectionPool implements JDBCConnectionPool {
 
     }
 
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         initialized = false;
         out.defaultWriteObject();
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java
index 0b524f2fe5..7de27e3eba 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java
@@ -87,9 +87,9 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
         try {
             ITEM_CLICK_METHOD = ItemClickListener.class.getDeclaredMethod(
                     "itemClick", new Class[] { ItemClickEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException();
+            throw new RuntimeException();
         }
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
index 9f2224bed3..2b6e9b43bf 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
@@ -49,9 +49,9 @@ public abstract class AbstractColorPicker extends AbstractLegacyComponent
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
index 3f2b1d5c1f..f5867ad0e3 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java
@@ -1077,9 +1077,9 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent
             VALUE_CHANGE_METHOD = Property.ValueChangeListener.class
                     .getDeclaredMethod("valueChange",
                             new Class[] { Property.ValueChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in AbstractField");
         }
     }
@@ -1150,9 +1150,9 @@ public abstract class AbstractField<T> extends AbstractLegacyComponent
             READ_ONLY_STATUS_CHANGE_METHOD = Property.ReadOnlyStatusChangeListener.class
                     .getDeclaredMethod("readOnlyStatusChange", new Class[] {
                             Property.ReadOnlyStatusChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in AbstractField");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
index a5cb55d54c..ca00a8c7e4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java
@@ -321,9 +321,9 @@ public class Label extends AbstractLegacyComponent implements Property<String>,
             VALUE_CHANGE_METHOD = Property.ValueChangeListener.class
                     .getDeclaredMethod("valueChange",
                             new Class[] { Property.ValueChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in Label");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 11f69f5b01..8fd401e393 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -5327,9 +5327,9 @@ public class Table extends AbstractSelect implements Action.Container,
                 HEADER_CLICK_METHOD = HeaderClickListener.class
                         .getDeclaredMethod("headerClick",
                                 new Class[] { HeaderClickEvent.class });
-            } catch (final java.lang.NoSuchMethodException e) {
+            } catch (final NoSuchMethodException e) {
                 // This should never happen
-                throw new java.lang.RuntimeException(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -5368,9 +5368,9 @@ public class Table extends AbstractSelect implements Action.Container,
                 FOOTER_CLICK_METHOD = FooterClickListener.class
                         .getDeclaredMethod("footerClick",
                                 new Class[] { FooterClickEvent.class });
-            } catch (final java.lang.NoSuchMethodException e) {
+            } catch (final NoSuchMethodException e) {
                 // This should never happen
-                throw new java.lang.RuntimeException(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -5600,9 +5600,9 @@ public class Table extends AbstractSelect implements Action.Container,
                 COLUMN_RESIZE_METHOD = ColumnResizeListener.class
                         .getDeclaredMethod("columnResize",
                                 new Class[] { ColumnResizeEvent.class });
-            } catch (final java.lang.NoSuchMethodException e) {
+            } catch (final NoSuchMethodException e) {
                 // This should never happen
-                throw new java.lang.RuntimeException(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -5729,9 +5729,9 @@ public class Table extends AbstractSelect implements Action.Container,
                 METHOD = ColumnReorderListener.class.getDeclaredMethod(
                         "columnReorder",
                         new Class[] { ColumnReorderEvent.class });
-            } catch (final java.lang.NoSuchMethodException e) {
+            } catch (final NoSuchMethodException e) {
                 // This should never happen
-                throw new java.lang.RuntimeException(e);
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
index cf855b6868..0eeea4ac53 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Upload.java
@@ -18,6 +18,7 @@ package com.vaadin.v7.ui;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -242,9 +243,9 @@ public class Upload extends AbstractLegacyComponent
                     "uploadStarted", new Class[] { StartedEvent.class });
             UPLOAD_SUCCEEDED_METHOD = SucceededListener.class.getDeclaredMethod(
                     "uploadSucceeded", new Class[] { SucceededEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in Upload");
         }
     }
@@ -1201,7 +1202,7 @@ public class Upload extends AbstractLegacyComponent
     }
 
     @Override
-    public java.util.Collection<?> getListeners(java.lang.Class<?> eventType) {
+    public Collection<?> getListeners(Class<?> eventType) {
         if (StreamingProgressEvent.class.isAssignableFrom(eventType)) {
             if (progressListeners == null) {
                 return Collections.EMPTY_LIST;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
index 677ba4ed7b..7d8206c8f5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
@@ -55,11 +55,11 @@ public class BasicBackwardHandler implements BackwardHandler {
         // set new start and end times
         Calendar javaCalendar = event.getComponent().getInternalCalendar();
         javaCalendar.setTime(start);
-        javaCalendar.add(java.util.Calendar.DATE, durationInDays);
+        javaCalendar.add(Calendar.DATE, durationInDays);
         Date newStart = javaCalendar.getTime();
 
         javaCalendar.setTime(end);
-        javaCalendar.add(java.util.Calendar.DATE, durationInDays);
+        javaCalendar.add(Calendar.DATE, durationInDays);
         Date newEnd = javaCalendar.getTime();
 
         if (start.equals(end)) { // day view
@@ -69,7 +69,7 @@ public class BasicBackwardHandler implements BackwardHandler {
 
             // we suppose that 7 >= lastDay >= firstDay >= 1
             while (!(firstDay <= dayOfWeek && dayOfWeek <= lastDay)) {
-                javaCalendar.add(java.util.Calendar.DATE, -1);
+                javaCalendar.add(Calendar.DATE, -1);
                 dayOfWeek = javaCalendar.get(Calendar.DAY_OF_WEEK);
             }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
index 1d5007c0fd..b354a7cdae 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
@@ -53,11 +53,11 @@ public class BasicForwardHandler implements ForwardHandler {
         // set new start and end times
         Calendar javaCalendar = Calendar.getInstance();
         javaCalendar.setTime(start);
-        javaCalendar.add(java.util.Calendar.DATE, durationInDays);
+        javaCalendar.add(Calendar.DATE, durationInDays);
         Date newStart = javaCalendar.getTime();
 
         javaCalendar.setTime(end);
-        javaCalendar.add(java.util.Calendar.DATE, durationInDays);
+        javaCalendar.add(Calendar.DATE, durationInDays);
         Date newEnd = javaCalendar.getTime();
 
         if (start.equals(end)) { // day view
@@ -67,7 +67,7 @@ public class BasicForwardHandler implements ForwardHandler {
 
             // we suppose that 7 >= lastDay >= firstDay >= 1
             while (!(firstDay <= dayOfWeek && dayOfWeek <= lastDay)) {
-                javaCalendar.add(java.util.Calendar.DATE, 1);
+                javaCalendar.add(Calendar.DATE, 1);
                 dayOfWeek = javaCalendar.get(Calendar.DAY_OF_WEEK);
             }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
index d9f5f891b8..6dab06e69b 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
@@ -37,9 +37,9 @@ public class ColorPickerGradient extends AbstractComponent implements
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
index 5ba0f2893e..0f9d93be75 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
@@ -41,9 +41,9 @@ public class ColorPickerGrid extends AbstractComponent
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
index 40c0190ac6..09a7de6aff 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
@@ -42,9 +42,9 @@ public class ColorPickerHistory extends CustomComponent
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
index ff5334ea83..befadf5a77 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
@@ -59,9 +59,9 @@ public class ColorPickerPopup extends Window
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
index 3b2ec99d97..ba4ba7e82f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
@@ -41,9 +41,9 @@ public class ColorPickerPreview extends CssLayout
         try {
             COLOR_CHANGE_METHOD = ColorChangeListener.class.getDeclaredMethod(
                     "colorChanged", new Class[] { ColorChangeEvent.class });
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in ColorPicker");
         }
     }
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index fce8b4d4ec..89befd0bd8 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java
@@ -1,5 +1,7 @@
 package com.vaadin.v7.data.util.sqlcontainer.connection;
 
+import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
@@ -15,7 +17,7 @@ public class MockInitialContextFactory implements InitialContextFactory {
     }
 
     @Override
-    public Context getInitialContext(java.util.Hashtable<?, ?> environment)
+    public Context getInitialContext(Hashtable<?, ?> environment)
             throws NamingException {
         if (mockCtx == null) {
             throw new IllegalStateException("mock context was not set.");
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/Color.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/Color.java
index 5fac0578b3..d4929bb5c7 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/Color.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/Color.java
@@ -348,7 +348,7 @@ public class Color implements Serializable {
             red = green = blue = (int) (value * 255.0f + 0.5f);
         } else {
             float h = (hue - (float) Math.floor(hue)) * 6.0f;
-            float f = h - (float) java.lang.Math.floor(h);
+            float f = h - (float) Math.floor(h);
             float p = value * (1.0f - saturation);
             float q = value * (1.0f - saturation * f);
             float t = value * (1.0f - (saturation * (1.0f - f)));
diff --git a/server/src/main/java/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java
index a47aa45334..07fe664d0d 100644
--- a/server/src/main/java/com/vaadin/event/ListenerMethod.java
+++ b/server/src/main/java/com/vaadin/event/ListenerMethod.java
@@ -18,7 +18,10 @@ package com.vaadin.event;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.EventListener;
@@ -83,7 +86,7 @@ public class ListenerMethod implements EventListener, Serializable {
     private int eventArgumentIndex;
 
     /* Special serialization to handle method references */
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         try {
             out.defaultWriteObject();
@@ -101,7 +104,7 @@ public class ListenerMethod implements EventListener, Serializable {
     }
 
     /* Special serialization to handle method references */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         try {
@@ -170,17 +173,17 @@ public class ListenerMethod implements EventListener, Serializable {
      *            eventArgumentIndex is negative, the triggering event object
      *            will not be passed to the trigger method, though it is still
      *            called.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             if <code>method</code> is not a member of <code>target</code>
      *             .
      */
     public ListenerMethod(Class<?> eventType, Object target, Method method,
             Object[] arguments, int eventArgumentIndex)
-            throws java.lang.IllegalArgumentException {
+            throws IllegalArgumentException {
 
         // Checks that the object is of correct type
         if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "The method " + method.getName()
                             + " cannot be used for the given target: "
                             + target.getClass().getName());
@@ -188,7 +191,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
         // Checks that the event argument is null
         if (eventArgumentIndex >= 0 && arguments[eventArgumentIndex] != null) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "argument[" + eventArgumentIndex + "] must be null");
         }
 
@@ -196,7 +199,7 @@ public class ListenerMethod implements EventListener, Serializable {
         if (eventArgumentIndex >= 0
                 && !method.getParameterTypes()[eventArgumentIndex]
                         .isAssignableFrom(eventType)) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "The method " + method.getName()
                             + " does not accept the given eventType: "
                             + eventType.getName());
@@ -236,13 +239,13 @@ public class ListenerMethod implements EventListener, Serializable {
      *            eventArgumentIndex is negative, the triggering event object
      *            will not be passed to the trigger method, though it is still
      *            called.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             unless exactly one match <code>methodName</code> is found in
      *             <code>target</code>.
      */
     public ListenerMethod(Class<?> eventType, Object target, String methodName,
             Object[] arguments, int eventArgumentIndex)
-            throws java.lang.IllegalArgumentException {
+            throws IllegalArgumentException {
 
         // Finds the correct method
         final Method[] methods = target.getClass().getMethods();
@@ -259,7 +262,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
         // Checks that the event argument is null
         if (eventArgumentIndex >= 0 && arguments[eventArgumentIndex] != null) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "argument[" + eventArgumentIndex + "] must be null");
         }
 
@@ -267,7 +270,7 @@ public class ListenerMethod implements EventListener, Serializable {
         if (eventArgumentIndex >= 0
                 && !method.getParameterTypes()[eventArgumentIndex]
                         .isAssignableFrom(eventType)) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "The method " + method.getName()
                             + " does not accept the given eventType: "
                             + eventType.getName());
@@ -302,16 +305,16 @@ public class ListenerMethod implements EventListener, Serializable {
      *            the trigger method.
      * @param arguments
      *            the arguments to be passed to the trigger method.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             if <code>method</code> is not a member of <code>target</code>
      *             .
      */
     public ListenerMethod(Class<?> eventType, Object target, Method method,
-            Object[] arguments) throws java.lang.IllegalArgumentException {
+            Object[] arguments) throws IllegalArgumentException {
 
         // Check that the object is of correct type
         if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "The method " + method.getName()
                             + " cannot be used for the given target: "
                             + target.getClass().getName());
@@ -349,12 +352,12 @@ public class ListenerMethod implements EventListener, Serializable {
      *            <code>java.lang.IllegalArgumentException</code> is thrown.
      * @param arguments
      *            the arguments to be passed to the trigger method.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             unless exactly one match <code>methodName</code> is found in
      *             <code>object</code>.
      */
     public ListenerMethod(Class<?> eventType, Object target, String methodName,
-            Object[] arguments) throws java.lang.IllegalArgumentException {
+            Object[] arguments) throws IllegalArgumentException {
 
         // Find the correct method
         final Method[] methods = target.getClass().getMethods();
@@ -395,16 +398,16 @@ public class ListenerMethod implements EventListener, Serializable {
      *            the object instance that contains the trigger method.
      * @param method
      *            the trigger method.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             if <code>method</code> is not a member of <code>object</code>
      *             .
      */
     public ListenerMethod(Class<?> eventType, Object target, Method method)
-            throws java.lang.IllegalArgumentException {
+            throws IllegalArgumentException {
 
         // Checks that the object is of correct type
         if (!method.getDeclaringClass().isAssignableFrom(target.getClass())) {
-            throw new java.lang.IllegalArgumentException(
+            throw new IllegalArgumentException(
                     "The method " + method.getName()
                             + " cannot be used for the given target: "
                             + target.getClass().getName());
@@ -451,12 +454,12 @@ public class ListenerMethod implements EventListener, Serializable {
      *            the name of the trigger method. If the object does not contain
      *            the method or it contains more than one matching methods
      *            <code>java.lang.IllegalArgumentException</code> is thrown.
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             unless exactly one match <code>methodName</code> is found in
      *             <code>target</code>.
      */
     public ListenerMethod(Class<?> eventType, Object target, String methodName)
-            throws java.lang.IllegalArgumentException {
+            throws IllegalArgumentException {
 
         // Finds the correct method
         final Method[] methods = target.getClass().getMethods();
@@ -518,11 +521,11 @@ public class ListenerMethod implements EventListener, Serializable {
                     method.invoke(target, arguments);
                 }
 
-            } catch (final java.lang.IllegalAccessException e) {
+            } catch (final IllegalAccessException e) {
                 // This should never happen
-                throw new java.lang.RuntimeException(
+                throw new RuntimeException(
                         "Internal error - please report", e);
-            } catch (final java.lang.reflect.InvocationTargetException e) {
+            } catch (final InvocationTargetException e) {
                 // An exception was thrown by the invocation target. Throw it
                 // forwards.
                 throw new MethodException(
diff --git a/server/src/main/java/com/vaadin/event/MethodEventSource.java b/server/src/main/java/com/vaadin/event/MethodEventSource.java
index 7e55a5acd1..fd4660184c 100644
--- a/server/src/main/java/com/vaadin/event/MethodEventSource.java
+++ b/server/src/main/java/com/vaadin/event/MethodEventSource.java
@@ -57,7 +57,7 @@ public interface MethodEventSource extends Serializable {
      * @param method
      *            the activation method.
      * @return a registration object for removing the listener
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             unless <code>method</code> has exactly one match in
      *             <code>object</code>
      * @throws NullPointerException
@@ -95,7 +95,7 @@ public interface MethodEventSource extends Serializable {
      * @param methodName
      *            the name of the activation method.
      * @return a registration object for removing the listener
-     * @throws java.lang.IllegalArgumentException
+     * @throws IllegalArgumentException
      *             unless <code>method</code> has exactly one match in
      *             <code>object</code>
      * @throws NullPointerException
diff --git a/server/src/main/java/com/vaadin/server/LocaleService.java b/server/src/main/java/com/vaadin/server/LocaleService.java
index 416677e1b2..9e47c4fe9b 100644
--- a/server/src/main/java/com/vaadin/server/LocaleService.java
+++ b/server/src/main/java/com/vaadin/server/LocaleService.java
@@ -152,7 +152,7 @@ public class LocaleService implements Serializable {
         /*
          * First day of week (0 = sunday, 1 = monday)
          */
-        final java.util.Calendar cal = new GregorianCalendar(locale);
+        final Calendar cal = new GregorianCalendar(locale);
         localeData.firstDayOfWeek = cal.getFirstDayOfWeek() - 1;
 
         /*
diff --git a/server/src/main/java/com/vaadin/server/PaintTarget.java b/server/src/main/java/com/vaadin/server/PaintTarget.java
index cfa22966e4..6d531abc2c 100644
--- a/server/src/main/java/com/vaadin/server/PaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/PaintTarget.java
@@ -475,7 +475,7 @@ public interface PaintTarget extends Serializable {
      * @throws PaintException
      *             if the paint operation failed.
      */
-    public void addUIDL(java.lang.String uidl) throws PaintException;
+    public void addUIDL(String uidl) throws PaintException;
 
     /**
      * Adds text node. All the contents of the text are XML-escaped.
diff --git a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
index 54fb5c5822..1bd9f81892 100644
--- a/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
@@ -16,6 +16,8 @@
 package com.vaadin.ui;
 
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -727,7 +729,7 @@ public class ConnectorTracker implements Serializable {
     }
 
     /* Special serialization to JsonObjects which are not serializable */
-    private void writeObject(java.io.ObjectOutputStream out)
+    private void writeObject(ObjectOutputStream out)
             throws IOException {
         out.defaultWriteObject();
         // Convert JsonObjects in diff state to String representation as
@@ -741,7 +743,7 @@ public class ConnectorTracker implements Serializable {
     }
 
     /* Special serialization to JsonObjects which are not serializable */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
             throws IOException, ClassNotFoundException {
         in.defaultReadObject();
 
diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java
index a678ee2a00..cc043927e9 100644
--- a/server/src/main/java/com/vaadin/ui/GridLayout.java
+++ b/server/src/main/java/com/vaadin/ui/GridLayout.java
@@ -627,7 +627,7 @@ public class GridLayout extends AbstractLayout
      * @author Vaadin Ltd.
      * @since 3.0
      */
-    public class OverlapsException extends java.lang.RuntimeException {
+    public class OverlapsException extends RuntimeException {
 
         private final Area existingArea;
 
@@ -683,7 +683,7 @@ public class GridLayout extends AbstractLayout
      * @author Vaadin Ltd.
      * @since 3.0
      */
-    public class OutOfBoundsException extends java.lang.RuntimeException {
+    public class OutOfBoundsException extends RuntimeException {
 
         private final Area areaOutOfBounds;
 
diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java
index d6671be191..6ce6aafe08 100644
--- a/server/src/main/java/com/vaadin/ui/PopupView.java
+++ b/server/src/main/java/com/vaadin/ui/PopupView.java
@@ -50,9 +50,9 @@ public class PopupView extends AbstractComponent implements HasComponents {
             POPUP_VISIBILITY_METHOD = PopupVisibilityListener.class
                     .getDeclaredMethod("popupVisibilityChange",
                             PopupVisibilityEvent.class);
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in PopupView");
         }
     }
@@ -84,7 +84,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
      * @param large
      *            the full, Component-type representation
      */
-    public PopupView(final java.lang.String small, final Component large) {
+    public PopupView(final String small, final Component large) {
         this(createContent(small, large));
     }
 
@@ -165,7 +165,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
             if (visible) {
                 visibleComponent = content.getPopupComponent();
                 if (visibleComponent == null) {
-                    throw new java.lang.IllegalStateException(
+                    throw new IllegalStateException(
                             "PopupView.Content did not return Component to set visible");
                 }
                 if (visibleComponent.getParent() != null) {
diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java
index 3341255553..385c6b5f5c 100644
--- a/server/src/main/java/com/vaadin/ui/TabSheet.java
+++ b/server/src/main/java/com/vaadin/ui/TabSheet.java
@@ -785,9 +785,9 @@ public class TabSheet extends AbstractComponentContainer
             SELECTED_TAB_CHANGE_METHOD = SelectedTabChangeListener.class
                     .getDeclaredMethod("selectedTabChange",
                             SelectedTabChangeEvent.class);
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in TabSheet");
         }
     }
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 4c6e49cd24..cdc78bae35 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -237,9 +237,9 @@ public class Upload extends AbstractComponent
                     .getDeclaredMethod("uploadStarted", StartedEvent.class);
             UPLOAD_SUCCEEDED_METHOD = SucceededListener.class
                     .getDeclaredMethod("uploadSucceeded", SucceededEvent.class);
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error finding methods in Upload");
         }
     }
diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java
index a6b2652e49..5a9b19f421 100644
--- a/server/src/main/java/com/vaadin/ui/Window.java
+++ b/server/src/main/java/com/vaadin/ui/Window.java
@@ -366,9 +366,9 @@ public class Window extends Panel
         try {
             WINDOW_CLOSE_METHOD = CloseListener.class
                     .getDeclaredMethod("windowClose", CloseEvent.class);
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error, window close method not found");
         }
     }
@@ -662,9 +662,9 @@ public class Window extends Panel
         try {
             WINDOW_RESIZE_METHOD = ResizeListener.class
                     .getDeclaredMethod("windowResized", ResizeEvent.class);
-        } catch (final java.lang.NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             // This should never happen
-            throw new java.lang.RuntimeException(
+            throw new RuntimeException(
                     "Internal error, window resized method not found");
         }
     }
diff --git a/server/src/main/java/com/vaadin/util/ReflectTools.java b/server/src/main/java/com/vaadin/util/ReflectTools.java
index 4728c76c47..daeb2384b8 100644
--- a/server/src/main/java/com/vaadin/util/ReflectTools.java
+++ b/server/src/main/java/com/vaadin/util/ReflectTools.java
@@ -18,6 +18,7 @@ package com.vaadin.util;
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -82,7 +83,7 @@ public class ReflectTools implements Serializable {
      *             If the value could not be retrieved
      */
     public static Object getJavaFieldValue(Object object,
-            java.lang.reflect.Field field) throws IllegalArgumentException,
+            Field field) throws IllegalArgumentException,
             IllegalAccessException, InvocationTargetException {
         PropertyDescriptor pd;
         try {
@@ -126,7 +127,7 @@ public class ReflectTools implements Serializable {
      *             If the value could not be retrieved
      */
     public static Object getJavaFieldValue(Object object,
-            java.lang.reflect.Field field, Class<?> propertyType)
+            Field field, Class<?> propertyType)
             throws IllegalArgumentException, IllegalAccessException,
             InvocationTargetException {
         PropertyDescriptor pd;
@@ -173,7 +174,7 @@ public class ReflectTools implements Serializable {
      *             If the value could not be assigned to the field
      */
     public static void setJavaFieldValue(Object object,
-            java.lang.reflect.Field field, Object value)
+            Field field, Object value)
             throws IllegalAccessException, IllegalArgumentException,
             InvocationTargetException {
         PropertyDescriptor pd;
diff --git a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
index 8972bbb66f..ebba16e0d0 100644
--- a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
+++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
@@ -3,6 +3,8 @@ package com.vaadin.util;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.lang.reflect.Field;
+
 import org.junit.Test;
 
 public class ReflectToolsGetFieldValueByTypeTest {
@@ -23,7 +25,7 @@ public class ReflectToolsGetFieldValueByTypeTest {
 
         MySubClass myInstance = new MySubClass();
 
-        java.lang.reflect.Field memberField;
+        Field memberField;
         Object fieldValue = false;
         try {
             memberField = myInstance.getClass().getField("field");
@@ -50,7 +52,7 @@ public class ReflectToolsGetFieldValueByTypeTest {
 
         MySubClass myInstance = new MySubClass();
 
-        java.lang.reflect.Field memberField;
+        Field memberField;
         try {
             memberField = myInstance.getClass().getField("field");
             // Should throw an IllegalArgument exception as the mySubClass class
diff --git a/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
index 167ab774f2..57900a36e5 100644
--- a/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
+++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
@@ -2,6 +2,8 @@ package com.vaadin.util;
 
 import static org.junit.Assert.assertFalse;
 
+import java.lang.reflect.Field;
+
 import org.junit.Test;
 
 public class ReflectToolsGetPrimitiveFieldValueTest {
@@ -13,7 +15,7 @@ public class ReflectToolsGetPrimitiveFieldValueTest {
 
         MyClass myInstance = new MyClass();
 
-        java.lang.reflect.Field memberField;
+        Field memberField;
         Object fieldValue = false;
         try {
             memberField = myInstance.getClass().getField("field");
diff --git a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
index fa8e9d56da..b52453cda1 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
@@ -347,7 +347,7 @@ public class Color implements Serializable {
             red = green = blue = (int) (value * 255.0f + 0.5f);
         } else {
             float h = (hue - (float) Math.floor(hue)) * 6.0f;
-            float f = h - (float) java.lang.Math.floor(h);
+            float f = h - (float) Math.floor(h);
             float p = value * (1.0f - saturation);
             float q = value * (1.0f - saturation * f);
             float t = value * (1.0f - (saturation * (1.0f - f)));
diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index dbef899fd5..61886ecc5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
@@ -89,7 +89,7 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
         panelBLayout.addComponent(layoutB);
 
         // Create grid layout
-        final int gridSize = (int) java.lang.Math.sqrt(componentCountC);
+        final int gridSize = (int) Math.sqrt(componentCountC);
         VerticalLayout panelGLayout = new VerticalLayout();
         panelGLayout.setMargin(true);
         final Panel panelG = new Panel("Panel containing grid layout ("
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
index 1fc5884d34..5ea3bb8c98 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
@@ -93,7 +93,7 @@ public class ColorPickerTestUI extends AbstractReindeerTestUI {
     public class MyImageSource implements StreamResource.StreamSource {
 
         /** The imagebuffer. */
-        private java.io.ByteArrayOutputStream imagebuffer = null;
+        private ByteArrayOutputStream imagebuffer;
 
         /** The bg color. */
         private final java.awt.Color bgColor;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
index efeeb76751..98e121e73d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
@@ -1,5 +1,6 @@
 package com.vaadin.tests.components.table;
 
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 import com.vaadin.tests.components.TestBase;
@@ -82,8 +83,7 @@ public class MissingScrollbar extends TestBase {
         return ic;
     }
 
-    private void writeObject(java.io.ObjectOutputStream out) throws Exception {
-
+    private void writeObject(ObjectOutputStream out) throws Exception {
         out.defaultWriteObject();
         System.out.println("Serialize " + getClass().getName() + "("
                 + (this instanceof Serializable) + ")");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index 64f324d6f7..eed2d3b306 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
@@ -17,7 +17,7 @@ public class DisabledSortingTableTest extends MultiBrowserTest {
     Class<?> uiClass;
 
     @Override
-    protected java.lang.Class<?> getUIClass() {
+    protected Class<?> getUIClass() {
         return uiClass;
     };