From 3cb61fb9371d81f2d3d7a51fb9f12348ef5c4fd5 Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Fri, 20 Apr 2007 12:11:34 +0000 Subject: [PATCH] JDK 1.4.x compatibility fix. Code did not work on JDK 1.4.x. svn changeset:1279/svn branch:trunk --- src/com/itmill/toolkit/demo/util/SampleDatabase.java | 2 +- src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 2 +- src/com/itmill/toolkit/ui/select/ContainsFilter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/itmill/toolkit/demo/util/SampleDatabase.java b/src/com/itmill/toolkit/demo/util/SampleDatabase.java index 4d2a805853..d187323615 100644 --- 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 58910db589..10973f8213 100644 --- 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 788c821043..86130d46cb 100644 --- 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); } } -- 2.39.5