| |
@@ -14,6 +14,11 @@ |
| 14 |
14 |
|
|
| 15 |
15 |
|
private boolean mCurrentShowValue = false; |
| 16 |
16 |
|
|
| |
17 |
+ |
private void updateCtrlValue( BoAccessorFilter pFilter, String pValue ) |
| |
18 |
+ |
{ |
| |
19 |
+ |
mDelegate.updateFilter( pFilter, BoAccessorFilterType.Always, mCtrlAttributeName, pValue ); |
| |
20 |
+ |
} |
| |
21 |
+ |
|
| 17 |
22 |
|
private void manageCtrlValue( BoAccessorFilter pFilter ) |
| 18 |
23 |
|
{ |
| 19 |
24 |
|
if ( !mExternalSetCtrlValue ) |
| |
@@ -27,7 +32,7 @@ |
| 27 |
32 |
|
|
| 28 |
33 |
|
if ( (zCurrentCount == 1) && (mLastInternallySetCtrlValue != null) ) // Only 1 & it is the Ctrl Value |
| 29 |
34 |
|
{ |
| 30 |
|
- |
mDelegate.updateFilter( pFilter, false, mCtrlAttributeName, mLastInternallySetCtrlValue = null ); |
| |
35 |
+ |
updateCtrlValue( pFilter, mLastInternallySetCtrlValue = null ); |
| 31 |
36 |
|
return; |
| 32 |
37 |
|
} |
| 33 |
38 |
|
|
| |
@@ -35,7 +40,7 @@ |
| 35 |
40 |
|
String zNewInternallySetCtrlValue = mCurrentShowValue ? mCtrlValueShowTrue : mCtrlValueShowFalse; |
| 36 |
41 |
|
if ( !UtilsCommon.areEqual( mLastInternallySetCtrlValue, zNewInternallySetCtrlValue ) ) |
| 37 |
42 |
|
{ |
| 38 |
|
- |
mDelegate.updateFilter( pFilter, false, mCtrlAttributeName, mLastInternallySetCtrlValue = zNewInternallySetCtrlValue ); |
| |
43 |
+ |
updateCtrlValue( pFilter, mLastInternallySetCtrlValue = zNewInternallySetCtrlValue ); |
| 39 |
44 |
|
} |
| 40 |
45 |
|
} |
| 41 |
46 |
|
} |
| |
@@ -49,13 +54,13 @@ |
| 49 |
54 |
|
private void updateCtrlAttributeFilter( BoAccessorFilter pFilter, String pValue ) |
| 50 |
55 |
|
{ |
| 51 |
56 |
|
mExternalSetCtrlValue = (pValue != null); // Either Removing or Setting ctrl value externally |
| 52 |
|
- |
mDelegate.updateFilter( pFilter, false, mCtrlAttributeName, pValue ); |
| |
57 |
+ |
updateCtrlValue( pFilter, pValue ); |
| 53 |
58 |
|
manageCtrlValue( pFilter ); |
| 54 |
59 |
|
} |
| 55 |
60 |
|
|
| 56 |
|
- |
private void updateOtherAttributeFilter( BoAccessorFilter pFilter, boolean pUniqueAttribute, String pAttributeName, String pValue ) |
| |
61 |
+ |
private void updateOtherAttributeFilter( BoAccessorFilter pFilter, BoAccessorFilterType pFilterType, String pAttributeName, String pValue ) |
| 57 |
62 |
|
{ |
| 58 |
|
- |
mDelegate.updateFilter( pFilter, pUniqueAttribute, pAttributeName, pValue ); |
| |
63 |
+ |
mDelegate.updateFilter( pFilter, pFilterType, pAttributeName, pValue ); |
| 59 |
64 |
|
manageCtrlValue( pFilter ); |
| 60 |
65 |
|
} |
| 61 |
66 |
|
|
| |
@@ -78,14 +83,14 @@ |
| 78 |
83 |
|
} |
| 79 |
84 |
|
|
| 80 |
85 |
|
@Override |
| 81 |
|
- |
public void updateFilter( BoAccessorFilter pFilter, boolean pUniqueAttribute, String pAttributeName, String pValue ) |
| |
86 |
+ |
public void updateFilter( BoAccessorFilter pFilter, BoAccessorFilterType pFilterType, String pAttributeName, String pValue ) |
| 82 |
87 |
|
{ |
| 83 |
88 |
|
pValue = UtilsCommon.noEmpty( pValue ); |
| 84 |
89 |
|
if ( mCtrlAttributeName.equals( pAttributeName ) ) |
| 85 |
90 |
|
{ |
| 86 |
|
- |
if ( pUniqueAttribute ) |
| |
91 |
+ |
if ( BoAccessorFilterType.Always != pFilterType ) |
| 87 |
92 |
|
{ |
| 88 |
|
- |
throw new IllegalStateException( mCtrlAttributeName + " CTRL Attribute may NOT be a Unique Attribute!" ); |
| |
93 |
+ |
throw new IllegalStateException( mCtrlAttributeName + " CTRL Attribute MUST be an Always Attribute!" ); |
| 89 |
94 |
|
} |
| 90 |
95 |
|
updateCtrlAttributeFilter( pFilter, pValue ); |
| 91 |
96 |
|
} |
| |
@@ -95,7 +100,7 @@ |
| 95 |
100 |
|
} |
| 96 |
101 |
|
else |
| 97 |
102 |
|
{ |
| 98 |
|
- |
updateOtherAttributeFilter( pFilter, pUniqueAttribute, pAttributeName, pValue ); |
| |
103 |
+ |
updateOtherAttributeFilter( pFilter, pFilterType, pAttributeName, pValue ); |
| 99 |
104 |
|
} |
| 100 |
105 |
|
} |
| 101 |
106 |
|
} |
View this file contents
View the full history
Commits for