litesoft
Diff Revisions
150
vs
151
for /trunk/Java/core/Server/src/org/litesoft/orsup/base/POInstanceQueryFilter.java
|
@@ -60,19 +60,16 @@ |
60 |
60 |
|
MetaDataForPO zMetaDataForPO = pQueryFilter.getMetaDataForPO(); |
61 |
61 |
|
if ( zMetaDataForPO != null ) |
62 |
62 |
|
{ |
63 |
|
- |
AttributeAccessorSCD<PersistentObject<?>>[] zSCDs = |
64 |
|
- |
zMetaDataForPO.getKeySet().getKeyAttributeAccessorSCDs(); |
|
63 |
+ |
AttributeAccessorSCD<PersistentObject<?>>[] zSCDs = zMetaDataForPO.getKeySet().getKeyAttributeAccessorSCDs(); |
65 |
64 |
|
if ( (zSCDs != null) && (zSCDs.length == 1) ) |
66 |
65 |
|
{ |
67 |
|
- |
return new InstanceToKeyAdaptor( zMetaDataForPO, zSCDs[0], |
68 |
|
- |
(POKeyQueryFilter) pQueryFilter ); |
|
66 |
+ |
return new InstanceToKeyAdaptor( zMetaDataForPO, zSCDs[0], (POKeyQueryFilter) pQueryFilter ); |
69 |
67 |
|
} |
70 |
68 |
|
} |
71 |
69 |
|
throw new IllegalStateException( "PO Query Filter is a Key Filter" ); |
72 |
70 |
|
case PotentialFilteringByInstance: |
73 |
71 |
|
default: |
74 |
|
- |
throw new Error( |
75 |
|
- |
"Combo of '" + pQueryFilter.getType() + "' and " + pQueryFilter.getClass() ); |
|
72 |
+ |
throw new Error( "Combo of '" + pQueryFilter.getType() + "' and " + pQueryFilter.getClass() ); |
76 |
73 |
|
} |
77 |
74 |
|
} |
78 |
75 |
|
return POInstanceQueryFilter.ALL_ACCEPTABLE; |
|
@@ -84,9 +81,7 @@ |
84 |
81 |
|
private AttributeAccessorSCD<PersistentObject<?>> mKeySCD; |
85 |
82 |
|
private POKeyQueryFilter mProxiedKeyFilter; |
86 |
83 |
|
|
87 |
|
- |
public InstanceToKeyAdaptor( MetaDataForPO pMetaDataForPO, |
88 |
|
- |
AttributeAccessorSCD<PersistentObject<?>> pKeySCD, |
89 |
|
- |
POKeyQueryFilter pProxiedKeyFilter ) |
|
84 |
+ |
public InstanceToKeyAdaptor( MetaDataForPO pMetaDataForPO, AttributeAccessorSCD<PersistentObject<?>> pKeySCD, POKeyQueryFilter pProxiedKeyFilter ) |
90 |
85 |
|
{ |
91 |
86 |
|
super( pMetaDataForPO ); |
92 |
87 |
|
mKeySCD = pKeySCD; |