Merge branch 'master' of github.com:lawson89/Sierra

Author: lawson89

sierra-tools/dtd-encoder/build.gradle

@@ -18,6 +18,15 @@ plugins {
 
 dependencies {
     implementation project(':sierra')
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testImplementation 'org.jfree:jfreechart:1.5.6'
+
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+tasks.named('test', Test) {
+    useJUnitPlatform()
 }
 
 application {

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

@@ -23,6 +23,7 @@
 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;
@@ -34,16 +35,17 @@
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Image;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import static org.httprpc.sierra.UILoader.*;
 
@@ -251,6 +253,12 @@ private void declareAttributeList(String tag, Class<?> type, Writer writer) thro
     }
 
     public static void main(String[] args) throws Exception {
+        var workingPath = Path.of(System.getProperty("user.dir"));
+
+        if (args.length > 0) {
+            applyBindings(workingPath.resolve(args[0]));
+        }
+
         var typeSet = new HashSet<Class<?>>();
 
         var tags = new HashMap<Class<?>, String>();
@@ -271,15 +279,29 @@ public static void main(String[] args) throws Exception {
 
         typeList.sort(Comparator.comparing(DTDEncoder::getDepth).thenComparing(Class::getCanonicalName));
 
-        var dtdEncoder = new DTDEncoder(typeList, tags);
+        try (var outputStream = Files.newOutputStream(workingPath.resolve("sierra.dtd"))) {
+            var dtdEncoder = new DTDEncoder(typeList, tags);
 
-        var file = new File(new File(System.getProperty("user.dir")), "sierra.dtd");
-
-        try (var outputStream = new FileOutputStream(file)) {
             dtdEncoder.write(null, outputStream);
         }
     }
 
+    @SuppressWarnings("unchecked")
+    private static void applyBindings(Path path) 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 type = (Class<? extends JComponent>)Class.forName((String)entry.getValue());
+
+            UILoader.bind(tag, type, () -> null);
+        }
+    }
+
     private static int getDepth(Class<?> type) {
         var depth = 0;
 

sierra-tools/dtd-encoder/src/test/java/org/httprpc/sierra/tools/DTDEncoderTest.java

@@ -0,0 +1,59 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.httprpc.sierra.tools;
+
+import org.httprpc.kilo.io.TextDecoder;
+import org.jfree.chart.ChartPanel;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class DTDEncoderTest {
+    @Test
+    public void testDTDEncoder() throws Exception {
+        var workingPath = Path.of(System.getProperty("user.dir"));
+
+        var bindingsPath = workingPath.resolve("bindings.properties");
+        var dtdPath = workingPath.resolve("sierra.dtd");
+
+        var properties = new Properties();
+
+        properties.put("chart-panel", ChartPanel.class.getName());
+
+        try {
+            try (var outputStream = Files.newOutputStream(bindingsPath)) {
+                properties.store(outputStream, "Test Bindings");
+            }
+
+            DTDEncoder.main(new String[]{bindingsPath.getFileName().toString()});
+
+            String text;
+            try (var inputStream = Files.newInputStream(dtdPath)) {
+                var textDecoder = new TextDecoder();
+
+                text = textDecoder.read(inputStream);
+            }
+
+            assertTrue(text.contains("chart-panel"));
+        } finally {
+            Files.deleteIfExists(bindingsPath);
+            Files.deleteIfExists(dtdPath);
+        }
+    }
+}