litesoft
Diff Revisions
803
vs
804
for /trunk/Java/core/Anywhere/src/org/litesoft/core/simpletypes/Rect.java
|
@@ -2,7 +2,7 @@ |
2 |
2 |
|
package org.litesoft.core.simpletypes; |
3 |
3 |
|
|
4 |
4 |
|
import org.litesoft.core.simpletypes.nonpublic.*; |
5 |
|
- |
import org.litesoft.core.util.*; |
|
5 |
+ |
import org.litesoft.core.typeutils.*; |
6 |
6 |
|
|
7 |
7 |
|
public final class Rect extends CompareSupport<Rect> implements SimpleType |
8 |
8 |
|
{ |
|
@@ -18,14 +18,14 @@ |
18 |
18 |
|
|
19 |
19 |
|
public Rect( PointXY pPointXY, SizeXY pSizeXY ) |
20 |
20 |
|
{ |
21 |
|
- |
UtilsCommon.assertNotNull( "PointXY", mPointXY = pPointXY ); |
22 |
|
- |
UtilsCommon.assertNotNull( "SizeXY", mSizeXY = pSizeXY ); |
|
21 |
+ |
Objects.assertNotNull( "PointXY", mPointXY = pPointXY ); |
|
22 |
+ |
Objects.assertNotNull( "SizeXY", mSizeXY = pSizeXY ); |
23 |
23 |
|
} |
24 |
24 |
|
|
25 |
25 |
|
public Rect( Line pLineX, Line pLineY ) |
26 |
26 |
|
{ |
27 |
|
- |
UtilsCommon.assertNotNull( "LineX", pLineX ); |
28 |
|
- |
UtilsCommon.assertNotNull( "LineY", pLineY ); |
|
27 |
+ |
Objects.assertNotNull( "LineX", pLineX ); |
|
28 |
+ |
Objects.assertNotNull( "LineY", pLineY ); |
29 |
29 |
|
mPointXY = new PointXY( pLineX.getOffset(), pLineY.getOffset() ); |
30 |
30 |
|
mSizeXY = new SizeXY( pLineX.getLength(), pLineY.getLength() ); |
31 |
31 |
|
} |