Author: ivaynberg
Date: Tue Nov 14 09:13:13 2006
New Revision: 474875
URL: http://svn.apache.org/viewvc?view=rev&rev=474875
Log:
remove 1.5 dependent code
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/CheckGroup.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/Strings.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/CheckGroup.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/CheckGroup.java?view=diff&rev=474875&r1=474874&r2=474875
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/CheckGroup.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/CheckGroup.java
Tue Nov 14 09:13:13 2006
@@ -29,6 +29,7 @@
import wicket.model.IModel;
import wicket.model.Model;
import wicket.util.convert.ConversionException;
+import wicket.util.string.Strings;
/**
* Component used to connect instances of Check components into a group.
@@ -140,7 +141,7 @@
{
throw new
WicketRuntimeException(
"submitted http
post value ["
-
+ Arrays.toString(values)
+
+ Strings.join(",", values)
+ "] for CheckGroup component ["
+ getPath()
+ "] contains an illegal relative path "
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/Strings.java?view=diff&rev=474875&r1=474874&r2=474875
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/Strings.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/string/Strings.java
Tue Nov 14 09:13:13 2006
@@ -1167,9 +1167,63 @@
}
/**
+ * Joins string fragments using the specified separator
+ *
+ * @param separator
+ * @param fragments
+ * @return combined fragments
+ */
+ public static String join(String separator, String[] fragments)
+ {
+ if (fragments.length < 1)
+ {
+ // no elements
+ return "";
+ }
+ else if (fragments.length < 2)
+ {
+ // single element
+ return fragments[0];
+ }
+ else
+ {
+ // two or more elements
+ StringBuilder buff = new StringBuilder(128);
+ if (fragments[0] != null)
+ {
+ buff.append(fragments[0]);
+ }
+ for (int i = 1; i < fragments.length; i++)
+ {
+ if ((fragments[i - 1] != null) ||
(fragments[i] != null))
+ {
+ boolean lhsClosed = fragments[i -
1].endsWith(separator);
+ boolean rhsClosed =
fragments[i].startsWith(separator);
+ if (lhsClosed && rhsClosed)
+ {
+
buff.append(fragments[i].substring(1));
+ }
+ else if (!lhsClosed && !rhsClosed)
+ {
+
buff.append(separator).append(fragments[i]);
+ }
+ else
+ {
+ buff.append(fragments[i]);
+ }
+ }
+ }
+ return buff.toString();
+ }
+ }
+
+
+ /**
* Private constructor prevents construction.
*/
private Strings()
{
}
+
+
}
