Updated to java 25 and lastest nx01 versions

This commit is contained in:
Willem Cazander 2026-02-23 13:01:55 +01:00
parent 40b7107be2
commit 71213b3c22
23 changed files with 218 additions and 139 deletions

View file

@ -40,6 +40,7 @@ import org.x4o.xml.lang.X4OLanguageLocal;
import org.x4o.xml.lang.X4OLanguageModuleLoader;
import org.x4o.xml.lang.X4OLanguageModuleLoaderException;
import org.x4o.xml.lang.X4OLanguageModuleLocal;
import org.x4o.xml.lang.X4OLanguageSession;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator𓄯;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᒢᓫᑊᐣᑊ.ᔿᓫᒻᓫᓫ.V018Tord;
@ -64,7 +65,7 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader {
//public static final String NXD_ROOT_XSD_URI = NXD_ROOT_URI+PP_NXD_XSD_FILE;
@Override
public void loadLanguageModule(X4OLanguageLocal language, X4OLanguageModuleLocal languageModule) throws X4OLanguageModuleLoaderException {
public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal languageModule) throws X4OLanguageModuleLoaderException {
languageModule.setId("nxd-module");
languageModule.setProviderName("Number eXtra Dimension Module");
languageModule.setProviderHost(PP_NXD_PROVIDER_HOST);
@ -127,7 +128,7 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader {
}
private void configBãßBȍőnPartAttributes(X4OLanguage language,ElementClass ec, Terminator𓄯<?> basePart) throws X4OLanguageModuleLoaderException {
for (Terminator𓄯<?> part: basePart.zerdinalSpaceRodsToLadder().iterableᴼᶠ()) {
for (Terminator𓄯<?> part: basePart.zerdinalSpaceRodsToLadder().toIterable()) {
ec.addElementClassAttribute(createElementClassAttribute(language,part.abacusRȧñkChinaKey(),true,new BãßBȍőnPartDialToneConverter(part)));
}
}
@ -152,9 +153,7 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader {
result.setObjectConverter(converter);
}
return result;
} catch (InstantiationException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
} catch (IllegalAccessException e) {
} catch (ClassNotFoundException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
}
}
@ -167,9 +166,7 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader {
result.setElementClass(elementClass);
result.setDescription(description);
return result;
} catch (InstantiationException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
} catch (IllegalAccessException e) {
} catch (ClassNotFoundException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
}
}
@ -178,21 +175,16 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader {
ElementNamespace namespace;
try {
namespace = (ElementNamespace)X4OLanguageClassLoader.newInstance(language.getLanguageConfiguration().getDefaultElementNamespace());
} catch (InstantiationException e) {
} catch (ClassNotFoundException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
} catch (IllegalAccessException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
}
}
try {
namespace.setElementNamespaceInstanceProvider((ElementNamespaceInstanceProvider)
X4OLanguageClassLoader.newInstance(language.getLanguageConfiguration().getDefaultElementNamespaceInstanceProvider())
);
} catch (InstantiationException e) {
} catch (ClassNotFoundException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
} catch (IllegalAccessException e) {
throw new X4OLanguageModuleLoaderException(this,e.getMessage(),e);
}
}
namespace.setId(id);
namespace.setUri(uri);
namespace.setSchemaUri(schemaUri);