Updated Branches: refs/heads/master 33f3f1214 -> b99b68d34
minor javadoc corrections, replaced dot with colon for component path separator in javadoc and tests Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b99b68d3 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b99b68d3 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b99b68d3 Branch: refs/heads/master Commit: b99b68d341b662feea2500c20c2bc58d8052e1c8 Parents: 33f3f12 Author: svenmeier <[email protected]> Authored: Wed Dec 19 11:28:52 2012 +0100 Committer: svenmeier <[email protected]> Committed: Wed Dec 19 11:28:52 2012 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 2 +- .../org/apache/wicket/util/string/Strings.java | 4 +- .../org/apache/wicket/util/string/StringsTest.java | 28 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/b99b68d3/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index 77c7a3a..41a6c36 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -1729,7 +1729,7 @@ public abstract class Component } /** - * Gets the path to this component relative to its containing page, i.e. without trailing page + * Gets the path to this component relative to its containing page, i.e. without leading page * id. * * @return The path to this component relative to the page it is in http://git-wip-us.apache.org/repos/asf/wicket/blob/b99b68d3/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java index c04e1fb..81e96da 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java @@ -127,8 +127,8 @@ public final class Strings * Gets everything after the first path component of a path using a given separator. If the * separator cannot be found, an empty String is returned. * <p> - * For example, afterFirstPathComponent("foo.bar.baz", '.') would return "bar.baz" and - * afterFirstPathComponent("foo", '.') would return "". + * For example, afterFirstPathComponent("foo:bar:baz", ':') would return "bar:baz" and + * afterFirstPathComponent("foo", ':') would return "". * * @param path * The path to parse http://git-wip-us.apache.org/repos/asf/wicket/blob/b99b68d3/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java index 5e014ff..182b476 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java @@ -90,20 +90,20 @@ public class StringsTest extends Assert @Test public void test() { - Assert.assertEquals("foo", Strings.lastPathComponent("bar.garply.foo", '.')); - Assert.assertEquals("foo", Strings.lastPathComponent("foo", '.')); - Assert.assertEquals("bar", Strings.firstPathComponent("bar.garply.foo", '.')); - Assert.assertEquals("foo", Strings.lastPathComponent("foo", '.')); - Assert.assertEquals("garply.foo", Strings.afterFirstPathComponent("bar.garply.foo", '.')); - Assert.assertEquals("", Strings.afterFirstPathComponent("foo", '.')); - Assert.assertEquals("bar.baz", Strings.beforeLast("bar.baz.foo", '.')); - Assert.assertEquals("", Strings.beforeLast("bar", '.')); - Assert.assertEquals("bar", Strings.beforeFirst("bar.baz.foo", '.')); - Assert.assertEquals("", Strings.beforeFirst("bar", '.')); - Assert.assertEquals("baz.foo", Strings.afterFirst("bar.baz.foo", '.')); - Assert.assertEquals("", Strings.afterFirst("bar", '.')); - Assert.assertEquals("foo", Strings.afterLast("bar.baz.foo", '.')); - Assert.assertEquals("", Strings.afterLast("bar", '.')); + Assert.assertEquals("foo", Strings.lastPathComponent("bar:garply:foo", ':')); + Assert.assertEquals("foo", Strings.lastPathComponent("foo", ':')); + Assert.assertEquals("bar", Strings.firstPathComponent("bar:garply:foo", ':')); + Assert.assertEquals("foo", Strings.lastPathComponent("foo", ':')); + Assert.assertEquals("garply:foo", Strings.afterFirstPathComponent("bar:garply:foo", ':')); + Assert.assertEquals("", Strings.afterFirstPathComponent("foo", ':')); + Assert.assertEquals("bar:baz", Strings.beforeLast("bar:baz:foo", ':')); + Assert.assertEquals("", Strings.beforeLast("bar", ':')); + Assert.assertEquals("bar", Strings.beforeFirst("bar:baz:foo", ':')); + Assert.assertEquals("", Strings.beforeFirst("bar", ':')); + Assert.assertEquals("baz:foo", Strings.afterFirst("bar:baz:foo", ':')); + Assert.assertEquals("", Strings.afterFirst("bar", ':')); + Assert.assertEquals("foo", Strings.afterLast("bar:baz:foo", ':')); + Assert.assertEquals("", Strings.afterLast("bar", ':')); Assert.assertEquals("foo", Strings.replaceAll("afaooaaa", "a", "").toString()); Assert.assertEquals("fuzzyffuzzyoofuzzyfuzzyfuzzy", Strings.replaceAll("afaooaaa", "a", "fuzzy").toString());
