diff options
Diffstat (limited to 'server')
16 files changed, 20 insertions, 21 deletions
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java index 8022b4d571..bb592245f1 100644 --- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java @@ -95,7 +95,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, } return 0; } - }; + } /** * Constructs a new hierarchical wrapper for an existing Container. Works diff --git a/server/src/com/vaadin/data/util/ListSet.java b/server/src/com/vaadin/data/util/ListSet.java index 2563366229..55ef398b20 100644 --- a/server/src/com/vaadin/data/util/ListSet.java +++ b/server/src/com/vaadin/data/util/ListSet.java @@ -82,7 +82,7 @@ public class ListSet<E> extends ArrayList<E> { } else { return false; } - }; + } /** * Works as java.util.ArrayList#add(int, java.lang.Object) but returns diff --git a/server/src/com/vaadin/data/util/MethodProperty.java b/server/src/com/vaadin/data/util/MethodProperty.java index 3cba8c2eab..0464d50b62 100644 --- a/server/src/com/vaadin/data/util/MethodProperty.java +++ b/server/src/com/vaadin/data/util/MethodProperty.java @@ -108,7 +108,7 @@ public class MethodProperty<T> extends AbstractProperty<T> { out.writeObject(null); out.writeObject(null); } - }; + } /* Special serialization to handle method references */ private void readObject(java.io.ObjectInputStream in) throws IOException, @@ -142,7 +142,7 @@ public class MethodProperty<T> extends AbstractProperty<T> { } catch (NoSuchMethodException e) { getLogger().log(Level.SEVERE, "Internal deserialization error", e); } - }; + } /** * <p> diff --git a/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java index 7caebac317..007fdc4adc 100644 --- a/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java @@ -122,7 +122,7 @@ public class MethodPropertyDescriptor<BT> implements } catch (NoSuchMethodException e) { getLogger().log(Level.SEVERE, "Internal deserialization error", e); } - }; + } @Override public String getName() { diff --git a/server/src/com/vaadin/data/util/filter/Compare.java b/server/src/com/vaadin/data/util/filter/Compare.java index ac167673bd..1396c46d36 100644 --- a/server/src/com/vaadin/data/util/filter/Compare.java +++ b/server/src/com/vaadin/data/util/filter/Compare.java @@ -37,7 +37,7 @@ public abstract class Compare implements Filter { public enum Operation { EQUAL, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL - }; + } private final Object propertyId; private final Operation operation; diff --git a/server/src/com/vaadin/event/FieldEvents.java b/server/src/com/vaadin/event/FieldEvents.java index d0479eec05..61c342891b 100644 --- a/server/src/com/vaadin/event/FieldEvents.java +++ b/server/src/com/vaadin/event/FieldEvents.java @@ -325,6 +325,6 @@ public interface FieldEvents { public void focus() { fireEvent(new FocusEvent(component)); } - }; + } } diff --git a/server/src/com/vaadin/event/ListenerMethod.java b/server/src/com/vaadin/event/ListenerMethod.java index a0ecdc4769..20523920fd 100644 --- a/server/src/com/vaadin/event/ListenerMethod.java +++ b/server/src/com/vaadin/event/ListenerMethod.java @@ -98,7 +98,7 @@ public class ListenerMethod implements EventListener, Serializable { throw e; } - }; + } /* Special serialization to handle method references */ private void readObject(java.io.ObjectInputStream in) throws IOException, @@ -113,7 +113,7 @@ public class ListenerMethod implements EventListener, Serializable { } catch (SecurityException e) { getLogger().log(Level.SEVERE, "Internal deserialization error", e); } - }; + } private static Method findHighestMethod(Class<?> cls, String method, Class<?>[] paramTypes) { diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java index 540a3ee302..dbcec00ba9 100644 --- a/server/src/com/vaadin/navigator/Navigator.java +++ b/server/src/com/vaadin/navigator/Navigator.java @@ -794,7 +794,7 @@ public class Navigator implements Serializable { @Override public View getView(String viewName) { return view; - }; + } @Override public String getViewName(String navigationState) { diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java index 33d585adca..d985ffd124 100644 --- a/server/src/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/com/vaadin/ui/ConnectorTracker.java @@ -635,7 +635,7 @@ public class ConnectorTracker implements Serializable { stringDiffStates.put(key, diffStates.get(key).toString()); } out.writeObject(stringDiffStates); - }; + } /* Special serialization to JSONObjects which are not serializable */ private void readObject(java.io.ObjectInputStream in) throws IOException, diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index c8d9f3ff09..5677b1a16e 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -1184,5 +1184,5 @@ public class Upload extends AbstractComponent implements Component.Focusable, } return super.getListeners(eventType); - }; + } } diff --git a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java index b53c5a930f..306e2f0405 100644 --- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java +++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java @@ -78,7 +78,7 @@ public class ConverterFactory extends TestCase { @Override public VaadinSession getSession() { return appWithCustomIntegerConverter; - }; + } }; tf.setConverter(Integer.class); // The application converter always returns 42. Current application is diff --git a/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java index 48c60c83c4..b47a2953ce 100644 --- a/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java +++ b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java @@ -26,7 +26,7 @@ public class TestPropertyFormatter extends TestCase { public Object parse(String formattedValue) throws Exception { return getExpectedClass().newInstance(); } - }; + } @SuppressWarnings("rawtypes") private Class expectedClass; diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index fcf17cc499..f391d15fb3 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -56,12 +56,12 @@ public class RemoveListenersOnDetach { @Override public com.vaadin.ui.UI getUI() { return uI; - }; + } @Override public VaadinSession getSession() { return application; - }; + } }; Property<String> property = new AbstractProperty<String>() { diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java index 485b17830f..51d396801d 100644 --- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -31,7 +31,7 @@ public class AttachDetachWindow { private class TestWindow extends Window implements TestContainer { boolean windowAttachCalled = false; boolean windowDetachCalled = false; - private TestContent testContent = new TestContent();; + private TestContent testContent = new TestContent(); TestWindow() { setContent(testContent); @@ -110,7 +110,7 @@ public class AttachDetachWindow { private class TestUI extends UI implements TestContainer { boolean rootAttachCalled = false; boolean rootDetachCalled = false; - private TestContent testContent = new TestContent();; + private TestContent testContent = new TestContent(); public TestUI() { setContent(testContent); diff --git a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java index 55d5771f80..ff615e3d91 100644 --- a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java +++ b/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChange.java @@ -37,7 +37,6 @@ public class AbsFieldDataSourceLocaleChange { public void localeChangesOnAttach() { TextField tf = new TextField(); - ; tf.setConverter(new StringToIntegerConverter() { @Override protected NumberFormat getFormat(Locale locale) { diff --git a/server/tests/src/com/vaadin/util/TestCurrentInstance.java b/server/tests/src/com/vaadin/util/TestCurrentInstance.java index 1910172aa8..09ef9514e5 100644 --- a/server/tests/src/com/vaadin/util/TestCurrentInstance.java +++ b/server/tests/src/com/vaadin/util/TestCurrentInstance.java @@ -70,7 +70,7 @@ public class TestCurrentInstance { Assert.assertEquals(TestCurrentInstance.this, CurrentInstance.get(TestCurrentInstance.class)); threadFailed.set(false); - }; + } }; t.start(); CurrentInstance.set(TestCurrentInstance.class, null); @@ -103,7 +103,7 @@ public class TestCurrentInstance { } catch (Exception e) { e.printStackTrace(); } - }; + } }; t.start(); |