From 61916f556f67f834385db52907758b08ef0e8a6a Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:25:10 +0200
Subject: [PATCH] Move standardModules to properly namespaced package
---
src/main/java/de/tlc4b/TLC4B.java | 2 +-
src/main/resources/{ => de/tlc4b}/standardModules/BBuiltIns.tla | 0
.../{ => de/tlc4b}/standardModules/ExternalFunctions.tla | 0
src/main/resources/{ => de/tlc4b}/standardModules/Functions.tla | 0
.../{ => de/tlc4b}/standardModules/FunctionsAsRelations.tla | 0
src/main/resources/{ => de/tlc4b}/standardModules/Relations.tla | 0
.../{ => de/tlc4b}/standardModules/SequencesAsRelations.tla | 0
.../{ => de/tlc4b}/standardModules/SequencesExtended.tla | 0
8 files changed, 1 insertion(+), 1 deletion(-)
rename src/main/resources/{ => de/tlc4b}/standardModules/BBuiltIns.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/ExternalFunctions.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/Functions.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/FunctionsAsRelations.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/Relations.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/SequencesAsRelations.tla (100%)
rename src/main/resources/{ => de/tlc4b}/standardModules/SequencesExtended.tla (100%)
diff --git a/src/main/java/de/tlc4b/TLC4B.java b/src/main/java/de/tlc4b/TLC4B.java
index 81a544f..6e36a71 100644
--- a/src/main/java/de/tlc4b/TLC4B.java
+++ b/src/main/java/de/tlc4b/TLC4B.java
@@ -521,7 +521,7 @@ public class TLC4B {
InputStream is = null;
FileOutputStream fos = null;
try {
- is = this.getClass().getClassLoader().getResourceAsStream("standardModules/" + name + ".tla");
+ is = TLC4B.class.getResourceAsStream("standardModules/" + name + ".tla");
if (is == null) {
// should never happen
throw new TranslationException("Unable to determine the source of the standard module: " + name);
diff --git a/src/main/resources/standardModules/BBuiltIns.tla b/src/main/resources/de/tlc4b/standardModules/BBuiltIns.tla
similarity index 100%
rename from src/main/resources/standardModules/BBuiltIns.tla
rename to src/main/resources/de/tlc4b/standardModules/BBuiltIns.tla
diff --git a/src/main/resources/standardModules/ExternalFunctions.tla b/src/main/resources/de/tlc4b/standardModules/ExternalFunctions.tla
similarity index 100%
rename from src/main/resources/standardModules/ExternalFunctions.tla
rename to src/main/resources/de/tlc4b/standardModules/ExternalFunctions.tla
diff --git a/src/main/resources/standardModules/Functions.tla b/src/main/resources/de/tlc4b/standardModules/Functions.tla
similarity index 100%
rename from src/main/resources/standardModules/Functions.tla
rename to src/main/resources/de/tlc4b/standardModules/Functions.tla
diff --git a/src/main/resources/standardModules/FunctionsAsRelations.tla b/src/main/resources/de/tlc4b/standardModules/FunctionsAsRelations.tla
similarity index 100%
rename from src/main/resources/standardModules/FunctionsAsRelations.tla
rename to src/main/resources/de/tlc4b/standardModules/FunctionsAsRelations.tla
diff --git a/src/main/resources/standardModules/Relations.tla b/src/main/resources/de/tlc4b/standardModules/Relations.tla
similarity index 100%
rename from src/main/resources/standardModules/Relations.tla
rename to src/main/resources/de/tlc4b/standardModules/Relations.tla
diff --git a/src/main/resources/standardModules/SequencesAsRelations.tla b/src/main/resources/de/tlc4b/standardModules/SequencesAsRelations.tla
similarity index 100%
rename from src/main/resources/standardModules/SequencesAsRelations.tla
rename to src/main/resources/de/tlc4b/standardModules/SequencesAsRelations.tla
diff --git a/src/main/resources/standardModules/SequencesExtended.tla b/src/main/resources/de/tlc4b/standardModules/SequencesExtended.tla
similarity index 100%
rename from src/main/resources/standardModules/SequencesExtended.tla
rename to src/main/resources/de/tlc4b/standardModules/SequencesExtended.tla
--
GitLab