Updated for release 7.5.0

rmraya · Apr 22, 2024 · fd37070 · fd37070
1 parent 282af7e
commit fd37070
Show file tree

Hide file tree

Showing 20 changed files with 131 additions and 107 deletions.
diff --git a/.classpath b/.classpath
@@ -21,17 +21,17 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="jars/mapdb.jar">
+	<classpathentry kind="lib" path="jars/openxliff.jar">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="jars/openxliff.jar">
+	<classpathentry kind="lib" path="jars/xmljava.jar">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="jars/xmljava.jar">
+	<classpathentry kind="lib" path="jars/bcp47j.jar">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ An open source UI for [OpenXLIFF Filters](https://github.com/rmraya/OpenXLIFF).
 
 Version | Comment | Release Date
 :------:|---------|:-----------:
+7.5.0 | Updated OpenXLIFF to version 3.20.0 | April 21, 2024
 7.4.0 | Updated OpenXLIFF to version 3.17.0; migrated to Java 21 | January 12, 2024
 7.3.0 | Updated OpenXLIFF to version 3.16.0 | October 31, 2023
 7.2.0 | Updated OpenXLIFF to version 3.15.0 | September 13, 2023

diff --git a/build.xml b/build.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="dist" name="XLIFFManager">
-    <property name="target" value="17" />
-    <property name="source" value="17" />
+    <property name="target" value="21" />
+    <property name="source" value="21" />
     <property name="build.compiler" value="javac10+" />
     <path id="XLIFFManager.classpath">
+        <pathelement location="jars/bcp47j.jar" />
         <pathelement location="jars/dtd.jar" />
         <pathelement location="jars/json.jar" />
         <pathelement location="jars/jsoup.jar" />
-        <pathelement location="jars/mapdb.jar" />
         <pathelement location="jars/openxliff.jar" />
         <pathelement location="jars/xmljava.jar" />
     </path>

diff --git a/css/dark.css b/css/dark.css
@@ -316,6 +316,10 @@ svg {
 	text-align: left;
 }
 
+.paddedArea {
+	padding: 8px;
+}
+
 .paddedTop {
 	padding-top: 4px;
 }
diff --git a/css/light.css b/css/light.css
@@ -316,6 +316,10 @@ svg {
 	text-align: left;
 }
 
+.paddedArea {
+	padding: 8px;
+}
+
 .paddedTop {
 	padding-top: 4px;
 }
diff --git a/html/en/about.html b/html/en/about.html
@@ -26,6 +26,10 @@ <h2 id="xliffmanager">XLIFF Manager</h2>
                     <td class="left noWrap">XMLJava</td>
                     <td class="left noWrap" id="xmlj_version" ></td>
                 </tr>
+                <tr>
+                    <td class="left noWrap">BCP47J</td>
+                    <td class="left noWrap" id="bcp47j_version" ></td>
+                </tr>
                 <tr>
                     <td class="left noWrap">Java</td>
                     <td class="left noWrap" id="java_version"></td>

diff --git a/html/en/licenses.html b/html/en/licenses.html
@@ -3,53 +3,54 @@
 
 <head>
     <title>Licenses</title>
-    <link id="theme" rel="stylesheet" type="text/css" href="../css/light.css">
-    <link rel="stylesheet" type="text/css" href="../../css/fonts.css">
+    <link id="theme" rel="stylesheet" type="text/css" href="../../css/light.css">
 </head>
 
-<body style="padding:8px;" onload="new Licenses();">
-    <table class="fill_width " style="height: 24em;">
-        <tr class="noWrap">
-            <td>XLIFF Manager</td>
-            <td><a id="XLIFFManager">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td >OpenXLIFF Filters</td>
-            <td><a id="OpenXLIFF">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>XMLJava</td>
-            <td><a id="XMLJava">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>Electron</td>
-            <td><a id="electron">MIT License</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>TypeScript</td>
-            <td><a id="TypeScript">Apache License 2.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>Java SE</td>
-            <td><a id="Java">GPL2 with Classpath Exception</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>JSON</td>
-            <td><a id="JSON">JSON.org</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>MapDB</td>
-            <td><a id="MapDB">Apache License 2.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>jsoup</td>
-            <td><a id="jsoup">MIT License</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>DTDParser</td>
-            <td><a id="DTDParser">LGPL 2.1</a></td>
-        </tr>
-    </table>
+<body onload="new Licenses();">
+    <div class="paddedArea">
+        <table class="fill_width">
+            <tr class="noWrap">
+                <td>XLIFF Manager</td>
+                <td><a id="XLIFFManager">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>OpenXLIFF Filters</td>
+                <td><a id="OpenXLIFF">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>XMLJava</td>
+                <td><a id="XMLJava">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>Electron</td>
+                <td><a id="electron">MIT License</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>TypeScript</td>
+                <td><a id="TypeScript">Apache License 2.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>Java SE</td>
+                <td><a id="Java">GPL2 with Classpath Exception</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>JSON</td>
+                <td><a id="JSON">JSON.org</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>BCP47J</td>
+                <td><a id="bcp47j">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>jsoup</td>
+                <td><a id="jsoup">MIT License</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>DTDParser</td>
+                <td><a id="DTDParser">LGPL 2.1</a></td>
+            </tr>
+        </table>
+    </div>
     <script src="../../js/keyboardHandler.js"></script>
     <script src="../../js/licenses.js"></script>
 </body>

diff --git a/html/es/about.html b/html/es/about.html
@@ -26,6 +26,10 @@ <h2 id="xliffmanager">XLIFF Manager</h2>
                     <td class="left noWrap">XMLJava</td>
                     <td class="left noWrap" id="xmlj_version" ></td>
                 </tr>
+                <tr>
+                    <td class="left noWrap">BCP47J</td>
+                    <td class="left noWrap" id="bcp47j_version" ></td>
+                </tr>
                 <tr>
                     <td class="left noWrap">Java</td>
                     <td class="left noWrap" id="java_version"></td>

diff --git a/html/es/licenses.html b/html/es/licenses.html
@@ -3,55 +3,56 @@
 
 <head>
     <title>Licencias</title>
-    <link id="theme" rel="stylesheet" type="text/css" href="../css/light.css">
-    <link rel="stylesheet" type="text/css" href="../../css/fonts.css">
+    <link id="theme" rel="stylesheet" type="text/css" href="../../css/light.css">
 </head>
 
-<body style="padding:8px;" onload="new Licenses();">
-    <table class="fill_width " style="height: 24em;">
-        <tr class="noWrap">
-            <td>XLIFF Manager</td>
-            <td><a id="XLIFFManager">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td >OpenXLIFF Filters</td>
-            <td><a id="OpenXLIFF">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>XMLJava</td>
-            <td><a id="XMLJava">Eclipse Public License 1.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>Electron</td>
-            <td><a id="electron">MIT License</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>TypeScript</td>
-            <td><a id="TypeScript">Apache License 2.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>Java SE</td>
-            <td><a id="Java">GPL2 with Classpath Exception</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>JSON</td>
-            <td><a id="JSON">JSON.org</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>MapDB</td>
-            <td><a id="MapDB">Apache License 2.0</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>jsoup</td>
-            <td><a id="jsoup">MIT License</a></td>
-        </tr>
-        <tr class="noWrap">
-            <td>DTDParser</td>
-            <td><a id="DTDParser">LGPL 2.1</a></td>
-        </tr>
-    </table>
+<body onload="new Licenses();">
+    <div class="paddedArea">
+        <table class="fill_width">
+            <tr class="noWrap">
+                <td>XLIFF Manager</td>
+                <td><a id="XLIFFManager">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>OpenXLIFF Filters</td>
+                <td><a id="OpenXLIFF">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>XMLJava</td>
+                <td><a id="XMLJava">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>Electron</td>
+                <td><a id="electron">MIT License</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>TypeScript</td>
+                <td><a id="TypeScript">Apache License 2.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>Java SE</td>
+                <td><a id="Java">GPL2 with Classpath Exception</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>JSON</td>
+                <td><a id="JSON">JSON.org</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>BCP47J</td>
+                <td><a id="bcp47j">Eclipse Public License 1.0</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>jsoup</td>
+                <td><a id="jsoup">MIT License</a></td>
+            </tr>
+            <tr class="noWrap">
+                <td>DTDParser</td>
+                <td><a id="DTDParser">LGPL 2.1</a></td>
+            </tr>
+        </table>
+    </div>
     <script src="../../js/keyboardHandler.js"></script>
     <script src="../../js/licenses.js"></script>
 </body>
 
-</html>
+</html>
diff --git a/jars/bcp47j.jar b/jars/bcp47j.jar
diff --git a/jars/mapdb.jar b/jars/mapdb.jar
diff --git a/jars/openxliff.jar b/jars/openxliff.jar
diff --git a/jars/xmljava.jar b/jars/xmljava.jar
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xliffmanager",
   "productName": "XLIFF Manager",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "description": "XLIFF Manager, a cross-platform open source graphical user interface for OpenXLIFF Filters",
   "main": "js/app.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "url": "https://github.com/rmraya/XLIFFManager.git"
   },
   "devDependencies": {
-    "electron": "^28.1.3",
-    "typescript": "^5.3.3"
+    "electron": "^30.0.1",
+    "typescript": "^5.4.5"
   }
 }
