Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve EOAttribute's value factory method to accept numeric arguments #962

Merged
merged 3 commits into from
Jan 16, 2022
Merged

Improve EOAttribute's value factory method to accept numeric arguments #962

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16fa5f6
Improve EOAttribute's value factory method to accept numeric arguments
hprange Nov 5, 2021
6271713
Add support for custom types when fetching numeric values from the da…
hprange Jan 9, 2022
e8db8ec
Improve error message when value factory method is not found
hprange Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Frameworks/EOF/ERAttributeExtension/Sources/com/webobjects/eoaccess/EOAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,8 @@ else if (_argumentType == FactoryMethodArgumentIsDate)
_adaptorValueType = AdaptorDateType;
else if (_argumentType == FactoryMethodArgumentIsBytes)
_adaptorValueType = AdaptorBytesType;
else if (_argumentType == FactoryMethodArgumentIsNumber)
_adaptorValueType = AdaptorNumberType;
if (_adaptorValueType == -1)
_adaptorValueType = AdaptorBytesType;
return _adaptorValueType;
Expand Down Expand Up @@ -1551,6 +1553,8 @@ public int _factoryMethodArgumentTypeFromString(String string) {
return FactoryMethodArgumentIsString;
if (aString.equals(FactoryMethodArgumentIsDateString.toLowerCase()))
return FactoryMethodArgumentIsDate;
if (aString.equals(FactoryMethodArgumentIsNumberString.toLowerCase()))
return FactoryMethodArgumentIsNumber;
return !aString.equals("EOFactoryMethodArgumentIsNSString".toLowerCase()) ? FactoryMethodArgumentIsData : FactoryMethodArgumentIsString;
}

Expand All @@ -1567,6 +1571,9 @@ public String _stringForFactoryMethodArgumentType(int type) {

case FactoryMethodArgumentIsDate:
return FactoryMethodArgumentIsDateString;

case FactoryMethodArgumentIsNumber:
return FactoryMethodArgumentIsNumberString;
}
return FactoryMethodArgumentIsDataString;
}
Expand Down Expand Up @@ -1777,6 +1784,7 @@ protected EOAttribute(EOEntity entity, String definition) {
public static final int FactoryMethodArgumentIsString = 1;
public static final int FactoryMethodArgumentIsBytes = 2;
public static final int FactoryMethodArgumentIsDate = 3;
public static final int FactoryMethodArgumentIsNumber = 4;
public static final int AdaptorNumberType = 0;
public static final int AdaptorCharactersType = 1;
public static final int AdaptorBytesType = 2;
Expand Down Expand Up @@ -1856,6 +1864,7 @@ protected EOAttribute(EOEntity entity, String definition) {
public static final String FactoryMethodArgumentIsStringString = "EOFactoryMethodArgumentIsString";
public static final String FactoryMethodArgumentIsDataString = "EOFactoryMethodArgumentIsData";
public static final String FactoryMethodArgumentIsDateString = "EOFactoryMethodArgumentIsDate";
public static final String FactoryMethodArgumentIsNumberString = "EOFactoryMethodArgumentIsNumber";
private Map _overwrittenCharacteristics;
private static Class valueClasses[];
private static String valueTypeNames[] = { "Number", "Characters", "Bytes", "Date" };
Expand Down