Make private fields private in the generated code as well

octachoron · octachoron · commit 74cf62dcfb35 · 2014-08-17T10:40:39.000+02:00
They cause name clashes when a class and its superclass both declare
a pointer field named "priv", but the pointers are differently typed.
We do not have to know about private fields anyways, so make them
private to prevent inheritance. Leave them in place so that BridJ
knows about them.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -661,6 +661,7 @@ private ConvertedType findType(Element root, ParsingContext context) {
 	
 	@SuppressWarnings("unused")
 	private void parseRecordField(Element root, ParsingContext context) {
+		
 		JDefinedClass record = (JDefinedClass) context.getCmNode();
 		String name = "field_" + root.getAttributeValue("name");
 		
@@ -679,11 +680,17 @@ private void parseRecordField(Element root, ParsingContext context) {
 		String bridjType = convType.bridjMethodifyTypeName();
 		JType fieldType = convType.getJType();
 		
-		JMethod getter = record.method(JMod.PUBLIC, fieldType, name);
+		String privateAttribute = root.getAttributeValue("private");
+		int modifier = JMod.PUBLIC;
+		if ("1".equals(privateAttribute)) {
+			modifier = JMod.PRIVATE;
+		}
+		
+		JMethod getter = record.method(modifier, fieldType, name);
 		getter.annotate(Field.class).param("value", fieldIdx);
 		getter.body().directStatement("return this.io.get" + bridjType + "Field(this, " + fieldIdx + ");");
 
-		JMethod setter = record.method(JMod.PUBLIC, record, name);
+		JMethod setter = record.method(modifier, record, name);
 		setter.annotate(Field.class).param("value", fieldIdx);
 		setter.param(fieldType, name);
 		setter.body().directStatement("this.io.set" + bridjType + "Field(this, " + fieldIdx + ", " + name + ");");
