|
@@ -1,12 +1,9 @@ |
1 |
1 |
|
package org.litesoft.GWT.client.widgets; |
2 |
2 |
|
|
3 |
|
- |
import org.litesoft.commonfoundation.html.*; |
4 |
|
- |
import org.litesoft.commonfoundation.typeutils.*; |
5 |
|
- |
|
6 |
|
- |
import java.util.*; |
7 |
|
- |
|
8 |
3 |
|
import org.litesoft.GWT.client.*; |
9 |
4 |
|
import org.litesoft.GWT.client.widgets.nonpublic.*; |
|
5 |
+ |
import org.litesoft.commonfoundation.html.*; |
|
6 |
+ |
import org.litesoft.commonfoundation.typeutils.*; |
10 |
7 |
|
import org.litesoft.core.delayed.*; |
11 |
8 |
|
import org.litesoft.core.simpletypes.*; |
12 |
9 |
|
|
|
@@ -14,6 +11,8 @@ |
14 |
11 |
|
import com.google.gwt.event.dom.client.*; |
15 |
12 |
|
import com.google.gwt.user.client.ui.*; |
16 |
13 |
|
|
|
14 |
+ |
import java.util.*; |
|
15 |
+ |
|
17 |
16 |
|
import static org.litesoft.GWT.client.widgets.nonpublic.InjectionPointSelectorController.*; |
18 |
17 |
|
|
19 |
18 |
|
/** |
|
@@ -35,10 +34,8 @@ |
35 |
34 |
|
* ************************************************************************************************* |
36 |
35 |
|
* </pre> |
37 |
36 |
|
*/ |
38 |
|
- |
public class InjectionPointSelector<T extends Synopsisable> extends SizeableHorizontalPanel |
39 |
|
- |
{ |
40 |
|
- |
public interface Callback<U extends Synopsisable> |
41 |
|
- |
{ |
|
37 |
+ |
public class InjectionPointSelector<T extends Synopsisable> extends SizeableHorizontalPanel { |
|
38 |
+ |
public interface Callback<U extends Synopsisable> { |
42 |
39 |
|
public void injectBetween( U pLowerBound, U pUpperBound ); |
43 |
40 |
|
} |
44 |
41 |
|
|
|
@@ -51,20 +48,18 @@ |
51 |
48 |
|
|
52 |
49 |
|
private InjectionPointSelectorController<T> mController; |
53 |
50 |
|
|
54 |
|
- |
public InjectionPointSelector( int pSynopsisLines, List<T> pInjectIns, final Callback<T> pCallback ) |
55 |
|
- |
{ |
|
51 |
+ |
public InjectionPointSelector( int pSynopsisLines, List<T> pInjectIns, final Callback<T> pCallback ) { |
56 |
52 |
|
stretchable(); |
57 |
53 |
|
addStyleName( "InjectionPointSelector" ); |
58 |
54 |
|
|
59 |
55 |
|
mVerticalSpacer = HTMLize.escapeNoWrap( Strings.makeNonBlankLines( null, pSynopsisLines ) ); |
60 |
56 |
|
|
61 |
|
- |
final LayoutPanel zLayoutCtrlPanel = new LayoutPanel( new UserCtrlPanel().with( new Spacer().width( 280 ), new Label( "Loading..." ), new Spacer().width( 280 ) ) ); |
|
57 |
+ |
final LayoutPanel zLayoutCtrlPanel = |
|
58 |
+ |
new LayoutPanel( new UserCtrlPanel().with( new Spacer().width( 280 ), new Label( "Loading..." ), new Spacer().width( 280 ) ) ); |
62 |
59 |
|
|
63 |
|
- |
HeightManager.Callback zHeightManagerCallback = new HeightManager.Callback() |
64 |
|
- |
{ |
|
60 |
+ |
HeightManager.Callback zHeightManagerCallback = new HeightManager.Callback() { |
65 |
61 |
|
@Override |
66 |
|
- |
public void panelsVisible( int pCount, int pPanelHeight ) |
67 |
|
- |
{ |
|
62 |
+ |
public void panelsVisible( int pCount, int pPanelHeight ) { |
68 |
63 |
|
System.out.println( "InjectionPointSelector.panelsVisible: " + pCount + " w/ height " + pPanelHeight ); |
69 |
64 |
|
mPanelHeight = pPanelHeight; |
70 |
65 |
|
mController.updateForEntriesVisible( pCount ); |
|
@@ -77,28 +72,22 @@ |
77 |
72 |
|
add( new Spacer().style( "RightSpacer" ) ); |
78 |
73 |
|
add( new HeightManager( mVerticalSpacer, null ) ); |
79 |
74 |
|
|
80 |
|
- |
mController = new InjectionPointSelectorController<T>( pSynopsisLines, pInjectIns, new View<T>() |
81 |
|
- |
{ |
82 |
|
- |
@Override public void injectBetween( T pLowerBound, T pUpperBound ) |
83 |
|
- |
{ |
|
75 |
+ |
mController = new InjectionPointSelectorController<T>( pSynopsisLines, pInjectIns, new View<T>() { |
|
76 |
+ |
@Override |
|
77 |
+ |
public void injectBetween( T pLowerBound, T pUpperBound ) { |
84 |
78 |
|
pCallback.injectBetween( pLowerBound, pUpperBound ); |
85 |
79 |
|
} |
86 |
80 |
|
|
87 |
81 |
|
@Override |
88 |
|
- |
public void notEnoughVisibleEntries() |
89 |
|
- |
{ |
|
82 |
+ |
public void notEnoughVisibleEntries() { |
90 |
83 |
|
zLayoutCtrlPanel.message( "Insufficient Space to Show Selectors" ); |
91 |
84 |
|
} |
92 |
85 |
|
|
93 |
86 |
|
@Override |
94 |
|
- |
public void show( DrillDownSet pDrillDownSet ) |
95 |
|
- |
{ |
96 |
|
- |
if ( 15 > mPanelHeight ) |
97 |
|
- |
{ |
|
87 |
+ |
public void show( DrillDownSet pDrillDownSet ) { |
|
88 |
+ |
if ( 15 > mPanelHeight ) { |
98 |
89 |
|
zLayoutCtrlPanel.message( "Panel Height? 15 > " + mPanelHeight ); |
99 |
|
- |
} |
100 |
|
- |
else |
101 |
|
- |
{ |
|
90 |
+ |
} else { |
102 |
91 |
|
zLayoutCtrlPanel.userCtrlPanel( createUserCtrlPanel( pDrillDownSet ) ); |
103 |
92 |
|
} |
104 |
93 |
|
zLayoutCtrlPanel.relayoutFromHereDown(); |
|
@@ -107,23 +96,19 @@ |
107 |
96 |
|
} |
108 |
97 |
|
|
109 |
98 |
|
@Override |
110 |
|
- |
public void setHeight( String height ) |
111 |
|
- |
{ |
|
99 |
+ |
public void setHeight( String height ) { |
112 |
100 |
|
super.setHeight( height ); |
113 |
101 |
|
mHeightManager.possibleHeightAdjustment(); |
114 |
102 |
|
} |
115 |
103 |
|
|
116 |
|
- |
private static class HeightManager extends BorderedVerticalPanel |
117 |
|
- |
{ |
118 |
|
- |
public interface Callback |
119 |
|
- |
{ |
|
104 |
+ |
private static class HeightManager extends BorderedVerticalPanel { |
|
105 |
+ |
public interface Callback { |
120 |
106 |
|
public void panelsVisible( int pCount, int pPanelHeight ); |
121 |
107 |
|
} |
122 |
108 |
|
|
123 |
109 |
|
private Callback mCallback; |
124 |
110 |
|
|
125 |
|
- |
public HeightManager( String pVerticalSpacer, Callback pCallback ) |
126 |
|
- |
{ |
|
111 |
+ |
public HeightManager( String pVerticalSpacer, Callback pCallback ) { |
127 |
112 |
|
super( pVerticalSpacer, "HeightManager" ); |
128 |
113 |
|
mCallback = pCallback; |
129 |
114 |
|
|
|
@@ -137,50 +122,40 @@ |
137 |
122 |
|
addHiddenEmptyPanel(); |
138 |
123 |
|
} |
139 |
124 |
|
|
140 |
|
- |
public void possibleHeightAdjustment() |
141 |
|
- |
{ |
|
125 |
+ |
public void possibleHeightAdjustment() { |
142 |
126 |
|
mTask.trigger(); |
143 |
127 |
|
} |
144 |
128 |
|
|
145 |
|
- |
private Task mTask = new Task( TimedRunnableManager.INSTANCE, 20 ) |
146 |
|
- |
{ |
|
129 |
+ |
private Task mTask = new Task( TimedRunnableManager.INSTANCE, 20 ) { |
147 |
130 |
|
private Integer mPanelHeight = null; |
148 |
131 |
|
|
149 |
132 |
|
@Override |
150 |
|
- |
protected boolean reRunWhenTriggeredAndCurrentlyRunning() |
151 |
|
- |
{ |
|
133 |
+ |
protected boolean reRunWhenTriggeredAndCurrentlyRunning() { |
152 |
134 |
|
return true; |
153 |
135 |
|
} |
154 |
136 |
|
|
155 |
137 |
|
@Override |
156 |
|
- |
protected boolean preconditionsSatisfied() |
157 |
|
- |
{ |
158 |
|
- |
if ( isAttached() ) |
159 |
|
- |
{ |
|
138 |
+ |
protected boolean preconditionsSatisfied() { |
|
139 |
+ |
if ( isAttached() ) { |
160 |
140 |
|
Element zElement = getElement(); |
161 |
141 |
|
int zOurHeight = zElement.getOffsetHeight(); |
162 |
142 |
|
int zAvailableHeight = getParent().getOffsetHeight(); |
163 |
|
- |
if ( (zOurHeight > 10) && (zAvailableHeight > 10) ) |
164 |
|
- |
{ |
165 |
|
- |
if ( mPanelHeight == null ) |
166 |
|
- |
{ |
|
143 |
+ |
if ( (zOurHeight > 10) && (zAvailableHeight > 10) ) { |
|
144 |
+ |
if ( mPanelHeight == null ) { |
167 |
145 |
|
WidgetCollection zChildren = getChildren(); |
168 |
146 |
|
int z2ndAt = zChildren.get( 1 ).getAbsoluteTop(); |
169 |
147 |
|
int z3rdAt = zChildren.get( 2 ).getAbsoluteTop(); |
170 |
148 |
|
int zPanelHeight = z3rdAt - z2ndAt; |
171 |
|
- |
if ( zPanelHeight <= 10 ) |
172 |
|
- |
{ |
|
149 |
+ |
if ( zPanelHeight <= 10 ) { |
173 |
150 |
|
return false; |
174 |
151 |
|
} |
175 |
152 |
|
mPanelHeight = zPanelHeight; |
176 |
153 |
|
} |
177 |
154 |
|
int zOurMinimumHeight = zAvailableHeight + mPanelHeight; |
178 |
|
- |
if ( zOurMinimumHeight <= zOurHeight ) |
179 |
|
- |
{ |
|
155 |
+ |
if ( zOurMinimumHeight <= zOurHeight ) { |
180 |
156 |
|
return true; |
181 |
157 |
|
} |
182 |
|
- |
do |
183 |
|
- |
{ |
|
158 |
+ |
do { |
184 |
159 |
|
addHiddenEmptyPanel(); |
185 |
160 |
|
zOurHeight += mPanelHeight; |
186 |
161 |
|
} |
|
@@ -191,18 +166,15 @@ |
191 |
166 |
|
} |
192 |
167 |
|
|
193 |
168 |
|
@Override |
194 |
|
- |
protected boolean execute() |
195 |
|
- |
{ |
|
169 |
+ |
protected boolean execute() { |
196 |
170 |
|
int zAvailableHeight = getParent().getOffsetHeight(); |
197 |
171 |
|
int zOurTop = getAbsoluteTop(); |
198 |
172 |
|
WidgetCollection zChildren = getChildren(); |
199 |
173 |
|
int zChildCount = zChildren.size(); |
200 |
174 |
|
int i = 1; |
201 |
|
- |
for (; i < zChildCount; i++ ) |
202 |
|
- |
{ |
|
175 |
+ |
for (; i < zChildCount; i++ ) { |
203 |
176 |
|
int zNthAt = zChildren.get( i ).getAbsoluteTop() - zOurTop; |
204 |
|
- |
if ( zAvailableHeight <= zNthAt ) |
205 |
|
- |
{ |
|
177 |
+ |
if ( zAvailableHeight <= zNthAt ) { |
206 |
178 |
|
break; |
207 |
179 |
|
} |
208 |
180 |
|
} |
|
@@ -212,40 +184,33 @@ |
212 |
184 |
|
}; |
213 |
185 |
|
} |
214 |
186 |
|
|
215 |
|
- |
private static class BorderedVerticalPanel extends SizeableVerticalPanel |
216 |
|
- |
{ |
|
187 |
+ |
private static class BorderedVerticalPanel extends SizeableVerticalPanel { |
217 |
188 |
|
protected final String mVerticalSpacer; |
218 |
189 |
|
private boolean mFirstAdded = false; |
219 |
190 |
|
|
220 |
|
- |
public BorderedVerticalPanel( String pVerticalSpacer, String pClassName ) |
221 |
|
- |
{ |
|
191 |
+ |
public BorderedVerticalPanel( String pVerticalSpacer, String pClassName ) { |
222 |
192 |
|
mVerticalSpacer = pVerticalSpacer; |
223 |
193 |
|
addStyleName( pClassName ); |
224 |
194 |
|
setVerticalAlignment( HasVerticalAlignment.ALIGN_TOP ); |
225 |
195 |
|
} |
226 |
196 |
|
|
227 |
|
- |
public void addHiddenFirstEmptyPanel() |
228 |
|
- |
{ |
|
197 |
+ |
public void addHiddenFirstEmptyPanel() { |
229 |
198 |
|
add( new HTML( mVerticalSpacer ), true, true ); |
230 |
199 |
|
} |
231 |
200 |
|
|
232 |
|
- |
public void addHiddenEmptyPanel() |
233 |
|
- |
{ |
|
201 |
+ |
public void addHiddenEmptyPanel() { |
234 |
202 |
|
add( new HTML( mVerticalSpacer ), true, false ); |
235 |
203 |
|
} |
236 |
204 |
|
|
237 |
|
- |
private void add( Widget w, boolean pHidden, boolean pTriggerFirst ) |
238 |
|
- |
{ |
|
205 |
+ |
private void add( Widget w, boolean pHidden, boolean pTriggerFirst ) { |
239 |
206 |
|
super.add( w ); |
240 |
207 |
|
Element zElement = w.getElement(); |
241 |
|
- |
if ( pHidden ) |
242 |
|
- |
{ |
|
208 |
+ |
if ( pHidden ) { |
243 |
209 |
|
CommonElementHelper.hide( zElement ); |
244 |
210 |
|
} |
245 |
211 |
|
Element zTD = zElement.getParentElement(); |
246 |
212 |
|
zTD.addClassName( "Row" ); |
247 |
|
- |
if ( pTriggerFirst && !mFirstAdded ) |
248 |
|
- |
{ |
|
213 |
+ |
if ( pTriggerFirst && !mFirstAdded ) { |
249 |
214 |
|
mFirstAdded = true; |
250 |
215 |
|
Element zTR = zTD.getParentElement(); |
251 |
216 |
|
zTR.addClassName( "First" ); |
|
@@ -253,8 +218,7 @@ |
253 |
218 |
|
} |
254 |
219 |
|
|
255 |
220 |
|
@Override |
256 |
|
- |
public void add( Widget w ) |
257 |
|
- |
{ |
|
221 |
+ |
public void add( Widget w ) { |
258 |
222 |
|
add( w, false, true ); |
259 |
223 |
|
} |
260 |
224 |
|
} |
|
@@ -274,117 +238,103 @@ |
274 |
238 |
|
// " </head>\n" + // |
275 |
239 |
|
// " <body>\n" + // |
276 |
240 |
|
// " <table border=0 cellpadding=0 cellspacing=0>\n" + // |
277 |
|
- |
// " <tr class='First'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
278 |
|
- |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
279 |
|
- |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
280 |
|
- |
// " <tr class='Not'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
281 |
|
- |
// " <tr class='Not'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
282 |
|
- |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
283 |
|
- |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
241 |
+ |
// " <tr class='First'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
242 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
243 |
+ |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
244 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
245 |
+ |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
246 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
247 |
+ |
// " <tr class='Not'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
248 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
249 |
+ |
// " <tr class='Not'><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
250 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
251 |
+ |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
252 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
|
253 |
+ |
// " <tr ><td class='Row'><table border=0><tr><td><br><br><br><br></td><td |
|
254 |
+ |
// valign='middle'>Hello</td><td><br><br><br><br></td></tr></table></td></tr>\n" + // |
284 |
255 |
|
// " </table>\n" + // |
285 |
256 |
|
// " </body>\n" + // |
286 |
257 |
|
// "</html>"; |
287 |
258 |
|
|
288 |
|
- |
private static class SetCtrl |
289 |
|
- |
{ |
|
259 |
+ |
private static class SetCtrl { |
290 |
260 |
|
private List<Widget> mViewEntryPanels = new ArrayList<Widget>(); |
291 |
261 |
|
|
292 |
|
- |
public List<Widget> getViewEntryPanels() |
293 |
|
- |
{ |
|
262 |
+ |
public List<Widget> getViewEntryPanels() { |
294 |
263 |
|
return mViewEntryPanels; |
295 |
264 |
|
} |
296 |
265 |
|
|
297 |
|
- |
public void add( Widget pViewEntryPanel ) |
298 |
|
- |
{ |
|
266 |
+ |
public void add( Widget pViewEntryPanel ) { |
299 |
267 |
|
mViewEntryPanels.add( pViewEntryPanel ); |
300 |
268 |
|
} |
301 |
269 |
|
|
302 |
|
- |
public int size() |
303 |
|
- |
{ |
|
270 |
+ |
public int size() { |
304 |
271 |
|
return mViewEntryPanels.size(); |
305 |
272 |
|
} |
306 |
273 |
|
|
307 |
|
- |
public int getTopOffset() |
308 |
|
- |
{ |
|
274 |
+ |
public int getTopOffset() { |
309 |
275 |
|
return 0; |
310 |
276 |
|
} |
311 |
277 |
|
|
312 |
|
- |
public int getBottomOffset() |
313 |
|
- |
{ |
|
278 |
+ |
public int getBottomOffset() { |
314 |
279 |
|
return size() - 1; |
315 |
280 |
|
} |
316 |
281 |
|
} |
317 |
282 |
|
|
318 |
|
- |
private static class NavigateSetCtrl extends SetCtrl |
319 |
|
- |
{ |
|
283 |
+ |
private static class NavigateSetCtrl extends SetCtrl { |
320 |
284 |
|
private int mSelectedPanel = -1; |
321 |
285 |
|
|
322 |
|
- |
public int getSelectedPanel() |
323 |
|
- |
{ |
|
286 |
+ |
public int getSelectedPanel() { |
324 |
287 |
|
return mSelectedPanel; |
325 |
288 |
|
} |
326 |
289 |
|
|
327 |
|
- |
public void setSelectedPanel( int pSelectedPanel ) |
328 |
|
- |
{ |
|
290 |
+ |
public void setSelectedPanel( int pSelectedPanel ) { |
329 |
291 |
|
mSelectedPanel = pSelectedPanel; |
330 |
292 |
|
} |
331 |
293 |
|
} |
332 |
294 |
|
|
333 |
|
- |
private static class CurrentSetCtrl extends SetCtrl |
334 |
|
- |
{ |
|
295 |
+ |
private static class CurrentSetCtrl extends SetCtrl { |
335 |
296 |
|
private int mLeadingEmpties = 0; |
336 |
297 |
|
private int mTrailingEmpties = 0; |
337 |
298 |
|
|
338 |
|
- |
public boolean anyEmpties() |
339 |
|
- |
{ |
|
299 |
+ |
public boolean anyEmpties() { |
340 |
300 |
|
return (mLeadingEmpties != 0) || (mTrailingEmpties != 0); |
341 |
301 |
|
} |
342 |
302 |
|
|
343 |
|
- |
public int getLeadingEmpties() |
344 |
|
- |
{ |
|
303 |
+ |
public int getLeadingEmpties() { |
345 |
304 |
|
return mLeadingEmpties; |
346 |
305 |
|
} |
347 |
306 |
|
|
348 |
|
- |
public int getTrailingEmpties() |
349 |
|
- |
{ |
|
307 |
+ |
public int getTrailingEmpties() { |
350 |
308 |
|
return mTrailingEmpties; |
351 |
309 |
|
} |
352 |
310 |
|
|
353 |
311 |
|
@Override |
354 |
|
- |
public int getTopOffset() |
355 |
|
- |
{ |
|
312 |
+ |
public int getTopOffset() { |
356 |
313 |
|
return mLeadingEmpties; |
357 |
314 |
|
} |
358 |
315 |
|
|
359 |
316 |
|
@Override |
360 |
|
- |
public int getBottomOffset() |
361 |
|
- |
{ |
|
317 |
+ |
public int getBottomOffset() { |
362 |
318 |
|
return mLeadingEmpties + super.getBottomOffset(); |
363 |
319 |
|
} |
364 |
320 |
|
|
365 |
|
- |
public void adjustHeightTo( int pPreviousSetsSelectedPanel, int pNewHeightInPanels ) |
366 |
|
- |
{ |
367 |
|
- |
if ( pNewHeightInPanels != size() ) |
368 |
|
- |
{ |
369 |
|
- |
for ( int zToAdd = pNewHeightInPanels - size(); zToAdd > 1; zToAdd -= 2 ) |
370 |
|
- |
{ |
|
321 |
+ |
public void adjustHeightTo( int pPreviousSetsSelectedPanel, int pNewHeightInPanels ) { |
|
322 |
+ |
if ( pNewHeightInPanels != size() ) { |
|
323 |
+ |
for ( int zToAdd = pNewHeightInPanels - size(); zToAdd > 1; zToAdd -= 2 ) { |
371 |
324 |
|
mLeadingEmpties++; |
372 |
325 |
|
mTrailingEmpties++; |
373 |
326 |
|
} |
374 |
|
- |
for ( int zSelectedTopOffset = pPreviousSetsSelectedPanel - 1; zSelectedTopOffset < getTopOffset(); mTrailingEmpties++ ) |
375 |
|
- |
{ |
|
327 |
+ |
for ( int zSelectedTopOffset = pPreviousSetsSelectedPanel - 1; zSelectedTopOffset < getTopOffset(); mTrailingEmpties++ ) { |
376 |
328 |
|
mLeadingEmpties--; // Move Up |
377 |
329 |
|
} |
378 |
|
- |
for ( int zSelectedBottom = pPreviousSetsSelectedPanel + 1; zSelectedBottom > getBottomOffset(); mTrailingEmpties-- ) |
379 |
|
- |
{ |
|
330 |
+ |
for ( int zSelectedBottom = pPreviousSetsSelectedPanel + 1; zSelectedBottom > getBottomOffset(); mTrailingEmpties-- ) { |
380 |
331 |
|
mLeadingEmpties++; // Move Down |
381 |
332 |
|
} |
382 |
333 |
|
} |
383 |
334 |
|
} |
384 |
335 |
|
} |
385 |
336 |
|
|
386 |
|
- |
private Widget createUserCtrlPanel( DrillDownSet pDrillDownSet ) |
387 |
|
- |
{ |
|
337 |
+ |
private Widget createUserCtrlPanel( DrillDownSet pDrillDownSet ) { |
388 |
338 |
|
UserCtrlPanel zPanel = new UserCtrlPanel(); |
389 |
339 |
|
|
390 |
340 |
|
NavigateSetCtrl zHomeSetCtrl = createNavigateSet( pDrillDownSet.getHomeSet() ); |
|
@@ -392,27 +342,22 @@ |
392 |
342 |
|
CurrentSetCtrl zCurrentSetCtrl = createCurrentSet( pDrillDownSet.getCurrentSet() ); |
393 |
343 |
|
|
394 |
344 |
|
zPanel.add( new Spacer( 10 ) ); |
395 |
|
- |
if ( zHomeSetCtrl != null ) |
396 |
|
- |
{ |
|
345 |
+ |
if ( zHomeSetCtrl != null ) { |
397 |
346 |
|
int zMaxPanels = Math.max( zCurrentSetCtrl.size(), zHomeSetCtrl.size() ); |
398 |
347 |
|
NavigateSetCtrl zLastSetCtrl = zHomeSetCtrl; |
399 |
|
- |
zPanel.add( createNavigatePanel( zLastSetCtrl, new ClickHandler() |
400 |
|
- |
{ |
|
348 |
+ |
zPanel.add( createNavigatePanel( zLastSetCtrl, new ClickHandler() { |
401 |
349 |
|
@Override |
402 |
|
- |
public void onClick( ClickEvent event ) |
403 |
|
- |
{ |
|
350 |
+ |
public void onClick( ClickEvent event ) { |
404 |
351 |
|
mController.homeSelected(); |
405 |
352 |
|
} |
406 |
353 |
|
} ) ); |
407 |
|
- |
if ( zBackSetCtrl != null ) |
408 |
|
- |
{ |
|
354 |
+ |
if ( zBackSetCtrl != null ) { |
409 |
355 |
|
zMaxPanels = Math.max( zMaxPanels, zBackSetCtrl.size() ); |
410 |
|
- |
zPanel.add( createExpansionPanel( zMaxPanels, zLastSetCtrl.getSelectedPanel(), zBackSetCtrl, pDrillDownSet.isSomethingBetweenHomeAndPreviousSets() ) ); |
411 |
|
- |
zPanel.add( createNavigatePanel( zLastSetCtrl = zBackSetCtrl, new ClickHandler() |
412 |
|
- |
{ |
|
356 |
+ |
zPanel.add( createExpansionPanel( zMaxPanels, zLastSetCtrl.getSelectedPanel(), zBackSetCtrl, |
|
357 |
+ |
pDrillDownSet.isSomethingBetweenHomeAndPreviousSets() ) ); |
|
358 |
+ |
zPanel.add( createNavigatePanel( zLastSetCtrl = zBackSetCtrl, new ClickHandler() { |
413 |
359 |
|
@Override |
414 |
|
- |
public void onClick( ClickEvent event ) |
415 |
|
- |
{ |
|
360 |
+ |
public void onClick( ClickEvent event ) { |
416 |
361 |
|
mController.previousSelected(); |
417 |
362 |
|
} |
418 |
363 |
|
} ) ); |
|
@@ -425,19 +370,15 @@ |
425 |
370 |
|
return zPanel; |
426 |
371 |
|
} |
427 |
372 |
|
|
428 |
|
- |
private NavigateSetCtrl createNavigateSet( ViewSet pViewSet ) |
429 |
|
- |
{ |
430 |
|
- |
if ( pViewSet == null ) |
431 |
|
- |
{ |
|
373 |
+ |
private NavigateSetCtrl createNavigateSet( ViewSet pViewSet ) { |
|
374 |
+ |
if ( pViewSet == null ) { |
432 |
375 |
|
return null; |
433 |
376 |
|
} |
434 |
377 |
|
NavigateSetCtrl zCtrl = new NavigateSetCtrl(); |
435 |
378 |
|
ViewEntry[] zEntries = pViewSet.getEntries(); |
436 |
|
- |
for ( int i = 0; i < zEntries.length; i++ ) |
437 |
|
- |
{ |
|
379 |
+ |
for ( int i = 0; i < zEntries.length; i++ ) { |
438 |
380 |
|
ViewEntry zEntry = zEntries[i]; |
439 |
|
- |
if ( zEntry.isSelected() ) |
440 |
|
- |
{ |
|
381 |
+ |
if ( zEntry.isSelected() ) { |
441 |
382 |
|
zCtrl.setSelectedPanel( i ); |
442 |
383 |
|
} |
443 |
384 |
|
zCtrl.add( createNavigateSetWidget( zEntry ) ); |
|
@@ -445,19 +386,16 @@ |
445 |
386 |
|
return zCtrl; |
446 |
387 |
|
} |
447 |
388 |
|
|
448 |
|
- |
private CurrentSetCtrl createCurrentSet( ViewSet pCurrentSet ) |
449 |
|
- |
{ |
|
389 |
+ |
private CurrentSetCtrl createCurrentSet( ViewSet pCurrentSet ) { |
450 |
390 |
|
CurrentSetCtrl zCtrl = new CurrentSetCtrl(); |
451 |
391 |
|
ViewEntry[] zEntries = pCurrentSet.getEntries(); |
452 |
|
- |
for ( ViewEntry zEntry : zEntries ) |
453 |
|
- |
{ |
|
392 |
+ |
for ( ViewEntry zEntry : zEntries ) { |
454 |
393 |
|
zCtrl.add( createCurrentSetWidget( zEntry ) ); |
455 |
394 |
|
} |
456 |
395 |
|
return zCtrl; |
457 |
396 |
|
} |
458 |
397 |
|
|
459 |
|
- |
private Widget createCurrentSetWidget( final ViewEntry pEntry ) |
460 |
|
- |
{ |
|
398 |
+ |
private Widget createCurrentSetWidget( final ViewEntry pEntry ) { |
461 |
399 |
|
SizeableHorizontalPanel zPanel = new SizeableHorizontalPanel().stretchableHorizontally(); |
462 |
400 |
|
zPanel.setVerticalAlignment( HasVerticalAlignment.ALIGN_MIDDLE ); |
463 |
401 |
|
zPanel.addStyleName( "Cell" ); |
|
@@ -469,25 +407,21 @@ |
469 |
407 |
|
zPanel.add( zLeftSpacer ); |
470 |
408 |
|
zPanel.add( zLabel ); |
471 |
409 |
|
zPanel.add( new SizeableSpacer().width( 5 ).height( mPanelHeight - 1 ).stretchableHorizontally() ); |
472 |
|
- |
if ( !pEntry.isSelectable() ) |
473 |
|
- |
{ |
|
410 |
+ |
if ( !pEntry.isSelectable() ) { |
474 |
411 |
|
return zPanel; |
475 |
412 |
|
} |
476 |
413 |
|
zLeftSpacer.stretchableHorizontally(); |
477 |
414 |
|
SizeableFocusPanel zFocusPanel = new SizeableFocusPanel( zPanel ).stretchableHorizontally(); |
478 |
|
- |
zFocusPanel.addClickHandler( new ClickHandler() |
479 |
|
- |
{ |
|
415 |
+ |
zFocusPanel.addClickHandler( new ClickHandler() { |
480 |
416 |
|
@Override |
481 |
|
- |
public void onClick( ClickEvent event ) |
482 |
|
- |
{ |
|
417 |
+ |
public void onClick( ClickEvent event ) { |
483 |
418 |
|
mController.viewSelected( pEntry ); |
484 |
419 |
|
} |
485 |
420 |
|
} ); |
486 |
421 |
|
return zFocusPanel; |
487 |
422 |
|
} |
488 |
423 |
|
|
489 |
|
- |
private Widget createNavigateSetWidget( ViewEntry pEntry ) |
490 |
|
- |
{ |
|
424 |
+ |
private Widget createNavigateSetWidget( ViewEntry pEntry ) { |
491 |
425 |
|
SizeableHorizontalPanel zPanel = new SizeableHorizontalPanel(); |
492 |
426 |
|
zPanel.setVerticalAlignment( HasVerticalAlignment.ALIGN_MIDDLE ); |
493 |
427 |
|
zPanel.addStyleName( "Cell" ); |
|
@@ -495,8 +429,7 @@ |
495 |
429 |
|
|
496 |
430 |
|
SizeableLabel zLabel = new SizeableLabel( HTMLize.escapeNoWrap( pEntry.getText() ), true ).style( DataTableStyle.DATA_TABLE_TEXT ); |
497 |
431 |
|
zLabel.setWidth( "" + FontSizer.get( DataTableStyle.DATA_TABLE_TEXT ).EMs( 10 ) ); |
498 |
|
- |
if ( pEntry.isSelectable() ) |
499 |
|
- |
{ |
|
432 |
+ |
if ( pEntry.isSelectable() ) { |
500 |
433 |
|
zPanel.setHorizontalAlignment( HasHorizontalAlignment.ALIGN_CENTER ); |
501 |
434 |
|
} |
502 |
435 |
|
|
|
@@ -506,21 +439,17 @@ |
506 |
439 |
|
return zPanel; |
507 |
440 |
|
} |
508 |
441 |
|
|
509 |
|
- |
private Widget createHiddenPanels( int pEmpties ) |
510 |
|
- |
{ |
|
442 |
+ |
private Widget createHiddenPanels( int pEmpties ) { |
511 |
443 |
|
BorderedVerticalPanel zPanel = new BorderedVerticalPanel( mVerticalSpacer, "Filler" ); |
512 |
|
- |
while ( pEmpties-- > 0 ) |
513 |
|
- |
{ |
|
444 |
+ |
while ( pEmpties-- > 0 ) { |
514 |
445 |
|
zPanel.addHiddenEmptyPanel(); |
515 |
446 |
|
} |
516 |
447 |
|
return zPanel; |
517 |
448 |
|
} |
518 |
449 |
|
|
519 |
|
- |
private Widget createNavigatePanel( NavigateSetCtrl pSetCtrl, ClickHandler pClickHandler ) |
520 |
|
- |
{ |
|
450 |
+ |
private Widget createNavigatePanel( NavigateSetCtrl pSetCtrl, ClickHandler pClickHandler ) { |
521 |
451 |
|
BorderedVerticalPanel zPanel = new BorderedVerticalPanel( mVerticalSpacer, "NavigateSet" ); |
522 |
|
- |
for ( Widget zWidget : pSetCtrl.getViewEntryPanels() ) |
523 |
|
- |
{ |
|
452 |
+ |
for ( Widget zWidget : pSetCtrl.getViewEntryPanels() ) { |
524 |
453 |
|
zPanel.add( zWidget ); |
525 |
454 |
|
} |
526 |
455 |
|
SizeableFocusPanel zFocusPanel = new SizeableFocusPanel( zPanel ); |
|
@@ -528,15 +457,13 @@ |
528 |
457 |
|
return zFocusPanel; |
529 |
458 |
|
} |
530 |
459 |
|
|
531 |
|
- |
private Widget createExpansionPanel( int pMaxPanels, int pPreviousSelectedPanel, SetCtrl pSetCtrl, boolean pAddDotDotDot ) |
532 |
|
- |
{ |
|
460 |
+ |
private Widget createExpansionPanel( int pMaxPanels, int pPreviousSelectedPanel, SetCtrl pSetCtrl, boolean pAddDotDotDot ) { |
533 |
461 |
|
int zFromTopOffset = pPreviousSelectedPanel - 1; |
534 |
462 |
|
int zFromBottomOffset = pPreviousSelectedPanel + 1; |
535 |
463 |
|
int zToTopOffset = pSetCtrl.getTopOffset(); |
536 |
464 |
|
int zToBottomOffset = pSetCtrl.getBottomOffset(); |
537 |
465 |
|
|
538 |
|
- |
if ( !pAddDotDotDot ) |
539 |
|
- |
{ |
|
466 |
+ |
if ( !pAddDotDotDot ) { |
540 |
467 |
|
return createExpansionPanel( EXPANSION_WIDTH, pMaxPanels, zFromTopOffset, zFromBottomOffset, zToTopOffset, zToBottomOffset ); |
541 |
468 |
|
} |
542 |
469 |
|
int zMidTopOffset = (zFromTopOffset == zToTopOffset) ? zFromTopOffset : (zFromTopOffset + zToTopOffset) / 2; |
|
@@ -553,21 +480,18 @@ |
553 |
480 |
|
return zPanel; |
554 |
481 |
|
} |
555 |
482 |
|
|
556 |
|
- |
private Widget createDotDotDotExpansionPanel( int pWidth, int pMaxPanels, int pTopOffset, int pBottomOffset ) |
557 |
|
- |
{ |
|
483 |
+ |
private Widget createDotDotDotExpansionPanel( int pWidth, int pMaxPanels, int pTopOffset, int pBottomOffset ) { |
558 |
484 |
|
VerticalPanel zPanel = new VerticalPanel(); |
559 |
485 |
|
|
560 |
486 |
|
int zTopFiller = 1; |
561 |
|
- |
if ( pTopOffset != 0 ) |
562 |
|
- |
{ |
|
487 |
+ |
if ( pTopOffset != 0 ) { |
563 |
488 |
|
zTopFiller += pTopOffset * mPanelHeight; |
564 |
489 |
|
pMaxPanels -= pTopOffset; |
565 |
490 |
|
} |
566 |
491 |
|
zPanel.add( new Spacer().width( pWidth ).height( zTopFiller ) ); |
567 |
492 |
|
|
568 |
493 |
|
int zUpperPanels = ((pBottomOffset + 1) - pTopOffset) / 2; |
569 |
|
- |
if ( zUpperPanels != 0 ) |
570 |
|
- |
{ |
|
494 |
+ |
if ( zUpperPanels != 0 ) { |
571 |
495 |
|
zPanel.add( image( "GreenPixel" ).size( pWidth, zUpperPanels * mPanelHeight ) ); |
572 |
496 |
|
pMaxPanels -= zUpperPanels; |
573 |
497 |
|
} |
|
@@ -577,8 +501,7 @@ |
577 |
501 |
|
pMaxPanels -= 1; |
578 |
502 |
|
|
579 |
503 |
|
int zLowerPanels = pBottomOffset - (pTopOffset + zUpperPanels); |
580 |
|
- |
if ( zLowerPanels != 0 ) |
581 |
|
- |
{ |
|
504 |
+ |
if ( zLowerPanels != 0 ) { |
582 |
505 |
|
zPanel.add( image( "GreenPixel" ).size( pWidth, zLowerPanels * mPanelHeight ) ); |
583 |
506 |
|
pMaxPanels -= zLowerPanels; |
584 |
507 |
|
} |
|
@@ -593,32 +516,29 @@ |
593 |
516 |
|
/** |
594 |
517 |
|
* Notes: pToTopOffset <= pFromTopOffset && pFromBottomOffset <= pToBottomOffset |
595 |
518 |
|
*/ |
596 |
|
- |
private Widget createExpansionPanel( int pWidth, int pMaxPanels, int pFromTopOffset, int pFromBottomOffset, int pToTopOffset, int pToBottomOffset ) |
597 |
|
- |
{ |
|
519 |
+ |
private Widget createExpansionPanel( int pWidth, int pMaxPanels, int pFromTopOffset, int pFromBottomOffset, int pToTopOffset, int pToBottomOffset ) { |
598 |
520 |
|
VerticalPanel zPanel = new VerticalPanel(); |
599 |
521 |
|
|
600 |
522 |
|
int zTopFiller = 1; |
601 |
|
- |
if ( pToTopOffset != 0 ) |
602 |
|
- |
{ |
|
523 |
+ |
if ( pToTopOffset != 0 ) { |
603 |
524 |
|
zTopFiller += pToTopOffset * mPanelHeight; |
604 |
525 |
|
pMaxPanels -= pToTopOffset; |
605 |
526 |
|
} |
606 |
527 |
|
zPanel.add( new Spacer().width( pWidth ).height( zTopFiller ) ); |
607 |
528 |
|
|
608 |
529 |
|
int zRisingPanels = pFromTopOffset - pToTopOffset; |
609 |
|
- |
if ( zRisingPanels != 0 ) |
610 |
|
- |
{ |
|
530 |
+ |
if ( zRisingPanels != 0 ) { |
611 |
531 |
|
zPanel.add( image( "RisingGreen" ).size( pWidth, zRisingPanels * mPanelHeight ) ); |
612 |
532 |
|
pMaxPanels -= zRisingPanels; |
613 |
533 |
|
} |
614 |
534 |
|
|
615 |
|
- |
int zStraightAcrossPanels = Math.min( pFromBottomOffset, pToBottomOffset ) - Math.max( pFromTopOffset, pToTopOffset ) + 1; // Should Always be >= 3 Panels! |
|
535 |
+ |
int zStraightAcrossPanels = |
|
536 |
+ |
Math.min( pFromBottomOffset, pToBottomOffset ) - Math.max( pFromTopOffset, pToTopOffset ) + 1; // Should Always be >= 3 Panels! |
616 |
537 |
|
zPanel.add( image( "GreenPixel" ).size( pWidth, zStraightAcrossPanels * mPanelHeight ) ); |
617 |
538 |
|
pMaxPanels -= zStraightAcrossPanels; |
618 |
539 |
|
|
619 |
540 |
|
int zDecendingPanels = pToBottomOffset - pFromBottomOffset; |
620 |
|
- |
if ( zDecendingPanels != 0 ) |
621 |
|
- |
{ |
|
541 |
+ |
if ( zDecendingPanels != 0 ) { |
622 |
542 |
|
zPanel.add( image( "DecendingGreen" ).size( pWidth, zDecendingPanels * mPanelHeight ) ); |
623 |
543 |
|
pMaxPanels -= zDecendingPanels; |
624 |
544 |
|
} |
|
@@ -630,49 +550,40 @@ |
630 |
550 |
|
return zPanel; |
631 |
551 |
|
} |
632 |
552 |
|
|
633 |
|
- |
private Widget createCurrentPanel( CurrentSetCtrl pSetCtrl ) |
634 |
|
- |
{ |
635 |
|
- |
if ( !pSetCtrl.anyEmpties() ) |
636 |
|
- |
{ |
|
553 |
+ |
private Widget createCurrentPanel( CurrentSetCtrl pSetCtrl ) { |
|
554 |
+ |
if ( !pSetCtrl.anyEmpties() ) { |
637 |
555 |
|
return new CurrentPanel( pSetCtrl ); |
638 |
556 |
|
} |
639 |
557 |
|
SizeableVerticalPanel zPanel = new SizeableVerticalPanel().stretchableHorizontally(); |
640 |
|
- |
if ( pSetCtrl.getLeadingEmpties() != 0 ) |
641 |
|
- |
{ |
|
558 |
+ |
if ( pSetCtrl.getLeadingEmpties() != 0 ) { |
642 |
559 |
|
zPanel.add( createHiddenPanels( pSetCtrl.getLeadingEmpties() ) ); |
643 |
560 |
|
} |
644 |
561 |
|
zPanel.add( new CurrentPanel( pSetCtrl ) ); |
645 |
|
- |
if ( pSetCtrl.getTrailingEmpties() != 0 ) |
646 |
|
- |
{ |
|
562 |
+ |
if ( pSetCtrl.getTrailingEmpties() != 0 ) { |
647 |
563 |
|
zPanel.add( createHiddenPanels( pSetCtrl.getTrailingEmpties() ) ); |
648 |
564 |
|
} |
649 |
565 |
|
return zPanel; |
650 |
566 |
|
} |
651 |
567 |
|
|
652 |
|
- |
private static class CurrentPanel extends SizeableVerticalPanel |
653 |
|
- |
{ |
|
568 |
+ |
private static class CurrentPanel extends SizeableVerticalPanel { |
654 |
569 |
|
private boolean mFirstAdded = false; |
655 |
570 |
|
|
656 |
|
- |
public CurrentPanel( SetCtrl pSetCtrl ) |
657 |
|
- |
{ |
|
571 |
+ |
public CurrentPanel( SetCtrl pSetCtrl ) { |
658 |
572 |
|
stretchableHorizontally(); |
659 |
573 |
|
addStyleName( "CurrentSet" ); |
660 |
574 |
|
setVerticalAlignment( HasVerticalAlignment.ALIGN_TOP ); |
661 |
|
- |
for ( Widget zWidget : pSetCtrl.getViewEntryPanels() ) |
662 |
|
- |
{ |
|
575 |
+ |
for ( Widget zWidget : pSetCtrl.getViewEntryPanels() ) { |
663 |
576 |
|
add( zWidget ); |
664 |
577 |
|
} |
665 |
578 |
|
} |
666 |
579 |
|
|
667 |
580 |
|
@Override |
668 |
|
- |
public void add( Widget w ) |
669 |
|
- |
{ |
|
581 |
+ |
public void add( Widget w ) { |
670 |
582 |
|
super.add( w ); |
671 |
583 |
|
Element zElement = w.getElement(); |
672 |
584 |
|
Element zTD = zElement.getParentElement(); |
673 |
585 |
|
zTD.addClassName( "Row" ); |
674 |
|
- |
if ( !mFirstAdded ) |
675 |
|
- |
{ |
|
586 |
+ |
if ( !mFirstAdded ) { |
676 |
587 |
|
mFirstAdded = true; |
677 |
588 |
|
Element zTR = zTD.getParentElement(); |
678 |
589 |
|
zTR.addClassName( "First" ); |
|
@@ -680,43 +591,35 @@ |
680 |
591 |
|
} |
681 |
592 |
|
} |
682 |
593 |
|
|
683 |
|
- |
private static class UserCtrlPanel extends SizeableHorizontalPanel |
684 |
|
- |
{ |
685 |
|
- |
private UserCtrlPanel() |
686 |
|
- |
{ |
|
594 |
+ |
private static class UserCtrlPanel extends SizeableHorizontalPanel { |
|
595 |
+ |
private UserCtrlPanel() { |
687 |
596 |
|
stretchableHorizontally(); |
688 |
597 |
|
style( "UserCtrlPanel" ); |
689 |
598 |
|
} |
690 |
599 |
|
|
691 |
|
- |
public UserCtrlPanel with( Widget... pWidgets ) |
692 |
|
- |
{ |
693 |
|
- |
for ( Widget zWidget : pWidgets ) |
694 |
|
- |
{ |
|
600 |
+ |
public UserCtrlPanel with( Widget... pWidgets ) { |
|
601 |
+ |
for ( Widget zWidget : pWidgets ) { |
695 |
602 |
|
add( zWidget ); |
696 |
603 |
|
} |
697 |
604 |
|
return this; |
698 |
605 |
|
} |
699 |
606 |
|
} |
700 |
607 |
|
|
701 |
|
- |
private static class LayoutPanel extends SizeableVerticalPanel |
702 |
|
- |
{ |
|
608 |
+ |
private static class LayoutPanel extends SizeableVerticalPanel { |
703 |
609 |
|
|
704 |
|
- |
public LayoutPanel( Widget pUserCtrlPanel ) |
705 |
|
- |
{ |
|
610 |
+ |
public LayoutPanel( Widget pUserCtrlPanel ) { |
706 |
611 |
|
stretchable(); |
707 |
612 |
|
style( "LayoutCtrlPanel" ); |
708 |
613 |
|
userCtrlPanel( pUserCtrlPanel ); |
709 |
614 |
|
} |
710 |
615 |
|
|
711 |
|
- |
public void message( String pMessage ) |
712 |
|
- |
{ |
|
616 |
+ |
public void message( String pMessage ) { |
713 |
617 |
|
userCtrlPanel( new UserCtrlPanel().with( new SizeableSpacer( 1 ).stretchableHorizontally(), // |
714 |
618 |
|
new Label( pMessage ), // |
715 |
619 |
|
new SizeableSpacer( 1 ).stretchableHorizontally() ) ); |
716 |
620 |
|
} |
717 |
621 |
|
|
718 |
|
- |
public void userCtrlPanel( Widget pUserCtrlPanel ) |
719 |
|
- |
{ |
|
622 |
+ |
public void userCtrlPanel( Widget pUserCtrlPanel ) { |
720 |
623 |
|
clear(); |
721 |
624 |
|
add( new SizeableSpacer( 1 ).stretchableVertically() ); |
722 |
625 |
|
add( pUserCtrlPanel ); |
|
@@ -725,8 +628,7 @@ |
725 |
628 |
|
} |
726 |
629 |
|
} |
727 |
630 |
|
|
728 |
|
- |
private OurImage image( String pNamed ) |
729 |
|
- |
{ |
|
631 |
+ |
private OurImage image( String pNamed ) { |
730 |
632 |
|
return new OurImage( "common/images/misc/" + pNamed + ".png" ); |
731 |
633 |
|
} |
732 |
634 |
|
} |