Fix signal interface generation #146
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building classes using ClassBuilderInfo, arguments to the super() [superArguments] are automatically added to the constructor of the newly generated class. These arguments are not saved to the private members of the class. Saving to private members in the constructor is only done for [arguments] only. To have both: * saving to private members for getters and setters and * supplying to super() we have to add the argument to both: superArguments and arguments. But this then results to duplicate arguments to the constructor. This commit now removes these double arguments.
The constructor for dbus signals was generated wrong. For example this
introspection.xml:
<node>
<interface name="de.Example">
<signal name="ExampleSignal">
<arg type="s" name="newState"/>
</signal>
</interface>
</node>
did generate this class:
public interface Example extends DBusInterface {
public static class ExampleSignal extends DBusSignal {
private final String newState;
public ExampleSignal(String _path, String _interfaceName, String _newState) throws DBusException {
super(_path, _interfaceName);
this.newState = _newState;
}
public String getNewState() {
return newState;
}
}
}
This is wrong. With this interface it is not possible to emit this
signal using dbus-java.
When the ExampleSignal constructor is called, this leads to the
DBusSignal constructor to be called with _path and _interfaceName
arguments. DBusSignal class then infers from the enclosing classes
arguments, that there must be two string arguments ("ss") to this
signal. It is only one.
The interface constructor has to look something like this:
public ExampleSignal(String _path, String _newState) throws DBusException {
super(_path, _newState);
this.newState = _newState;
}
This is what this commit does. It changes the interface generation to
reflect this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Interface generation for signals is wrong in some way.
This simple signal
<node> <interface name="de.Example"> <signal name="ExampleSignal"> <arg type="s" name="newState"/> </signal> </interface> </node>using
InterfaceCodeGeneratorgenerates to this interface` public interface Example extends DBusInterface {
public static class ExampleSignal extends DBusSignal {
`
which is wrong. The constructor should be like this instead:
public ExampleSignal(String _path, String _newState) throws DBusException { super(_path, _newState); this.newState = _newState; }Explained a bit more in the commit message.