diff --git a/src/com/maxprograms/server/Constants.java b/src/com/maxprograms/server/Constants.java
@@ -18,8 +18,8 @@ private Constants() {
         // do not instantiate this class
     }
 
-    public static final String VERSION = "7.4.0";
-    public static final String BUILD = "20240112_0815";
+    public static final String VERSION = "7.5.0";
+    public static final String BUILD = "20240421_1342";
     public static final String STATUS = "Status";
     public static final String REASON = "Reason";
     public static final String APPNAME = "XLIFFManager";

diff --git a/src/com/maxprograms/server/XliffHandler.java b/src/com/maxprograms/server/XliffHandler.java
@@ -120,6 +120,10 @@ public void handle(HttpExchange exchange) throws IOException {
 						com.maxprograms.converters.Constants.BUILD }));
 				result.put("XMLJava", mf.format(
 						new String[] { com.maxprograms.xml.Constants.VERSION, com.maxprograms.xml.Constants.BUILD }));
+				result.put("BCP47J", mf.format(
+						new String[] { com.maxprograms.languages.Constants.VERSION,
+								com.maxprograms.languages.Constants.BUILD }));
+
 				result.put("Java", mf.format(
 						new String[] { System.getProperty("java.version"), System.getProperty("java.vendor") }));
 				response = result.toString(2);

