Merge pull request #146 from poeschel/fix_signal_interface_generation

Fix signal interface generation
hypfvieh · Aug 9, 2021 · 332ab45 · 332ab45
2 parents c801402 + 1458981
commit 332ab45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java b/dbus-java-utils/src/main/java/org/freedesktop/dbus/utils/generator/ClassBuilderInfo.java
@@ -263,8 +263,10 @@ private List<String> createClassFileContent(boolean _staticClass, Set<String> _o
                 String outerIndent = _staticClass ? "        " : "    ";
                 String cstr = outerIndent + "public " + getClassName() + "(";
 
-                if (!constructor.getSuperArguments().isEmpty()) {
-                    cstr += constructor.getSuperArguments().stream().map(e -> e.asOneLineString(allImports, false)).collect(Collectors.joining(", "));
+                List<ClassBuilderInfo.MemberOrArgument> filteredSuperArguments = new ArrayList<>(constructor.getSuperArguments());
+                filteredSuperArguments.removeIf(e -> constructor.getArguments().contains(e));
+                if (!filteredSuperArguments.isEmpty()) {
+                    cstr += filteredSuperArguments.stream().map(e -> e.asOneLineString(allImports, false)).collect(Collectors.joining(", "));
                     if (!constructor.getArguments().isEmpty()) {
                         cstr += ", ";
                     }

diff --git a/...java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java b/...java-utils/src/main/java/org/freedesktop/dbus/utils/generator/InterfaceCodeGenerator.java
@@ -250,7 +250,7 @@ private List<ClassBuilderInfo> extractSignals(Element _signalElement, ClassBuild
         classConstructor.getThrowArguments().add(DBusException.class.getSimpleName());
 
         classConstructor.getSuperArguments().add(new MemberOrArgument("_path", "String", false));
-        classConstructor.getSuperArguments().add(new MemberOrArgument("_interfaceName", "String", false));
+        classConstructor.getSuperArguments().addAll(argsList);
 
         innerClass.getConstructors().add(classConstructor);