Index: Tools/impl/JavaExport/EnumExporter.cls.xml
===================================================================
diff -u -r651 -r894
--- Tools/impl/JavaExport/EnumExporter.cls.xml	(.../EnumExporter.cls.xml)	(revision 651)
+++ Tools/impl/JavaExport/EnumExporter.cls.xml	(.../EnumExporter.cls.xml)	(revision 894)
@@ -8,16 +8,17 @@
 <Implementation><![CDATA[
 	Set MagazijnConstructors = ##class(%ListOfDataTypes).%New()
 	Set MapValues = ##class(%ListOfDataTypes).%New()
-	#dim ValueList As %String = $Parameter(Klasse.Name,"VALUELIST")
-	#dim Seperator As %String = $Extract(ValueList)
-	Set $Extract(ValueList) = ""
-	Set Iterator = ##class(TECH.PiecesIterator).%New(ValueList,Seperator)
-	While (Iterator.HasNext())
-	{
-		#dim Value As %String = Iterator.Next()
-		#dim EnumProperty As %String = ..GeefJavaCompliantEnumProperty(Value)
-		Do MagazijnConstructors.Insert(EnumProperty_"("""_Value_""")")
-		Do MapValues.Insert("put("""_Value_""", "_EnumProperty_");")
+	
+	#dim MethodIt As TECH.Iterator = ##class(TECH.ListIterator).%New(Klasse.Methods)
+	While MethodIt.HasNext(){
+		#dim Method As %Dictionary.CompiledMethod = MethodIt.Next()
+		If Method.ClassMethod && ('Method.Private) && ('Method.Abstract) && (Method.Origin = Klasse.Name){
+			
+			#dim Value As %String = $ZOBJCLASSMETHOD(Klasse.Name,Method.Name)
+			#dim DisplayValue As %String = $ZOBJCLASSMETHOD(Klasse.Name,"LogicalToDisplay",Value)
+			Do MagazijnConstructors.Insert(Method.Name_"("""_Value_""","""_DisplayValue_""")")
+			Do MapValues.Insert("put("""_Value_""", "_Method.Name_");")
+		}
 	}
 	
 	
@@ -27,13 +28,15 @@
 	Do Stream.WriteLine("	"_##class(TECH.ListUtils).ListToPieces(MagazijnConstructors,",")_";")
 	Do Stream.WriteLine("	")
 	Do Stream.WriteLine("	private java.lang.String value;")
+	Do Stream.WriteLine("	private java.lang.String displayValue;")
 	Do Stream.WriteLine("	")
 	Do Stream.WriteLine("	@SuppressWarnings(""serial"")")
 	Do Stream.WriteLine("	private static HashMap<String, "_..GeefKlasseNaam(Klasse)_"> values = new HashMap<String, "_..GeefKlasseNaam(Klasse)_">() { { "_##class(TECH.ListUtils).ListToPieces(MapValues," ")_" } }; ") 
 	Do Stream.WriteLine("	")
-	Do Stream.WriteLine("	private "_..GeefKlasseNaam(Klasse)_"(java.lang.String value)")
+	Do Stream.WriteLine("	private "_..GeefKlasseNaam(Klasse)_"(java.lang.String value, java.lang.String displayValue)")
 	Do Stream.WriteLine("	{")
 	Do Stream.WriteLine("		this.value = value;")
+	Do Stream.WriteLine("		this.displayValue = displayValue;")
 	Do Stream.WriteLine("	}")
 	Do Stream.WriteLine("	")
 	Do Stream.WriteLine("	public static "_..GeefKlasseNaam(Klasse)_" fromValue(java.lang.String value)")
@@ -59,7 +62,7 @@
 </Method>
 
 <Method name="GeefJavaCompliantEnumProperty">
-<FormalSpec>EnumProperty:%String</FormalSpec>
+<FormalSpec>EnumProperty:%String,Klasse:%CompiledClass</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[