Skip to content

Commit f4b21a9

Browse files
committedSep 22, 2024·
Remove SignalHandler class, not needed anymore: since #125 the arena is closed automatically
1 parent c8734ce commit f4b21a9

File tree

3 files changed

+5
-133
lines changed

3 files changed

+5
-133
lines changed
 

‎buildSrc/src/main/java/io/github/jwharm/javagi/configuration/ClassNames.java

-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public final class ClassNames {
5757
public static final ClassName BUILDER_INTERFACE = get(PKG_GOBJECT, "BuilderInterface");
5858
public static final ClassName INSTANCE_CACHE = get(PKG_GOBJECT, "InstanceCache");
5959
public static final ClassName JAVA_CLOSURE = get(PKG_GOBJECT, "JavaClosure");
60-
public static final ClassName SIGNAL_CONNECTION = get(PKG_GOBJECT, "SignalConnection");
6160

6261
public static final ClassName OVERRIDES = get(PKG_GOBJECT_TYPES, "Overrides");
6362
public static final ClassName PROPERTIES = get(PKG_GOBJECT_TYPES, "Properties");
@@ -66,7 +65,6 @@ public final class ClassNames {
6665
public static final ClassName TYPES = get(PKG_GOBJECT_TYPES, "Types");
6766

6867
// Some frequently used class names
69-
public final static ClassName DESTROY_NOTIFY = get("org.gnome.glib", "DestroyNotify");
7068
public final static ClassName GERROR = get("org.gnome.glib", "GError");
7169
public final static ClassName GLIB = get("org.gnome.glib", "GLib");
7270
public final static ClassName GTYPE = get("org.gnome.glib", "Type");

‎buildSrc/src/main/java/io/github/jwharm/javagi/generators/ClassGenerator.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@ private MethodSpec gobjectConnect() {
282282
283283
@param detailedSignal a string of the form "signal-name::detail"
284284
@param callback the callback to connect
285-
@return a SignalConnection object to track, block and disconnect the
285+
@return a signal handler id to track, block and disconnect the
286286
signal connection
287287
""")
288288
.addModifiers(Modifier.PUBLIC)
289289
.addTypeVariable(TypeVariableName.get("T"))
290-
.returns(ClassNames.SIGNAL_CONNECTION)
290+
.returns(int.class)
291291
.addParameter(String.class, "detailedSignal")
292292
.addParameter(TypeVariableName.get("T"), "callback")
293293
.addStatement("return connect(detailedSignal, callback, false)")
@@ -303,21 +303,19 @@ private MethodSpec gobjectConnectAfter() {
303303
@param callback the callback to connect
304304
@param after whether the handler should be called before or
305305
after the default handler of the signal
306-
@return a SignalConnection object to track, block and disconnect the
306+
@return a signal handler id to track, block and disconnect the
307307
signal connection
308308
""")
309309
.addModifiers(Modifier.PUBLIC)
310310
.addTypeVariable(TypeVariableName.get("T"))
311-
.returns(ClassNames.SIGNAL_CONNECTION)
311+
.returns(int.class)
312312
.addParameter(String.class, "detailedSignal")
313313
.addParameter(TypeVariableName.get("T"), "callback")
314314
.addParameter(boolean.class, "after")
315315
.addStatement("$1T closure = new $1T(callback)",
316316
ClassNames.JAVA_CLOSURE)
317-
.addStatement("int handlerId = $T.signalConnectClosure(this, detailedSignal, closure, after)",
317+
.addStatement("return $T.signalConnectClosure(this, detailedSignal, closure, after)",
318318
ClassNames.GOBJECTS)
319-
.addStatement("return new $T(handle(), handlerId, closure)",
320-
ClassNames.SIGNAL_CONNECTION)
321319
.build();
322320
}
323321

‎modules/gobject/src/main/java/io/github/jwharm/javagi/gobject/SignalConnection.java

-124
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.