diff --git a/src/module-info.java b/src/module-info.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 Maxprograms.
+ * Copyright (c) 2018 - 2024 Maxprograms.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 1.0 which accompanies this distribution,
@@ -14,10 +14,10 @@
 	requires openxliff;
 	requires dtd;
 	requires jsoup;
-	requires mapdb;
 	requires java.base;
 	requires java.logging;
 	requires java.net.http;
+	requires transitive javabcp47;
 	requires transitive xmljava;
 	requires transitive json;
 	requires transitive jdk.httpserver;

diff --git a/ts/about.ts b/ts/about.ts
@@ -25,6 +25,7 @@ class About {
             (document.getElementById('xlfm_version') as HTMLTableCellElement).innerHTML = arg.XLIFFManager;
             (document.getElementById('oxlf_version') as HTMLTableCellElement).innerHTML = arg.OpenXLIFF;
             (document.getElementById('xmlj_version') as HTMLTableCellElement).innerHTML = arg.XMLJava;
+            (document.getElementById('bcp47j_version') as HTMLTableCellElement).innerHTML = arg.BCP47J;
             (document.getElementById('java_version') as HTMLTableCellElement).innerHTML = arg.Java;
             (document.getElementById('elect_version') as HTMLTableCellElement).innerHTML = arg.electron;
             this.electron.ipcRenderer.send('about-height', { width: document.body.clientWidth, height: (document.body.clientHeight + 40) });

diff --git a/ts/app.ts b/ts/app.ts
@@ -1150,6 +1150,7 @@ class App {
         switch (type) {
             case 'XLIFFManager':
             case "OpenXLIFF":
+            case "BCP47J":
             case "XMLJava":
                 licenseFile = 'file://' + this.path.join(app.getAppPath(), 'html', 'licenses', 'EclipsePublicLicense1.0.html');
                 title = 'Eclipse Public License 1.0';
@@ -1159,7 +1160,6 @@ class App {
                 title = 'MIT License';
                 break;
             case "TypeScript":
-            case "MapDB":
                 licenseFile = 'file://' + this.path.join(app.getAppPath(), 'html', 'licenses', 'Apache2.0.html');
                 title = 'Apache 2.0';
                 break;

diff --git a/ts/licenses.ts b/ts/licenses.ts
@@ -40,8 +40,8 @@ class Licenses {
         (document.getElementById('JSON') as HTMLAnchorElement).addEventListener('click', () => {
             this.openLicense('JSON');
         });
-        (document.getElementById('MapDB') as HTMLAnchorElement).addEventListener('click', () => {
-            this.openLicense('MapDB');
+        (document.getElementById('bcp47j') as HTMLAnchorElement).addEventListener('click', () => {
+            this.openLicense('BCP47J');
         });
         (document.getElementById('jsoup') as HTMLAnchorElement).addEventListener('click', () => {
             this.openLicense('jsoup');