litesoft
Diff Revisions
2
vs
6
for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/factories/AttributeFactoryImpl.java
|
@@ -72,14 +72,12 @@ |
72 |
72 |
|
return zAMD; |
73 |
73 |
|
} |
74 |
74 |
|
|
75 |
|
- |
public AttributeMetaData createAttributeMetaDataValidOptions( ObjectSet pObjectSet, Mode pMode, boolean pEditable, boolean pVirtual, |
76 |
|
- |
String... pNameAndOptions ) |
|
75 |
+ |
public AttributeMetaData createAttributeMetaDataValidOptions( ObjectSet pObjectSet, Mode pMode, boolean pEditable, AttributeType pType, boolean pVirtual, String... pNameAndOptions ) |
77 |
76 |
|
{ |
78 |
|
- |
AttributeType zType = A_ValidOptions.TYPE; |
79 |
|
- |
AttributeSet zAttributeSet = mSetsByType.get( zType.toString() ); |
|
77 |
+ |
AttributeSet zAttributeSet = mSetsByType.get( pType.toString() ); |
80 |
78 |
|
ASet zASet = pVirtual ? zAttributeSet.getVirtual() : zAttributeSet.getPersisted(); |
81 |
79 |
|
AttributeMetaData zAMD = |
82 |
|
- |
new AttributeMetaDataValidOptions( zAttributeSet, pMode, pEditable, pVirtual, adjust( pObjectSet, zType, zASet ), mAttributeIdentifierValidator, |
|
80 |
+ |
new AttributeMetaDataValidOptions( zAttributeSet, pMode, pEditable, pVirtual, adjust( pObjectSet, pType, zASet ), mAttributeIdentifierValidator, |
83 |
81 |
|
pNameAndOptions ); |
84 |
82 |
|
handleCallBack( zASet, zAMD ); |
85 |
83 |
|
return zAMD; |