From 55d87aa213030564ca441b9933bb4371225370c1 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Thu, 24 Jul 2025 17:42:25 +0200 Subject: [PATCH 1/8] Remove special handling for currency units --- .../src/main/java/io/github/qudtlib/common/CodeGen.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/qudtlib-common-codegen/src/main/java/io/github/qudtlib/common/CodeGen.java b/qudtlib-common-codegen/src/main/java/io/github/qudtlib/common/CodeGen.java index 6d611405..cacf492b 100644 --- a/qudtlib-common-codegen/src/main/java/io/github/qudtlib/common/CodeGen.java +++ b/qudtlib-common-codegen/src/main/java/io/github/qudtlib/common/CodeGen.java @@ -58,9 +58,6 @@ public static Constant makeConstant( typeName.substring(0, 1).toLowerCase() + typeName.substring(1) + "FromLocalnameRequired"; - if (typeName.equals("Unit") && codeConstantName.endsWith("_Currency")) { - valueFactory = "currencyFromLocalnameRequired"; - } return new Constant( codeConstantName, iriLocalName, label, iri, typeName, symbol, valueFactory); } From 09742934e9b6e4bbc26c676873d0b5be4d7b60c9 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Thu, 24 Jul 2025 17:43:42 +0200 Subject: [PATCH 2/8] Upgrade all dependencies --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index 12abd426..68ed3510 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 12abd426f288661a97b0f71be319854127d15d6d +Subproject commit 68ed351095ffedb3bbbb1d1dc8965d874a360e15 From 7154174c5c0336a71632871b18d394af998a71f7 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Thu, 24 Jul 2025 19:31:47 +0200 Subject: [PATCH 3/8] Added concat-files as a submodule --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index 68ed3510..c2f03143 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 68ed351095ffedb3bbbb1d1dc8965d874a360e15 +Subproject commit c2f03143a28b761921e92122752244c01b8a6f94 From 0bb5f5c33ebdf2d7c6e8106b4bbc9b959d71425b Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Fri, 25 Jul 2025 13:09:02 +0200 Subject: [PATCH 4/8] Add index.d.ts files and adapt to QUDT API changes --- qudtlib-js | 2 +- qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qudtlib-js b/qudtlib-js index c2f03143..b266c943 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit c2f03143a28b761921e92122752244c01b8a6f94 +Subproject commit b266c943ab1fde6dd4d31b7ce08cf7688f47a9c8 diff --git a/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java b/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java index bb81359c..b218809b 100644 --- a/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java +++ b/qudtlib-main/src/main/java/io/github/qudtlib/Qudt.java @@ -335,7 +335,7 @@ public static Unit scale(String prefixLabel, String baseUnitLabel) { // to handle specifically. if (prefixLabel.toLowerCase(Locale.ROOT).equals("kilo") && baseUnitLabel.toLowerCase(Locale.ROOT).equals("gram")) { - return unitFromLabel("kilogram"); + return unitFromLocalname("KiloGM"); } return Optional.empty(); }) From 23cde77a9c473599c2bef02e9a5d1650ba454a7d Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Fri, 25 Jul 2025 13:26:44 +0200 Subject: [PATCH 5/8] Adapt unit tests --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index b266c943..13ca41ac 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit b266c943ab1fde6dd4d31b7ce08cf7688f47a9c8 +Subproject commit 13ca41ac7af29a3a291ab2989d582e05c6a42cc2 From 63fa910e2c41b68c3511b3dc0255eec0d25cc482 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Fri, 25 Jul 2025 13:38:00 +0200 Subject: [PATCH 6/8] Format sources --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index 13ca41ac..8395328f 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 13ca41ac7af29a3a291ab2989d582e05c6a42cc2 +Subproject commit 8395328fec5e2a0fe14bd79d0f6f49c53a8ec30c From bf437b4984ffb2127f90c7802467d221282d15ee Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Fri, 25 Jul 2025 13:48:13 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index 8395328f..05f07927 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 8395328fec5e2a0fe14bd79d0f6f49c53a8ec30c +Subproject commit 05f079277111d94042348aeb1f8f7621f5c1c156 From a79f8f40a0d34bef4cf7f76938203d4d2977ca94 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Fri, 25 Jul 2025 13:50:31 +0200 Subject: [PATCH 8/8] Switch to qudtlib-js main branch --- qudtlib-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qudtlib-js b/qudtlib-js index 05f07927..bf757ea5 160000 --- a/qudtlib-js +++ b/qudtlib-js @@ -1 +1 @@ -Subproject commit 05f079277111d94042348aeb1f8f7621f5c1c156 +Subproject commit bf757ea55fe43bf6842e8f0fb68640dcd7308e18