litesoft

Explore

Commits

Diff Revisions 810 vs 811 for /trunk/Java/core/Anywhere/src/org/litesoft/uispecification/ParameterizedUriFragmentId.java

		@@ -2,7 +2,6 @@
2	2		package org.litesoft.uispecification;
3	3
4	4		import org.litesoft.core.typeutils.*;
5		-	import org.litesoft.core.util.*;
6	5
7	6		/**
8	7		* Parameter object for initializing screens. We will have many screens, so it
		@@ -122,7 +121,7 @@
122	121		for ( int i = 0; i < pString.length(); i++ )
123	122		{
124	123		char c = pString.charAt( i );
125		-	if ( !UtilsCommon.isAlphaNumeric( c ) && (-1 == pValidPunctuation.indexOf( c )) )
	124	+	if ( !Characters.isAlphaNumeric( c ) && (-1 == pValidPunctuation.indexOf( c )) )
126	125		{
127	126		throw new IllegalArgumentException( "Invalid character '" + c + "', at position " + i + ", in " + pWhat + ": " + pString );
128	127		}
		@@ -139,13 +138,13 @@
139	138		{
140	139		if ( null != (pString = Strings.noEmpty( pString )) )
141	140		{
142		-	if ( UtilsCommon.isAllUppercaseOrSpaces( pString ) )
	141	+	if ( Strings.isAllUppercaseOrSpaces( pString ) )
143	142		{
144	143		pString = pString.substring( 0, 1 ) + pString.substring( 1 ).toLowerCase();
145	144		}
146	145		for ( int i = 0; i < pString.length(); i++ )
147	146		{
148		-	if ( !UtilsCommon.isAlphaNumeric( pString.charAt( i ) ) )
	147	+	if ( !Characters.isAlphaNumeric( pString.charAt( i ) ) )
149	148		{
150	149		return transform( new StringBuilder( pString ), i ).toString();
151	150		}
		@@ -159,7 +158,7 @@
159	158		while ( i < pSB.length() )
160	159		{
161	160		char c = pSB.charAt( i );
162		-	if ( UtilsCommon.isAlphaNumeric( c ) )
	161	+	if ( Characters.isAlphaNumeric( c ) )
163	162		{
164	163		i++;
165	164		}