Skip to content

Don't generate a builder() method in abstract classes #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwharm merged 1 commit into from
Feb 8, 2025
Merged

Don't generate a builder() method in abstract classes #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions generator/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,15 @@ else if (cls.isInstanceOf("GObject", "ParamSpec"))
if (cls.abstract_())
builder.addType(implClass());

if (cls.isInstanceOf("GObject", "Object")) {
if (cls.checkIsGObject()) {
builder.addMethod(gobjectConstructor());
BuilderGenerator generator = new BuilderGenerator(cls);
builder.addMethod(generator.generateBuilderMethod());
builder.addType(generator.generateBuilderClass());
if (!cls.abstract_()) // no builder() for abstract classes
builder.addMethod(generator.generateBuilderMethod());
}

// Extra methods in GObject class
if ("GObject".equals(cls.cType()))
builder.addMethod(gobjectFactory())
.addMethod(gobjectClassFactory())
Expand All @@ -151,9 +154,7 @@ else if (cls.isInstanceOf("GObject", "ParamSpec"))
.addMethod(gobjectConnectAfter())
.addMethod(gobjectEmit());

if (cls.checkIsGObject())
builder.addMethod(gobjectConstructor());

// Extra method in GListStore class (deprecated, to be removed)
if ("GListStore".equals(cls.cType()))
builder.addMethod(gListStoreRemoveItem());

Expand Down Expand Up @@ -286,15 +287,13 @@ private MethodSpec gobjectClassFactory() {
private MethodSpec gobjectConstructor() {
return MethodSpec.constructorBuilder()
.addJavadoc("""
Creates a new instance of a GObject-derived class with the provided
property names and values. For your own GObject-derived Java classes,
a GType must have been registered using {@code Types.register(Class<?>)}
Creates a new $L with the provided property names and values.

@param propertyNamesAndValues pairs of property names and values
(Strings and Objects). Does not need to be null-terminated.
@return the newly created GObject instance
@throws IllegalArgumentException invalid property names or values
""")
""", name())
.addModifiers(Modifier.PUBLIC)
.addParameter(Object[].class, "propertyNamesAndValues")
.varargs(true)
Expand Down