[Ikvm-commit] ikvm/ikvmc FakeTypes.cs,1.5,1.6
Brought to you by:
jfrijters
From: Jeroen F. <jfr...@us...> - 2009-07-29 09:37:07
|
Update of /cvsroot/ikvm/ikvm/ikvmc In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8763/ikvmc Modified Files: FakeTypes.cs Log Message: Implemented support for .NET serialization of Java enums. (The CreateEnumEnum move in FakeTypes.cs is because java.lang.Enum now has a dependency on custom attribute annotations.) Index: FakeTypes.cs =================================================================== RCS file: /cvsroot/ikvm/ikvm/ikvmc/FakeTypes.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FakeTypes.cs 18 Nov 2008 05:32:15 -0000 1.5 --- FakeTypes.cs 29 Jul 2009 09:36:56 -0000 1.6 *************** *** 73,78 **** genericDelegateInterfaceType = tb.CreateType(); - CreateEnumEnum(modb, loader); - TypeWrapper annotationTypeWrapper = loader.LoadClassByDottedName("java.lang.annotation.Annotation"); annotationTypeWrapper.Finish(); --- 73,76 ---- *************** *** 80,83 **** --- 78,82 ---- genericAttributeAnnotationMultipleType = CreateAnnotationType(modb, DotNetTypeWrapper.GenericAttributeAnnotationMultipleTypeName, annotationTypeWrapper); genericAttributeAnnotationReturnValueType = CreateAnnotationType(modb, DotNetTypeWrapper.GenericAttributeAnnotationReturnValueTypeName, annotationTypeWrapper); + CreateEnumEnum(modb, loader); } |