Do not make private class/record member getters/setters private

octachoron · octachoron · commit 8ee7ce445eb5 · 2014-08-28T23:30:45.000+02:00
BridJ does not count the fields this way, which alters the size of the
enclosing struct type as seen by BridJ. This causes problems with nested
structures, which is used extensively by GStreamer. (The nested structure
is believed by BridJ to be shorter than it actually is, therefore
potentially breaking offset calculation for other fields.)

Since the getters/setters are prefixed with the class name, no
inheritance-related name conflicts should occur, therefore it is safe to
make them public again.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -746,17 +746,11 @@ private void parseRecordField(Element root, ParsingContext context) {
 		String bridjType = convType.bridjMethodifyTypeName();
 		JType fieldType = convType.getJType();
 		
-		String privateAttribute = root.getAttributeValue("private");
-		int modifier = JMod.PUBLIC;
-		if ("1".equals(privateAttribute)) {
-			modifier = JMod.PRIVATE;
-		}
-		
-		JMethod getter = record.method(modifier, fieldType, name);
+		JMethod getter = record.method(JMod.PUBLIC, fieldType, name);
 		getter.annotate(Field.class).param("value", fieldIdx);
 		getter.body().directStatement("return this.io.get" + bridjType + "Field(this, " + fieldIdx + ");");
 
-		JMethod setter = record.method(modifier, record, name);
+		JMethod setter = record.method(JMod.PUBLIC, record, name);
 		setter.annotate(Field.class).param("value", fieldIdx);
 		setter.param(fieldType, name);
 		setter.body().directStatement("this.io.set" + bridjType + "Field(this, " + fieldIdx + ", " + name + ");");
