diff --git a/.classpath b/.classpath index 15a4dcf..c5ff1eb 100644 --- a/.classpath +++ b/.classpath @@ -21,17 +21,17 @@ - + - + - + diff --git a/README.md b/README.md index 5389566..a8ab4e0 100644 --- 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 index 1483131..9e234c7 100644 --- a/build.xml +++ b/build.xml @@ -1,13 +1,13 @@ - - + + + - diff --git a/css/dark.css b/css/dark.css index 7db1c1f..10e58a4 100644 --- a/css/dark.css +++ b/css/dark.css @@ -316,6 +316,10 @@ svg { text-align: left; } +.paddedArea { + padding: 8px; +} + .paddedTop { padding-top: 4px; } \ No newline at end of file diff --git a/css/light.css b/css/light.css index 2b98455..8a4335b 100644 --- a/css/light.css +++ b/css/light.css @@ -316,6 +316,10 @@ svg { text-align: left; } +.paddedArea { + padding: 8px; +} + .paddedTop { padding-top: 4px; } \ No newline at end of file diff --git a/html/en/about.html b/html/en/about.html index d9b0a7c..9eb09f4 100644 --- a/html/en/about.html +++ b/html/en/about.html @@ -26,6 +26,10 @@

XLIFF Manager

XMLJava + + BCP47J + + Java diff --git a/html/en/licenses.html b/html/en/licenses.html index e46f4cc..09a81be 100644 --- a/html/en/licenses.html +++ b/html/en/licenses.html @@ -3,53 +3,54 @@ Licenses - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
XLIFF ManagerEclipse Public License 1.0
OpenXLIFF FiltersEclipse Public License 1.0
XMLJavaEclipse Public License 1.0
ElectronMIT License
TypeScriptApache License 2.0
Java SEGPL2 with Classpath Exception
JSONJSON.org
MapDBApache License 2.0
jsoupMIT License
DTDParserLGPL 2.1
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
XLIFF ManagerEclipse Public License 1.0
OpenXLIFF FiltersEclipse Public License 1.0
XMLJavaEclipse Public License 1.0
ElectronMIT License
TypeScriptApache License 2.0
Java SEGPL2 with Classpath Exception
JSONJSON.org
BCP47JEclipse Public License 1.0
jsoupMIT License
DTDParserLGPL 2.1
+
diff --git a/html/es/about.html b/html/es/about.html index e82c642..49c3c36 100644 --- a/html/es/about.html +++ b/html/es/about.html @@ -26,6 +26,10 @@

XLIFF Manager

XMLJava + + BCP47J + + Java diff --git a/html/es/licenses.html b/html/es/licenses.html index afa37ca..3e258d9 100644 --- a/html/es/licenses.html +++ b/html/es/licenses.html @@ -3,55 +3,56 @@ Licencias - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
XLIFF ManagerEclipse Public License 1.0
OpenXLIFF FiltersEclipse Public License 1.0
XMLJavaEclipse Public License 1.0
ElectronMIT License
TypeScriptApache License 2.0
Java SEGPL2 with Classpath Exception
JSONJSON.org
MapDBApache License 2.0
jsoupMIT License
DTDParserLGPL 2.1
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
XLIFF ManagerEclipse Public License 1.0
OpenXLIFF FiltersEclipse Public License 1.0
XMLJavaEclipse Public License 1.0
ElectronMIT License
TypeScriptApache License 2.0
Java SEGPL2 with Classpath Exception
JSONJSON.org
BCP47JEclipse Public License 1.0
jsoupMIT License
DTDParserLGPL 2.1
+
- + \ No newline at end of file diff --git a/jars/bcp47j.jar b/jars/bcp47j.jar new file mode 100644 index 0000000..7d8723d Binary files /dev/null and b/jars/bcp47j.jar differ diff --git a/jars/mapdb.jar b/jars/mapdb.jar deleted file mode 100644 index 5331731..0000000 Binary files a/jars/mapdb.jar and /dev/null differ diff --git a/jars/openxliff.jar b/jars/openxliff.jar index 0f34c44..52d8941 100644 Binary files a/jars/openxliff.jar and b/jars/openxliff.jar differ diff --git a/jars/xmljava.jar b/jars/xmljava.jar index 6aa9afb..45cd5a6 100644 Binary files a/jars/xmljava.jar and b/jars/xmljava.jar differ diff --git a/package.json b/package.json index f8f1070..dec4a60 100644 --- 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 index 20060cb..8879fa3 100644 --- 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 index 07091a0..67c4dbc 100644 --- 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 index ac01da3..ff87c80 100644 --- 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 index 38996f1..db87b92 100644 --- 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 index 56bbb54..fdee45b 100644 --- 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 index a79bd43..ff15bb1 100644 --- 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');