| |
@@ -19,9 +19,9 @@ |
| 19 |
19 |
|
{ |
| 20 |
20 |
|
private AttributeMetaData mOrigAMD; |
| 21 |
21 |
|
private String mDerivedFromAttribute; |
| 22 |
|
- |
private AttributeMetaData mDerivedAMD; |
| |
22 |
+ |
private MinimalAttributeMetaData mDerivedAMD; |
| 23 |
23 |
|
|
| 24 |
|
- |
public AttributeTuple( AttributeMetaData pOrigAMD, String pDerivedFromAttribute, AttributeMetaData pDerivedAMD ) |
| |
24 |
+ |
public AttributeTuple( AttributeMetaData pOrigAMD, String pDerivedFromAttribute, MinimalAttributeMetaData pDerivedAMD ) |
| 25 |
25 |
|
{ |
| 26 |
26 |
|
mOrigAMD = pOrigAMD; |
| 27 |
27 |
|
mDerivedFromAttribute = pDerivedFromAttribute; |
| |
@@ -90,15 +90,15 @@ |
| 90 |
90 |
|
@Override |
| 91 |
91 |
|
public Class getSimpleDataType() |
| 92 |
92 |
|
{ |
| 93 |
|
- |
return extractSimpleDataType( mDerivedAMD ); |
| |
93 |
+ |
return mDerivedAMD.getSimpleDataType(); |
| 94 |
94 |
|
} |
| 95 |
95 |
|
|
| 96 |
96 |
|
@Override |
| 97 |
97 |
|
public String[] getValidOptions() |
| 98 |
98 |
|
{ |
| 99 |
|
- |
if ( mDerivedAMD instanceof AttributeMetaDataValidOptions ) |
| |
99 |
+ |
if ( mDerivedAMD instanceof HasValidOptions ) |
| 100 |
100 |
|
{ |
| 101 |
|
- |
String[] zOptions = ((AttributeMetaDataValidOptions) mDerivedAMD).getValidOptions(); |
| |
101 |
+ |
String[] zOptions = ((HasValidOptions) mDerivedAMD).getValidOptions(); |
| 102 |
102 |
|
return (zOptions != null) ? zOptions : UtilsCommon.EMPTY_STRING_ARRAY; |
| 103 |
103 |
|
} |
| 104 |
104 |
|
return null; |
| |
@@ -111,9 +111,9 @@ |
| 111 |
111 |
|
} |
| 112 |
112 |
|
|
| 113 |
113 |
|
@Override |
| 114 |
|
- |
public AttributeType getAttributeType() |
| |
114 |
+ |
public AttributeType getAttributeSetType() |
| 115 |
115 |
|
{ |
| 116 |
|
- |
return mDerivedAMD.getAttributeSet().getType(); |
| |
116 |
+ |
return mDerivedAMD.getAttributeSetType(); |
| 117 |
117 |
|
} |
| 118 |
118 |
|
|
| 119 |
119 |
|
@Override |
| |
@@ -221,7 +221,7 @@ |
| 221 |
221 |
|
return pAttribute.getPropertyManager().get_String( PMD_DerivedFromAttribute.NAME, "" ).trim(); |
| 222 |
222 |
|
} |
| 223 |
223 |
|
|
| 224 |
|
- |
private AttributeMetaData getDerivedFromAttribute( AttributeMetaData pAttribute, String pDerivedFromAttributePath ) |
| |
224 |
+ |
private MinimalAttributeMetaData getDerivedFromAttribute( AttributeMetaData pAttribute, String pDerivedFromAttributePath ) |
| 225 |
225 |
|
{ |
| 226 |
226 |
|
ObjectMetaData zDerivedFromObject = mDerivedFromObject.getDerivedFromObjectMetaData(); |
| 227 |
227 |
|
if ( zDerivedFromObject == null ) |
| |
@@ -230,7 +230,7 @@ |
| 230 |
230 |
|
} |
| 231 |
231 |
|
else |
| 232 |
232 |
|
{ |
| 233 |
|
- |
AttributeMetaData zDerived = getDerivedAttribute( zDerivedFromObject, UtilsCommon.parseChar( pDerivedFromAttributePath, '.' ) ); |
| |
233 |
+ |
MinimalAttributeMetaData zDerived = getDerivedAttribute( zDerivedFromObject, UtilsCommon.parseChar( pDerivedFromAttributePath, '.' ) ); |
| 234 |
234 |
|
if ( zDerived != null ) |
| 235 |
235 |
|
{ |
| 236 |
236 |
|
return zDerived; |
| |
@@ -241,10 +241,10 @@ |
| 241 |
241 |
|
return new AttributeMetaDataSimple( new UiRUpSet( 0, A_String.TYPE, new ASet(), new ASet() ), Mode.New, false, false, PropertyMetaData.EMPTY_ARRAY, null, pDerivedFromAttributePath ); |
| 242 |
242 |
|
} |
| 243 |
243 |
|
|
| 244 |
|
- |
private AttributeMetaData getDerivedAttribute( ObjectMetaData pObjectMetaData, String[] pAttrNames ) |
| |
244 |
+ |
private MinimalAttributeMetaData getDerivedAttribute( ObjectMetaData pObjectMetaData, String[] pAttrNames ) |
| 245 |
245 |
|
{ |
| 246 |
246 |
|
int i = 0; |
| 247 |
|
- |
AttributeMetaData zAMD = getAttribute( pObjectMetaData, pAttrNames[i++] ); |
| |
247 |
+ |
MinimalAttributeMetaData zAMD = getAttribute( pObjectMetaData, pAttrNames[i++] ); |
| 248 |
248 |
|
while ( (zAMD != null) && (i < pAttrNames.length) ) |
| 249 |
249 |
|
{ |
| 250 |
250 |
|
if ( zAMD instanceof AttributeMetaDataRelated ) |
View this file contents
View the full history
Commits for