litesoft
Diff Revisions
49
vs
801
for /trunk/Java/core/Anywhere/src/org/litesoft/uispecification/ParameterizedUriFragmentId.java
|
@@ -1,6 +1,7 @@ |
1 |
1 |
|
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt |
2 |
2 |
|
package org.litesoft.uispecification; |
3 |
3 |
|
|
|
4 |
+ |
import org.litesoft.core.typeutils.*; |
4 |
5 |
|
import org.litesoft.core.util.*; |
5 |
6 |
|
|
6 |
7 |
|
/** |
|
@@ -47,8 +48,8 @@ |
47 |
48 |
|
public ParameterizedUriFragmentId( String pFragmentReference, String pParameters ) |
48 |
49 |
|
throws IllegalArgumentException |
49 |
50 |
|
{ |
50 |
|
- |
mFragmentReference = UtilsCommon.noEmpty( pFragmentReference ); |
51 |
|
- |
if ( null != (mParameters = UtilsCommon.noEmpty( pParameters )) ) |
|
51 |
+ |
mFragmentReference = Strings.noEmpty( pFragmentReference ); |
|
52 |
+ |
if ( null != (mParameters = Strings.noEmpty( pParameters )) ) |
52 |
53 |
|
{ |
53 |
54 |
|
validateFragmentReference( mFragmentReference ); |
54 |
55 |
|
validateParams( mParameters ); |
|
@@ -58,7 +59,7 @@ |
58 |
59 |
|
public ParameterizedUriFragmentId( String pUriFragmentId ) |
59 |
60 |
|
throws IllegalArgumentException |
60 |
61 |
|
{ |
61 |
|
- |
if ( null != (pUriFragmentId = UtilsCommon.noEmpty( pUriFragmentId )) ) |
|
62 |
+ |
if ( null != (pUriFragmentId = Strings.noEmpty( pUriFragmentId )) ) |
62 |
63 |
|
{ |
63 |
64 |
|
int at = pUriFragmentId.indexOf( PARTS_SEP ); |
64 |
65 |
|
if ( at == -1 ) |
|
@@ -67,8 +68,8 @@ |
67 |
68 |
|
} |
68 |
69 |
|
else |
69 |
70 |
|
{ |
70 |
|
- |
validateFragmentReference( mFragmentReference = UtilsCommon.noEmpty( pUriFragmentId.substring( 0, at ) ) ); |
71 |
|
- |
if ( null != (mParameters = UtilsCommon.noEmpty( pUriFragmentId.substring( at + 1 ) )) ) |
|
71 |
+ |
validateFragmentReference( mFragmentReference = Strings.noEmpty( pUriFragmentId.substring( 0, at ) ) ); |
|
72 |
+ |
if ( null != (mParameters = Strings.noEmpty( pUriFragmentId.substring( at + 1 ) )) ) |
72 |
73 |
|
{ |
73 |
74 |
|
validateParams( mParameters ); |
74 |
75 |
|
} |
|
@@ -136,7 +137,7 @@ |
136 |
137 |
|
*/ |
137 |
138 |
|
public static String transformToValidFragmentReference( String pString ) |
138 |
139 |
|
{ |
139 |
|
- |
if ( null != (pString = UtilsCommon.noEmpty( pString )) ) |
|
140 |
+ |
if ( null != (pString = Strings.noEmpty( pString )) ) |
140 |
141 |
|
{ |
141 |
142 |
|
if ( UtilsCommon.isAllUppercaseOrSpaces( pString ) ) |
142 |
143 |
|
{ |