JDK 1.4.x compatibility fix. Code did not work on JDK 1.4.x.

svn changeset:1279/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/util/SampleDatabase.java b/src/com/itmill/toolkit/demo/util/SampleDatabase.java
index 4d2a8058533f3f826bff3628561a818606b48d1d..d187323615ba3865dad8aaa5405bd338606d2861 100644 (file)
--- a/src/com/itmill/toolkit/demo/util/SampleDatabase.java
+++ b/src/com/itmill/toolkit/demo/util/SampleDatabase.java
@@ -135,7 +135,7 @@ public class SampleDatabase {
                                update(stmt);
                        }
                } catch (SQLException e) {
-                       if (!e.toString().contains("Table already exists"))
+                       if (e.toString().indexOf("Table already exists") != -1)
                                throw new RuntimeException(e);
                }
        }

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 58910db589ad8114200a6fe7704bdc5ebdbfc1a3..10973f8213417240980f117136774441d3c5901e 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -909,7 +909,7 @@ public class ApplicationServlet extends HttpServlet implements
                                        // description.xml files
                                        if (file.endsWith("firebug.js")
                                                        && !isDebugMode(unhandledParameters)) {
-                                               file = file.replace("bug.js", "bugx.js");
+                                               file = file.replaceFirst("bug.js", "bugx.js");
                                        }
                                        page.write(getResourceLocation(t.getName(),
                                                        new ThemeResource(file)));

diff --git a/src/com/itmill/toolkit/ui/select/ContainsFilter.java b/src/com/itmill/toolkit/ui/select/ContainsFilter.java
index 788c821043ef2308403b55271c319dc173878296..86130d46cb428349242d1736e0d3a533b7e67d0b 100644 (file)
--- a/src/com/itmill/toolkit/ui/select/ContainsFilter.java
+++ b/src/com/itmill/toolkit/ui/select/ContainsFilter.java
@@ -36,7 +36,7 @@ public class ContainsFilter implements OptionFilter {
                                else
                                        test = String.valueOf(id);
 
-                               if (test.toLowerCase().contains(filterstring)) {
+                               if (test.toLowerCase().indexOf(filterstring) != -1) {
                                        this.filteredItemsBuffer.add(id);
                                }
                        }