| |
@@ -1,14 +1,13 @@ |
| 1 |
1 |
|
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt |
| 2 |
2 |
|
package org.litesoft.render; |
| 3 |
3 |
|
|
| |
4 |
+ |
import java.util.*; |
| |
5 |
+ |
|
| 4 |
6 |
|
import org.litesoft.core.util.*; |
| 5 |
7 |
|
import org.litesoft.logger.nonpublic.*; |
| 6 |
8 |
|
import org.litesoft.uispecification.*; |
| 7 |
9 |
|
|
| 8 |
|
- |
import java.util.*; |
| 9 |
|
- |
|
| 10 |
|
- |
public abstract class AbstractRenderContainerHelper extends AbstractSizableRenderHelper |
| 11 |
|
- |
implements RenderContainerHelper |
| |
10 |
+ |
public abstract class AbstractRenderContainerHelper extends AbstractSizableRenderHelper implements RenderContainerHelper |
| 12 |
11 |
|
{ |
| 13 |
12 |
|
protected AbstractRenderContainerHelper( Object pRectangularRenderableObject, // |
| 14 |
13 |
|
RenderAccessor pRenderAccessor, // |
| |
@@ -16,15 +15,12 @@ |
| 16 |
15 |
|
RenderDimensionAdapter pDimensionAdapter, // |
| 17 |
16 |
|
RenderContainmentApproach pContainmentApproach ) |
| 18 |
17 |
|
{ |
| 19 |
|
- |
super( pRectangularRenderableObject, pRenderAccessor, pContainmentApproach.getSizingApproach(), |
| 20 |
|
- |
pParticipatingAdapter, pDimensionAdapter ); |
| |
18 |
+ |
super( pRectangularRenderableObject, pRenderAccessor, pContainmentApproach.getSizingApproach(), pParticipatingAdapter, pDimensionAdapter ); |
| 21 |
19 |
|
|
| 22 |
20 |
|
mContainmentApproach = RenderContainmentApproach.deNull( pContainmentApproach ); |
| 23 |
21 |
|
|
| 24 |
22 |
|
mDetermineNaturalSize = new DetermineNaturalSizeRHP( mRROname, this, // |
| 25 |
|
- |
mDetermineRectSizeNow, |
| 26 |
|
- |
new DetermineContainerNaturalChildSizesRHP( mRROname, |
| 27 |
|
- |
this ) ); |
| |
23 |
+ |
mDetermineRectSizeNow, new DetermineContainerNaturalChildSizesRHP( mRROname, this ) ); |
| 28 |
24 |
|
|
| 29 |
25 |
|
mDetermineContainerDecorationSize = new DetermineContainerDecorationSizeRHP( mRROname, this, // |
| 30 |
26 |
|
mDetermineRectSizeNow, // |
| |
@@ -39,8 +35,7 @@ |
| 39 |
35 |
|
mDetermineNaturalSize, // |
| 40 |
36 |
|
mLayoutContainer ); |
| 41 |
37 |
|
|
| 42 |
|
- |
DetermineContainerCurrentChildSizesRHP zCurrentChildSizesRHP = |
| 43 |
|
- |
new DetermineContainerCurrentChildSizesRHP( mRROname, this ); |
| |
38 |
+ |
DetermineContainerCurrentChildSizesRHP zCurrentChildSizesRHP = new DetermineContainerCurrentChildSizesRHP( mRROname, this ); |
| 44 |
39 |
|
|
| 45 |
40 |
|
if ( Overflow.None.equals( mContainmentApproach.getOverflow() ) ) |
| 46 |
41 |
|
{ |
| |
@@ -207,11 +202,9 @@ |
| 207 |
202 |
|
return RenderProcessResult.Terminated; |
| 208 |
203 |
|
} |
| 209 |
204 |
|
|
| 210 |
|
- |
protected final void logSizingErrorWithDecorationChange( AbstractLogger pLogger, int pExpectedSize, int pActualSize, |
| 211 |
|
- |
int zNewDecorationSize ) |
| |
205 |
+ |
protected final void logSizingErrorWithDecorationChange( AbstractLogger pLogger, int pExpectedSize, int pActualSize, int zNewDecorationSize ) |
| 212 |
206 |
|
{ |
| 213 |
|
- |
logSizingError( pLogger, pExpectedSize, pActualSize, |
| 214 |
|
- |
" Decoration was " + mDecorationSize + " != " + zNewDecorationSize + " now" ); |
| |
207 |
+ |
logSizingError( pLogger, pExpectedSize, pActualSize, " Decoration was " + mDecorationSize + " != " + zNewDecorationSize + " now" ); |
| 215 |
208 |
|
mDecorationSize = zNewDecorationSize; // Update the Decoration Size |
| 216 |
209 |
|
} |
| 217 |
210 |
|
|
| |
@@ -263,8 +256,7 @@ |
| 263 |
256 |
|
return null; |
| 264 |
257 |
|
} |
| 265 |
258 |
|
|
| 266 |
|
- |
abstract protected RenderProcessResult LLadjustChildSizesAfterLayout( |
| 267 |
|
- |
LayoutContainerRHP pLayoutContainerRHP, RenderHelper[] zChildHelpers ); |
| |
259 |
+ |
abstract protected RenderProcessResult LLadjustChildSizesAfterLayout( LayoutContainerRHP pLayoutContainerRHP, RenderHelper[] zChildHelpers ); |
| 268 |
260 |
|
|
| 269 |
261 |
|
public void childRemoved( Object pRectangularRenderableObject ) |
| 270 |
262 |
|
{ |
View this file contents
View the full history
Commits for