diff options
Diffstat (limited to 'compatibility-server/src')
22 files changed, 69 insertions, 55 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."); |