Change parameter of generated enum fromValue() methods to int

octachoron · octachoron · commit c9213f31d24f · 2014-08-14T20:09:01.000+02:00
Contrary to what I thought, this has to be int, because the first
argument of FlagSet.fromValues() has to be int - that is the version
that returns an IntValuedEnum.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -406,11 +406,8 @@ private void parseEnumeration(Element root, ParsingContext context) {
 			
 			//fromValue method
 			JMethod fromValue = enumClass.method(JMod.PUBLIC | JMod.STATIC, concreteIntValuedEnumClass, "fromValue");
-			/* 
-			 * XXX: This parameter is an int in the BridJ type mapping doc. This seems to be incorrect,
-			 * as this method accepts one or more ORed values, and these values are longs. 
-			 */
-			JVar fromValueParam = fromValue.param(long.class, "value");
+			
+			JVar fromValueParam = fromValue.param(int.class, "value");
 			JClass flagSetClass = cm.ref(FlagSet.class);
 			JInvocation fromValueCall = flagSetClass.staticInvoke("fromValue")
 					.arg(fromValueParam)
