litesoft
Diff Revisions
821
vs
822
for /trunk/Java/core/Anywhere/src/org/litesoft/core/hierarchicaldata/HDSMap.java
|
@@ -5,7 +5,6 @@ |
5 |
5 |
|
import java.util.*; |
6 |
6 |
|
|
7 |
7 |
|
import org.litesoft.core.typeutils.*; |
8 |
|
- |
import org.litesoft.core.util.*; |
9 |
8 |
|
|
10 |
9 |
|
/** |
11 |
10 |
|
* A Map 'like' class that is type safe for <String,String>, <String,HDSList>, & <String,HDSMap>. |
|
@@ -223,7 +222,7 @@ |
223 |
222 |
|
{ |
224 |
223 |
|
if ( null == (rv = zEntry.getValueAsLocalString()) ) |
225 |
224 |
|
{ |
226 |
|
- |
throw new IllegalArgumentException( "Expected Leaf, but not Leaf at: " + UtilsCommon.toString( pPath, "/" ) ); |
|
225 |
+ |
throw new IllegalArgumentException( "Expected Leaf, but not Leaf at: " + Objects.toString( pPath, "/" ) ); |
227 |
226 |
|
} |
228 |
227 |
|
} |
229 |
228 |
|
mNameEntries.put( zName, new Entry( this, zName, pValue ) ); |
|
@@ -234,7 +233,7 @@ |
234 |
233 |
|
{ |
235 |
234 |
|
if ( null == (zChildTree = zEntry.getValueAsChildMap()) ) |
236 |
235 |
|
{ |
237 |
|
- |
throw new IllegalArgumentException( "Non Leaf of Path (@ " + pIndex + "), not a HDSMap, Path: " + UtilsCommon.toString( pPath, "/" ) ); |
|
236 |
+ |
throw new IllegalArgumentException( "Non Leaf of Path (@ " + pIndex + "), not a HDSMap, Path: " + Objects.toString( pPath, "/" ) ); |
238 |
237 |
|
} |
239 |
238 |
|
} |
240 |
239 |
|
else |
|
@@ -273,7 +272,7 @@ |
273 |
272 |
|
String rv = zEntry.getValueAsLocalString(); |
274 |
273 |
|
if ( rv == null ) |
275 |
274 |
|
{ |
276 |
|
- |
throw new IllegalArgumentException( "Expected Leaf, but not Leaf at: " + UtilsCommon.toString( pPath, "/" ) ); |
|
275 |
+ |
throw new IllegalArgumentException( "Expected Leaf, but not Leaf at: " + Objects.toString( pPath, "/" ) ); |
277 |
276 |
|
} |
278 |
277 |
|
mNameEntries.remove( zName ); // Remove Entry |
279 |
278 |
|
return rv; |