Merged: Fix for #3592 - Javadoc refers to Toolkit 5

svn changeset:9368/svn branch:6.2

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index fc7ea1605424f4e259ff62677d221b2813550d48..296a1b00726c90d6764cd1b815167338e3be8f38 100644 (file)
--- 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 e80f588b8787afe7ab6977f143c4b672f78e72a4..828f98fc33e05aa6bc771111e9996f80a12dd445 100644 (file)
--- 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.