diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-10-26 07:00:54 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-10-26 07:00:54 +0000 |
| commit | 46aac2daff73fa9683e5ea78e5986b933bb4e1ae (patch) | |
| tree | 17b5501d202f1e7dcd839aa8377f6916efe2cebb | |
| parent | bad6fc68d11217f00df1f674228bef2c17a33d2e (diff) | |
| download | vaadin-framework-46aac2daff73fa9683e5ea78e5986b933bb4e1ae.tar.gz vaadin-framework-46aac2daff73fa9683e5ea78e5986b933bb4e1ae.zip | |
Merged: Fix for #3592 - Javadoc refers to Toolkit 5
svn changeset:9368/svn branch:6.2
| -rw-r--r-- | src/com/vaadin/data/util/IndexedContainer.java | 11 | ||||
| -rw-r--r-- | src/com/vaadin/ui/Window.java | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java index fc7ea16054..296a1b0072 100644 --- a/src/com/vaadin/data/util/IndexedContainer.java +++ b/src/com/vaadin/data/util/IndexedContainer.java @@ -1550,17 +1550,6 @@ public class IndexedContainer implements Container.Indexed, return nc; } - /** - * Note! In Toolkit version 5.2.6 removed complex equals method due the old - * one was practically useless and caused serious performance issues. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - return super.equals(obj); - } - public void addContainerFilter(Object propertyId, String filterString, boolean ignoreCase, boolean onlyMatchPrefix) { if (filters == null) { diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java index e80f588b87..828f98fc33 100644 --- a/src/com/vaadin/ui/Window.java +++ b/src/com/vaadin/ui/Window.java @@ -444,7 +444,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * * Setting theme for subwindows is not supported. * - * In Toolkit 5 terminal will reload its host page on theme changes. + * The terminal will reload its host page on theme changes. * * @param theme * the New theme for this window. Null implies the default theme. |