litesoft
Diff Revisions
803
vs
804
for /trunk/Java/core/Anywhere/src/org/litesoft/core/ClassToInstanceMapperImpl.java
|
@@ -3,7 +3,7 @@ |
3 |
3 |
|
|
4 |
4 |
|
import java.util.*; |
5 |
5 |
|
|
6 |
|
- |
import org.litesoft.core.util.*; |
|
6 |
+ |
import org.litesoft.core.typeutils.*; |
7 |
7 |
|
|
8 |
8 |
|
public class ClassToInstanceMapperImpl implements ClassToInstanceMapper |
9 |
9 |
|
{ |
|
@@ -32,7 +32,7 @@ |
32 |
32 |
|
*/ |
33 |
33 |
|
public void setNoInstanceFactory( NoInstanceFactory<?> pFactory ) |
34 |
34 |
|
{ |
35 |
|
- |
UtilsCommon.assertNotNull( "NoInstanceFactory", pFactory ); |
|
35 |
+ |
Objects.assertNotNull( "NoInstanceFactory", pFactory ); |
36 |
36 |
|
Class<?> zClass = pFactory.getFor(); |
37 |
37 |
|
assertClass( zClass ); |
38 |
38 |
|
synchronized ( this ) |
|
@@ -190,12 +190,12 @@ |
190 |
190 |
|
|
191 |
191 |
|
private void assertClass( Class<?> pClass ) |
192 |
192 |
|
{ |
193 |
|
- |
UtilsCommon.assertNotNull( "Class (key)", pClass ); |
|
193 |
+ |
Objects.assertNotNull( "Class (key)", pClass ); |
194 |
194 |
|
} |
195 |
195 |
|
|
196 |
196 |
|
private void assertClassAndInstance( Class<?> pClass, Object pInstance ) |
197 |
197 |
|
{ |
198 |
198 |
|
assertClass( pClass ); |
199 |
|
- |
UtilsCommon.assertNotNull( "pInstance (value)", pInstance ); |
|
199 |
+ |
Objects.assertNotNull( "pInstance (value)", pInstance ); |
200 |
200 |
|
} |
201 |
201 |
|
} |