Author: mgrigorov
Date: Wed Aug 24 13:45:00 2011
New Revision: 1161098
URL: http://svn.apache.org/viewvc?rev=1161098&view=rev
Log:
WICKET-3988 Make AbstractMapper.getPlaceholder and similar methods as public
methods
Remove 'static' from the methods.
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=1161098&r1=1161097&r2=1161098&view=diff
==============================================================================
---
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
Wed Aug 24 13:45:00 2011
@@ -37,7 +37,7 @@ public abstract class AbstractMapper imp
* @param s
* @return placeholder key or <code>null</code> if string is not in
right format
*/
- protected static String getPlaceholder(final String s)
+ protected String getPlaceholder(final String s)
{
return getPlaceholder(s, '$');
}
@@ -49,7 +49,7 @@ public abstract class AbstractMapper imp
* @param s
* @return placeholder key or <code>null</code> if string is not in
right format
*/
- protected static String getOptionalPlaceholder(final String s)
+ protected String getOptionalPlaceholder(final String s)
{
return getPlaceholder(s, '#');
}
@@ -63,7 +63,7 @@ public abstract class AbstractMapper imp
* the character used to indicate the start of the
placeholder
* @return placeholder key or <code>null</code> if string is not in
right format
*/
- protected static String getPlaceholder(final String s, char startChar)
+ protected String getPlaceholder(final String s, char startChar)
{
if ((s == null) || (s.length() < 4) || !s.startsWith(startChar
+ "{") || !s.endsWith("}"))
{
