litesoft
Diff Revisions
260
vs
261
for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/widgets/nonpublic/InjectionPointSelectorController.java
|
@@ -285,6 +285,11 @@ |
285 |
285 |
|
return new Between<V>( pSelected, pUpperReference, pLowerReference ); |
286 |
286 |
|
} |
287 |
287 |
|
|
|
288 |
+ |
public Between<U> copyAsSelected() |
|
289 |
+ |
{ |
|
290 |
+ |
return isSelected() ? this : create( true, getUpperReference(), getLowerReference() ); |
|
291 |
+ |
} |
|
292 |
+ |
|
288 |
293 |
|
@Override |
289 |
294 |
|
public boolean isBetween() |
290 |
295 |
|
{ |
|
@@ -295,6 +300,12 @@ |
295 |
300 |
|
{ |
296 |
301 |
|
return (isSelected() ? "(?Y)" : "(?N)"); |
297 |
302 |
|
} |
|
303 |
+ |
|
|
304 |
+ |
@Override @SuppressWarnings({"EqualsWhichDoesntCheckParameterClass"}) |
|
305 |
+ |
public boolean equals( Object o ) |
|
306 |
+ |
{ |
|
307 |
+ |
return super.equals( o ) && (this.isSelected() == ((Between) o).isSelected()); |
|
308 |
+ |
} |
298 |
309 |
|
} |
299 |
310 |
|
|
300 |
311 |
|
static class There<U extends Synopsisable> extends SelectionPointEntry<U> |
|
@@ -388,6 +399,26 @@ |
388 |
399 |
|
} |
389 |
400 |
|
} |
390 |
401 |
|
|
|
402 |
+ |
public void homeSelected() |
|
403 |
+ |
{ |
|
404 |
+ |
DrillDownSet zDrillDownSet = updateDrillDownSetWhenEntriesVisibleChanges( mCurrentEntriesVisible, mSelectedBetweens ); |
|
405 |
+ |
mView.show( zDrillDownSet ); |
|
406 |
+ |
} |
|
407 |
+ |
|
|
408 |
+ |
public void previousSelected() |
|
409 |
+ |
{ |
|
410 |
+ |
mSelectedBetweens.remove( mSelectedBetweens.size() - 1 ); |
|
411 |
+ |
DrillDownSet zDrillDownSet = updateDrillDownSetWhenSelectedBetweensChange( mCurrentEntriesVisible, mSelectedBetweens ); |
|
412 |
+ |
mView.show( zDrillDownSet ); |
|
413 |
+ |
} |
|
414 |
+ |
|
|
415 |
+ |
public void betweenSelected( Between<T> pSelectedBetween ) |
|
416 |
+ |
{ |
|
417 |
+ |
mSelectedBetweens.add( pSelectedBetween.copyAsSelected() ); |
|
418 |
+ |
DrillDownSet zDrillDownSet = updateDrillDownSetWhenSelectedBetweensChange( mCurrentEntriesVisible, mSelectedBetweens ); |
|
419 |
+ |
mView.show( zDrillDownSet ); |
|
420 |
+ |
} |
|
421 |
+ |
|
391 |
422 |
|
/** |
392 |
423 |
|
* Update the pLastDrillDownSet based on the new pCount (maximum Entries per ViewSet) (public for Testing) |
393 |
424 |
|
* |
|
@@ -448,7 +479,7 @@ |
448 |
479 |
|
|
449 |
480 |
|
private boolean isSelected( Between<T> pSelectedBetween, T pLast, T pCurr ) |
450 |
481 |
|
{ |
451 |
|
- |
return (pSelectedBetween != null) && (pLast == pSelectedBetween.getUpperReference()) && (pCurr == pSelectedBetween.getUpperReference()); |
|
482 |
+ |
return (pSelectedBetween != null) && (pLast == pSelectedBetween.getUpperReference()) && (pCurr == pSelectedBetween.getLowerReference()); |
452 |
483 |
|
} |
453 |
484 |
|
|
454 |
485 |
|
private List<ViewSet> buildViewSets( int pCount, List<Between<T>> pSelectedBetweens ) |