Update DTDEncoder.

Author: gk-brown

build.gradle

@@ -14,7 +14,7 @@
 
 subprojects {
     group = 'org.httprpc'
-    version = '3.5'
+    version = '3.5.1'
 
     repositories {
         mavenCentral()

sierra-tools/dtd-encoder/src/main/java/org/httprpc/sierra/tools/dtd/DTDEncoder.java

@@ -23,7 +23,6 @@
 import org.httprpc.sierra.VerticalAlignment;
 
 import javax.swing.Icon;
-import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JPanel;
@@ -270,7 +269,13 @@ public static void main(String[] args) throws Exception {
                 }
             }
 
-            applyBindings(workingPath.resolve(args[0]), classLoader);
+            var bindings = new Properties();
+
+            try (var inputStream = Files.newInputStream(workingPath.resolve(args[0]))) {
+                bindings.load(inputStream);
+            }
+
+            UILoader.bind(bindings, classLoader);
         }
 
         var typeSet = new HashSet<Class<?>>();
@@ -300,22 +305,6 @@ public static void main(String[] args) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    private static void applyBindings(Path path, ClassLoader classLoader) throws IOException, ClassNotFoundException {
-        var bindings = new Properties();
-
-        try (var inputStream = Files.newInputStream(path)) {
-            bindings.load(inputStream);
-        }
-
-        for (var entry : bindings.entrySet()) {
-            var tag = (String)entry.getKey();
-            var typeName = (String)entry.getValue();
-
-            UILoader.bind(tag, (Class<? extends JComponent>)classLoader.loadClass(typeName), () -> null);
-        }
-    }
-
     private static int getDepth(Class<?> type) {
         var depth = 0;
 

sierra/src/main/java/org/httprpc/sierra/UILoader.java

@@ -67,15 +67,19 @@
 import java.awt.Image;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.function.Supplier;
 
@@ -1024,6 +1028,57 @@ public static <C extends JComponent> void bind(String tag, Class<C> type, Suppli
         suppliers.put(tag, supplier);
     }
 
+    /**
+     * Applies multiple bindings.
+     *
+     * @param bindings
+     * The bindings to apply.
+     */
+    public static void bind(Properties bindings) throws ReflectiveOperationException {
+        bind(bindings, ClassLoader.getSystemClassLoader());
+    }
+
+    /**
+     * Applies multiple bindings.
+     *
+     * @param bindings
+     * The bindings to apply.
+     *
+     * @param classLoader
+     * The class loader that will be used to resolve the bindings.
+     */
+    @SuppressWarnings("unchecked")
+    public static void bind(Properties bindings, ClassLoader classLoader) throws ClassNotFoundException {
+        if (bindings == null || classLoader == null) {
+            throw new IllegalArgumentException();
+        }
+
+        for (var entry : bindings.entrySet()) {
+            var tag = (String)entry.getKey();
+            var typeName = (String)entry.getValue();
+
+            var type = (Class<?>)classLoader.loadClass(typeName);
+
+            var constructors = type.getConstructors();
+
+            if (constructors.length == 0) {
+                throw new UnsupportedOperationException(String.format("%s cannot be instantiated.", typeName));
+            }
+
+            Arrays.sort(constructors, Comparator.comparing(Constructor::getParameterCount));
+
+            var constructor = constructors[0];
+
+            bind(tag, (Class<JComponent>)type, () -> {
+                try {
+                    return (JComponent)constructor.newInstance(new Object[constructor.getParameterCount()]);
+                } catch (InstantiationException | IllegalAccessException | InvocationTargetException exception) {
+                    throw new RuntimeException(exception);
+                }
+            });
+        }
+    }
+
     /**
      * Retrieves a named color.
      *