You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/03 14:49:01 UTC

svn commit: r581586 - /wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java

Author: gseitz
Date: Wed Oct  3 05:49:00 2007
New Revision: 581586

URL: http://svn.apache.org/viewvc?rev=581586&view=rev
Log:
replaced call to jdk1.5 String#replace(String, String) with jdk 1.4 String#replaceAll(String, String)

Modified:
    wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java

Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=581586&r1=581585&r2=581586&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Wed Oct  3 05:49:00 2007
@@ -192,8 +192,8 @@
 		String script = getAdditionalJavascript();
 		if (script != null)
 		{
-			variables.put("additionalJavascript", script.replace("${calendar}", "YAHOO.wicket."
-					+ widgetId + "DpJs"));
+			variables.put("additionalJavascript", script.replaceAll("\\$\\{calendar\\}",
+					"YAHOO.wicket." + widgetId + "DpJs"));
 		}
 		// print out the initialization properties
 		Properties p = new Properties();



Re: svn commit: r581586 - /wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java

Posted by Gerolf Seitz <ge...@gmail.com>.
thanks for the notice, frank.
applied the change.

gerolf

On 10/4/07, Frank Bille <fr...@apache.org> wrote:
>
> FYI, we also have our own replaceAll, which doesn't fire up the regex
> engine.
>
> Strings.replaceAll[1]
>
> Frank
>
> [1]:
>
> http://people.apache.org/~tobrien/wicket/apidocs/org/apache/wicket/util/string/Strings.html#replaceAll(java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.CharSequence)
>
>
> On 10/3/07, gseitz@apache.org <gs...@apache.org> wrote:
> >
> > Author: gseitz
> > Date: Wed Oct  3 05:49:00 2007
> > New Revision: 581586
> >
> > URL: http://svn.apache.org/viewvc?rev=581586&view=rev
> > Log:
> > replaced call to jdk1.5 String#replace(String, String) with jdk
> 1.4String#replaceAll(String, String)
> >
> > Modified:
> >     wicket/trunk/jdk-1.4
> >
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> >
> > Modified: wicket/trunk/jdk-1.4
> >
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> > URL:
> >
> http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=581586&r1=581585&r2=581586&view=diff
> >
> >
> ==============================================================================
> > --- wicket/trunk/jdk-1.4
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> > (original)
> > +++ wicket/trunk/jdk-1.4
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> > Wed Oct  3 05:49:00 2007
> > @@ -192,8 +192,8 @@
> >                 String script = getAdditionalJavascript();
> >                 if (script != null)
> >                 {
> > -                       variables.put("additionalJavascript",
> > script.replace("${calendar}", "YAHOO.wicket."
> > -                                       + widgetId + "DpJs"));
> > +                       variables.put("additionalJavascript",
> > script.replaceAll("\\$\\{calendar\\}",
> > +                                       "YAHOO.wicket." + widgetId +
> > "DpJs"));
> >                 }
> >                 // print out the initialization properties
> >                 Properties p = new Properties();
> >
> >
> >
>

Re: svn commit: r581586 - /wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java

Posted by Frank Bille <fr...@apache.org>.
FYI, we also have our own replaceAll, which doesn't fire up the regex
engine.

Strings.replaceAll[1]

Frank

[1]:
http://people.apache.org/~tobrien/wicket/apidocs/org/apache/wicket/util/string/Strings.html#replaceAll(java.lang.CharSequence,%20java.lang.CharSequence,%20java.lang.CharSequence)


On 10/3/07, gseitz@apache.org <gs...@apache.org> wrote:
>
> Author: gseitz
> Date: Wed Oct  3 05:49:00 2007
> New Revision: 581586
>
> URL: http://svn.apache.org/viewvc?rev=581586&view=rev
> Log:
> replaced call to jdk1.5 String#replace(String, String) with jdk 1.4String#replaceAll(String, String)
>
> Modified:
>     wicket/trunk/jdk-1.4
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
>
> Modified: wicket/trunk/jdk-1.4
> /wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> URL:
> http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=581586&r1=581585&r2=581586&view=diff
>
> ==============================================================================
> --- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> (original)
> +++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
> Wed Oct  3 05:49:00 2007
> @@ -192,8 +192,8 @@
>                 String script = getAdditionalJavascript();
>                 if (script != null)
>                 {
> -                       variables.put("additionalJavascript",
> script.replace("${calendar}", "YAHOO.wicket."
> -                                       + widgetId + "DpJs"));
> +                       variables.put("additionalJavascript",
> script.replaceAll("\\$\\{calendar\\}",
> +                                       "YAHOO.wicket." + widgetId +
> "DpJs"));
>                 }
>                 // print out the initialization properties
>                 Properties p = new Properties();
>
>
>