litesoft
Diff Revisions
803
vs
804
for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/RectangleContainmentStrategy.java
|
@@ -2,6 +2,7 @@ |
2 |
2 |
|
package org.litesoft.core.util; |
3 |
3 |
|
|
4 |
4 |
|
import org.litesoft.core.simpletypes.*; |
|
5 |
+ |
import org.litesoft.core.typeutils.*; |
5 |
6 |
|
|
6 |
7 |
|
public abstract class RectangleContainmentStrategy |
7 |
8 |
|
{ |
|
@@ -20,8 +21,8 @@ |
20 |
21 |
|
*/ |
21 |
22 |
|
public Rect adjustToFitIn( Rect pRect, Rect pContainer ) |
22 |
23 |
|
{ |
23 |
|
- |
UtilsCommon.assertNotNull( "Rect", pRect ); |
24 |
|
- |
UtilsCommon.assertNotNull( "Container", pContainer ); |
|
24 |
+ |
Objects.assertNotNull( "Rect", pRect ); |
|
25 |
+ |
Objects.assertNotNull( "Container", pContainer ); |
25 |
26 |
|
|
26 |
27 |
|
return pContainer.obscures( pRect ) ? // |
27 |
28 |
|
pRect : // |