diff options
8 files changed, 15 insertions, 16 deletions
diff --git a/server/src/main/java/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java index f20a14a034..a47aa45334 100644 --- a/server/src/main/java/com/vaadin/event/ListenerMethod.java +++ b/server/src/main/java/com/vaadin/event/ListenerMethod.java @@ -507,7 +507,7 @@ public class ListenerMethod implements EventListener, Serializable { try { if (eventArgumentIndex >= 0) { if (eventArgumentIndex == 0 && arguments.length == 1) { - method.invoke(target, new Object[] { event }); + method.invoke(target, event); } else { final Object[] arg = new Object[arguments.length]; System.arraycopy(arguments, 0, arg, 0, arg.length); diff --git a/server/src/main/java/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java index 81b3b6aa07..84f90d70e3 100644 --- a/server/src/main/java/com/vaadin/server/VaadinPortlet.java +++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java @@ -245,7 +245,7 @@ public class VaadinPortlet extends GenericPortlet Method method = targetClass.getMethod(methodName, parameterClass); - return method.invoke(null, new Object[] { argument }); + return method.invoke(null, argument); } catch (InvocationTargetException ite) { throw (Exception) ite.getCause(); } finally { @@ -359,8 +359,8 @@ public class VaadinPortlet extends GenericPortlet Class<?> portletRequestClass = Class.forName( "com.bea.portlet.container.PortletRequestImpl"); servletRequestMethod = portletRequestClass - .getDeclaredMethod("getInternalRequest", - new Class[] {}); + .getDeclaredMethod("getInternalRequest" + ); servletRequestMethod.setAccessible(true); } diff --git a/server/src/main/java/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java index 3899965622..af61064ada 100644 --- a/server/src/main/java/com/vaadin/server/VaadinService.java +++ b/server/src/main/java/com/vaadin/server/VaadinService.java @@ -164,9 +164,9 @@ public abstract class VaadinService implements Serializable { final Class<?> classLoaderClass = getClass().getClassLoader() .loadClass(classLoaderName); final Constructor<?> c = classLoaderClass - .getConstructor(new Class[] { ClassLoader.class }); + .getConstructor(ClassLoader.class); setClassLoader((ClassLoader) c.newInstance( - new Object[] { getClass().getClassLoader() })); + getClass().getClassLoader())); } catch (final Exception e) { throw new RuntimeException( "Could not find specified class loader: " diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java index 497e052f22..7223facdfe 100644 --- a/server/src/main/java/com/vaadin/ui/PopupView.java +++ b/server/src/main/java/com/vaadin/ui/PopupView.java @@ -49,7 +49,7 @@ public class PopupView extends AbstractComponent implements HasComponents { try { POPUP_VISIBILITY_METHOD = PopupVisibilityListener.class .getDeclaredMethod("popupVisibilityChange", - new Class[] { PopupVisibilityEvent.class }); + PopupVisibilityEvent.class); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java index b246e14796..cef21eff49 100644 --- a/server/src/main/java/com/vaadin/ui/TabSheet.java +++ b/server/src/main/java/com/vaadin/ui/TabSheet.java @@ -772,7 +772,7 @@ public class TabSheet extends AbstractComponentContainer try { SELECTED_TAB_CHANGE_METHOD = SelectedTabChangeListener.class .getDeclaredMethod("selectedTabChange", - new Class[] { SelectedTabChangeEvent.class }); + SelectedTabChangeEvent.class); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java index a08fce099e..11eb553018 100644 --- a/server/src/main/java/com/vaadin/ui/Upload.java +++ b/server/src/main/java/com/vaadin/ui/Upload.java @@ -230,13 +230,13 @@ public class Upload extends AbstractComponent static { try { UPLOAD_FINISHED_METHOD = FinishedListener.class.getDeclaredMethod( - "uploadFinished", new Class[] { FinishedEvent.class }); + "uploadFinished", FinishedEvent.class); UPLOAD_FAILED_METHOD = FailedListener.class.getDeclaredMethod( - "uploadFailed", new Class[] { FailedEvent.class }); + "uploadFailed", FailedEvent.class); UPLOAD_STARTED_METHOD = StartedListener.class.getDeclaredMethod( - "uploadStarted", new Class[] { StartedEvent.class }); + "uploadStarted", StartedEvent.class); UPLOAD_SUCCEEDED_METHOD = SucceededListener.class.getDeclaredMethod( - "uploadSucceeded", new Class[] { SucceededEvent.class }); + "uploadSucceeded", SucceededEvent.class); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java index 1e4f43067f..318f48548d 100644 --- a/server/src/main/java/com/vaadin/ui/Window.java +++ b/server/src/main/java/com/vaadin/ui/Window.java @@ -337,7 +337,7 @@ public class Window extends Panel static { try { WINDOW_CLOSE_METHOD = CloseListener.class.getDeclaredMethod( - "windowClose", new Class[] { CloseEvent.class }); + "windowClose", CloseEvent.class); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( @@ -541,7 +541,7 @@ public class Window extends Panel static { try { WINDOW_RESIZE_METHOD = ResizeListener.class.getDeclaredMethod( - "windowResized", new Class[] { ResizeEvent.class }); + "windowResized", ResizeEvent.class); } catch (final java.lang.NoSuchMethodException e) { // This should never happen throw new java.lang.RuntimeException( diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java index dc702b5b17..9764692345 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java @@ -37,8 +37,7 @@ import com.vaadin.ui.VerticalLayout; public class AbstractOrderedLayoutDeclarativeTest extends DeclarativeMarginTestBase<AbstractOrderedLayout> { - private List<String> defaultAlignments = Arrays - .asList(new String[] { ":top", ":left" }); + private List<String> defaultAlignments = Arrays.asList(":top", ":left"); @Test public void testMargins() { |