Use jakarta.xml instead of javax.xml
This commit is contained in:
SiboVG
parent
4475bf47b0
commit
d32faea6c6
34
build.gradle
34
build.gradle
@ -6,6 +6,7 @@ plugins {
|
||||
id 'application'
|
||||
}
|
||||
|
||||
// Java settings
|
||||
java {
|
||||
// Must be disabled in order to use the gradle-modules-plugin
|
||||
modularity.inferModulePath = false
|
||||
@ -17,17 +18,13 @@ application {
|
||||
}
|
||||
|
||||
// Fetch the build version from the build.properties file
|
||||
Properties props = new Properties()
|
||||
try {
|
||||
props.load(file('./core/src/main/resources/build.properties').newDataInputStream())
|
||||
} catch (Exception ex) {
|
||||
throw new Exception("Missing build.properties. file: " + ex.getMessage())
|
||||
}
|
||||
def buildProperties = new Properties()
|
||||
file('core/src/main/resources/build.properties').withInputStream { buildProperties.load(it) }
|
||||
group = 'info.openrocket'
|
||||
version = buildProperties['build.version']
|
||||
|
||||
// Common project configuration
|
||||
allprojects {
|
||||
group 'info.openrocket'
|
||||
version = props['build.version']
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url "https://jitpack.io" }
|
||||
@ -42,9 +39,6 @@ subprojects {
|
||||
// Configure the gradle-modules-plugin
|
||||
modularity {
|
||||
standardJavaRelease(17) // For targeting Java 17
|
||||
/*modularity.patchModule("hamcrest", "hamcrest-2.2.jar")
|
||||
modularity.patchModule("hamcrest.core", "hamcrest-core-2.2.jar")
|
||||
modularity.patchModule("hamcrest.library", "hamcrest-library-2.2.jar")*/
|
||||
modularity.patchModule("java.scripting", "script-api-1.0.jar")
|
||||
}
|
||||
|
||||
@ -53,15 +47,16 @@ subprojects {
|
||||
|
||||
testLogging {
|
||||
events 'PASSED', 'FAILED', 'SKIPPED', 'STANDARD_OUT'
|
||||
exceptionFormat = 'full'
|
||||
showStackTraces = true
|
||||
stackTraceFilters = []
|
||||
}
|
||||
}
|
||||
|
||||
// Common dependencies
|
||||
dependencies {
|
||||
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
|
||||
testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: '2.2'
|
||||
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
|
||||
implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2'
|
||||
|
||||
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.2'
|
||||
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.10.2'
|
||||
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
|
||||
@ -75,6 +70,7 @@ subprojects {
|
||||
// dependsOn ':core:serializeEngines'
|
||||
//}
|
||||
|
||||
// JAR config
|
||||
jar {
|
||||
archiveBaseName.set('OpenRocket')
|
||||
|
||||
@ -84,7 +80,7 @@ jar {
|
||||
'SplashScreen-Image': 'pix/splashscreen.png',
|
||||
|
||||
// Versioning
|
||||
'Implementation-Version': props['build.version'],
|
||||
'Implementation-Version': buildProperties['build.version'],
|
||||
|
||||
// Vendor Details
|
||||
'Implementation-Vendor': 'OpenRocket',
|
||||
@ -94,6 +90,7 @@ jar {
|
||||
}
|
||||
}
|
||||
|
||||
// Project dependencies
|
||||
dependencies {
|
||||
implementation(project(":core"))
|
||||
implementation(project(":swing"))
|
||||
@ -101,14 +98,13 @@ dependencies {
|
||||
|
||||
shadowJar {
|
||||
archiveBaseName.set('OpenRocket')
|
||||
archiveVersion.set(buildProperties['build.version'])
|
||||
archiveClassifier.set('')
|
||||
archiveVersion.set(props['build.version'])
|
||||
}
|
||||
|
||||
shadowJar.dependsOn(['jar'])
|
||||
//shadowJar.dependsOn([':core:serializeEngines'])
|
||||
|
||||
// Packages the application for distribution.
|
||||
// Package the application for distribution.
|
||||
tasks.register('dist') {
|
||||
group = 'info.openrocket'
|
||||
dependsOn 'shadowJar'
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id "com.github.johnrengelman.shadow"
|
||||
id 'com.github.johnrengelman.shadow'
|
||||
id 'java'
|
||||
id 'com.adarshr.test-logger' version '3.2.0'
|
||||
id 'checkstyle'
|
||||
@ -36,29 +36,26 @@ extraJavaModuleInfo {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation group: 'org.commonmark', name: 'commonmark', version: '0.19.0' // 0.21.0
|
||||
implementation group: 'org.commonmark', name: 'commonmark', version: '0.21.0'
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.12'
|
||||
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0'
|
||||
//implementation group: 'org.slf4j', name: 'logback-classic', version: '2.0.12'
|
||||
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1' // 3.12.0
|
||||
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
|
||||
implementation group: 'com.google.inject', name: 'guice', version: '7.0.0'
|
||||
implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
|
||||
implementation group: 'org.graalvm.sdk', name: 'graal-sdk', version: '23.0.3'
|
||||
implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '23.0.3'
|
||||
implementation group: 'org.graalvm.js', name: 'js', version: '23.0.3'
|
||||
implementation group: 'org.graalvm.truffle', name: 'truffle-api', version: '23.0.3'
|
||||
implementation group: 'com.ibm.icu', name: 'icu4j', version: '71.1' // 72.1
|
||||
implementation group: 'com.ibm.icu', name: 'icu4j', version: '71.2'
|
||||
implementation files('libs/script-api-1.0.jar')
|
||||
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.165'
|
||||
|
||||
implementation 'de.javagl:obj:0.4.0'
|
||||
|
||||
runtimeOnly group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.3'
|
||||
implementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
|
||||
implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.1.2'
|
||||
implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3'
|
||||
implementation 'org.glassfish:javax.json:1.1.3' // 1.1.4
|
||||
implementation 'org.eclipse:yasson:1.0.2' // 2.0.1
|
||||
implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '4.0.5'
|
||||
implementation group: 'org.glassfish', name: 'jakarta.json', version: '2.0.1'
|
||||
implementation group: 'org.eclipse', name: 'yasson', version: '2.0.1'
|
||||
}
|
||||
|
||||
def serializedEnginesPath = './src/main/resources/datafiles/thrustcurves/thrustcurves.ser'
|
||||
|
||||
@ -5,8 +5,8 @@ import info.openrocket.core.util.ArrayList;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.json.JsonArray;
|
||||
import javax.json.JsonObject;
|
||||
import jakarta.json.JsonArray;
|
||||
import jakarta.json.JsonObject;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
@ -17,12 +17,12 @@ import org.slf4j.LoggerFactory;
|
||||
import info.openrocket.core.startup.Application;
|
||||
import info.openrocket.core.util.BuildProperties;
|
||||
|
||||
import javax.json.Json;
|
||||
import javax.json.JsonArray;
|
||||
import javax.json.JsonArrayBuilder;
|
||||
import javax.json.JsonObject;
|
||||
import javax.json.JsonReader;
|
||||
import javax.json.stream.JsonParsingException;
|
||||
import jakarta.json.Json;
|
||||
import jakarta.json.JsonArray;
|
||||
import jakarta.json.JsonArrayBuilder;
|
||||
import jakarta.json.JsonObject;
|
||||
import jakarta.json.JsonReader;
|
||||
import jakarta.json.stream.JsonParsingException;
|
||||
|
||||
/**
|
||||
* Class that initiates fetching software update information.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package info.openrocket.core.file.rasaero;
|
||||
|
||||
import javax.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
|
||||
|
||||
public class CustomBooleanAdapter extends XmlAdapter<String, Boolean> {
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package info.openrocket.core.file.rasaero;
|
||||
|
||||
import javax.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.DecimalFormatSymbols;
|
||||
import java.util.Locale;
|
||||
|
||||
@ -12,13 +12,13 @@ import info.openrocket.core.rocketcomponent.RocketComponent;
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.rocketcomponent.position.AxialMethod;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.startup.Application;
|
||||
|
||||
@ -6,9 +6,9 @@ import info.openrocket.core.logging.WarningSet;
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
@XmlRootElement(name = RASAeroCommonConstants.BOATTAIL)
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
|
||||
@ -7,14 +7,14 @@ import info.openrocket.core.logging.ErrorSet;
|
||||
import info.openrocket.core.logging.WarningSet;
|
||||
import info.openrocket.core.rocketcomponent.BodyTube;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.startup.Application;
|
||||
|
||||
@ -14,7 +14,7 @@ import info.openrocket.core.startup.Application;
|
||||
import info.openrocket.core.util.MathUtil;
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
|
||||
public interface BodyTubeDTOAdapter {
|
||||
@XmlTransient
|
||||
|
||||
@ -11,13 +11,13 @@ import info.openrocket.core.rocketcomponent.NoseCone;
|
||||
import info.openrocket.core.rocketcomponent.Rocket;
|
||||
import info.openrocket.core.rocketcomponent.RocketComponent;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.rocketcomponent.SymmetricComponent;
|
||||
|
||||
@ -10,12 +10,12 @@ import info.openrocket.core.rocketcomponent.position.AxialMethod;
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.startup.Application;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
@XmlRootElement(name = RASAeroCommonConstants.FIN)
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
|
||||
@ -10,11 +10,11 @@ import info.openrocket.core.simulation.SimulationOptions;
|
||||
import info.openrocket.core.startup.Application;
|
||||
import info.openrocket.core.startup.Preferences;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
@XmlRootElement(name = RASAeroCommonConstants.LAUNCH_SITE)
|
||||
@XmlAccessorType(XmlAccessType.FIELD)
|
||||
|
||||
@ -6,12 +6,12 @@ import info.openrocket.core.logging.ErrorSet;
|
||||
import info.openrocket.core.logging.WarningSet;
|
||||
import info.openrocket.core.rocketcomponent.NoseCone;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.file.rasaero.RASAeroCommonConstants.NoseConeShapeSettings;
|
||||
|
||||
@ -2,10 +2,10 @@ package info.openrocket.core.file.rasaero.export;
|
||||
|
||||
import info.openrocket.core.file.rasaero.RASAeroCommonConstants;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* The top level RASAero document.
|
||||
|
||||
@ -9,8 +9,8 @@ import info.openrocket.core.rocketcomponent.Rocket;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.JAXBContext;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
||||
@ -16,12 +16,12 @@ import info.openrocket.core.startup.Application;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@ import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.startup.Application;
|
||||
import info.openrocket.core.util.ArrayList;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import java.util.List;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
|
||||
@ -20,12 +20,12 @@ import info.openrocket.core.rocketcomponent.Rocket;
|
||||
import info.openrocket.core.rocketcomponent.StageSeparationConfiguration;
|
||||
import info.openrocket.core.startup.Application;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@ -13,10 +13,10 @@ import info.openrocket.core.rocketcomponent.MotorMount;
|
||||
import info.openrocket.core.rocketcomponent.Rocket;
|
||||
import info.openrocket.core.rocketcomponent.RocketComponent;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
@ -6,14 +6,14 @@ import info.openrocket.core.l10n.Translator;
|
||||
import info.openrocket.core.logging.ErrorSet;
|
||||
import info.openrocket.core.logging.WarningSet;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlSeeAlso;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException;
|
||||
import info.openrocket.core.rocketcomponent.SymmetricComponent;
|
||||
|
||||
@ -15,12 +15,12 @@ import info.openrocket.core.rocketcomponent.RocketComponent;
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.rocketcomponent.TubeCoupler;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlElementWrapper;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.file.rocksim.RockSimDensityType;
|
||||
|
||||
@ -18,13 +18,13 @@ import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.rocketcomponent.TubeCoupler;
|
||||
import info.openrocket.core.rocketcomponent.TubeFinSet;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlElementWrapper;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -3,9 +3,9 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.Bulkhead;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* Conversion of an OR Bulkhead to an RockSim Bulkhead. Bulkheads are
|
||||
|
||||
@ -4,11 +4,11 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.RadiusRingComponent;
|
||||
import info.openrocket.core.rocketcomponent.ThicknessRingComponent;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlTransient;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlTransient;
|
||||
|
||||
/**
|
||||
* Centering ring conversion from OR to RockSim.
|
||||
|
||||
@ -4,10 +4,10 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.FreeformFinSet;
|
||||
import info.openrocket.core.util.Coordinate;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
*/
|
||||
|
||||
@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import info.openrocket.core.rocketcomponent.EngineBlock;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* Models a Rocksim XML Element for an EngineBlock. EngineBlocks in Rocksim are
|
||||
|
||||
@ -8,10 +8,10 @@ import info.openrocket.core.rocketcomponent.FreeformFinSet;
|
||||
import info.openrocket.core.rocketcomponent.TrapezoidFinSet;
|
||||
import info.openrocket.core.rocketcomponent.position.AxialMethod;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* This class models XML elements for Rocksim finsets.
|
||||
|
||||
@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.BodyTube;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.LaunchLug;
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.MassObject;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* Class that models a Rocksim MassObject.
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.NoseCone;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* This class models a RockSim XML Element for a nose cone.
|
||||
|
||||
@ -4,10 +4,10 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.file.rocksim.importt.BaseHandler;
|
||||
import info.openrocket.core.rocketcomponent.Parachute;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
*/
|
||||
|
||||
@ -9,13 +9,13 @@ import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.rocketcomponent.position.AxialMethod;
|
||||
import info.openrocket.core.rocketcomponent.position.RadiusMethod;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlElementWrapper;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
|
||||
/**
|
||||
* High-level placeholder element for Rocksim.
|
||||
|
||||
@ -2,10 +2,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* The top level Rocksim document.
|
||||
|
||||
@ -7,8 +7,8 @@ import java.io.OutputStreamWriter;
|
||||
import java.io.StringWriter;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.JAXBContext;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
|
||||
import info.openrocket.core.logging.ErrorSet;
|
||||
import info.openrocket.core.logging.WarningSet;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
package info.openrocket.core.file.rocksim.export;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
|
||||
/**
|
||||
* This class models a Rocksim XML element for a rocket design container. It's
|
||||
|
||||
@ -8,10 +8,10 @@ import info.openrocket.core.rocketcomponent.AxialStage;
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.util.ArrayList;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.Streamer;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* This class models a Rocksim XML element for a streamer.
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* This class models a transition XML element in Rocksim file format.
|
||||
|
||||
@ -16,9 +16,9 @@ import info.openrocket.core.rocketcomponent.Transition;
|
||||
import info.openrocket.core.rocketcomponent.TubeCoupler;
|
||||
import info.openrocket.core.rocketcomponent.position.AxialMethod;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export;
|
||||
import info.openrocket.core.file.rocksim.RockSimCommonConstants;
|
||||
import info.openrocket.core.rocketcomponent.TubeFinSet;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
/**
|
||||
* This class models an XML element for a Rocksim TubeFinSet.
|
||||
|
||||
@ -7,15 +7,15 @@ import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.xml.bind.DatatypeConverter;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlInlineBinaryData;
|
||||
import javax.xml.bind.annotation.XmlValue;
|
||||
import javax.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
import jakarta.xml.bind.DatatypeConverter;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlAttribute;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlInlineBinaryData;
|
||||
import jakarta.xml.bind.annotation.XmlValue;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
|
||||
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||
|
||||
import info.openrocket.core.database.Databases;
|
||||
import info.openrocket.core.material.Material;
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -3,9 +3,9 @@ package info.openrocket.core.preset.xml;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
|
||||
@ -4,9 +4,9 @@ package info.openrocket.core.preset.xml;
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
package info.openrocket.core.preset.xml;
|
||||
|
||||
import javax.xml.bind.Marshaller;
|
||||
import javax.xml.bind.Unmarshaller;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.Unmarshaller;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlAttribute;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.database.Databases;
|
||||
import info.openrocket.core.material.Material;
|
||||
|
||||
@ -2,10 +2,10 @@ package info.openrocket.core.preset.xml;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
|
||||
@ -3,14 +3,14 @@ package info.openrocket.core.preset.xml;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementRef;
|
||||
import javax.xml.bind.annotation.XmlElementRefs;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import javax.xml.bind.annotation.XmlValue;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlElementRef;
|
||||
import jakarta.xml.bind.annotation.XmlElementRefs;
|
||||
import jakarta.xml.bind.annotation.XmlElementWrapper;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlValue;
|
||||
|
||||
import info.openrocket.core.material.Material;
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
|
||||
@ -6,7 +6,7 @@ import java.io.InputStreamReader;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.JAXBException;
|
||||
import jakarta.xml.bind.JAXBException;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -3,10 +3,10 @@ package info.openrocket.core.preset.xml;
|
||||
import info.openrocket.core.material.Material;
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.JAXBException;
|
||||
import javax.xml.bind.Marshaller;
|
||||
import javax.xml.bind.Unmarshaller;
|
||||
import jakarta.xml.bind.JAXBContext;
|
||||
import jakarta.xml.bind.JAXBException;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.Unmarshaller;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -3,7 +3,7 @@ package info.openrocket.core.preset.xml;
|
||||
|
||||
import info.openrocket.core.rocketcomponent.Transition;
|
||||
|
||||
import javax.xml.bind.annotation.XmlEnum;
|
||||
import jakarta.xml.bind.annotation.XmlEnum;
|
||||
|
||||
/**
|
||||
* A mirror class to Transition.Shape to adapt that class to/from XML.
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
import info.openrocket.core.preset.TypedPropertyMap;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlElement;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -4,9 +4,9 @@ package info.openrocket.core.preset.xml;
|
||||
import info.openrocket.core.preset.ComponentPreset;
|
||||
import info.openrocket.core.preset.InvalidComponentPresetException;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlRootElement;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
||||
@ -19,9 +19,9 @@ open module info.openrocket.core {
|
||||
requires jakarta.activation;
|
||||
requires jakarta.inject;
|
||||
requires java.prefs;
|
||||
requires java.xml.bind;
|
||||
requires jakarta.xml.bind;
|
||||
requires io.github.classgraph;
|
||||
requires java.json;
|
||||
requires org.glassfish.jakarta.json;
|
||||
requires org.slf4j;
|
||||
requires com.opencsv;
|
||||
requires org.commonmark;
|
||||
|
||||
@ -12,11 +12,11 @@ import info.openrocket.core.util.BaseTestCase;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import javax.json.Json;
|
||||
import javax.json.JsonArray;
|
||||
import javax.json.JsonArrayBuilder;
|
||||
import javax.json.JsonObject;
|
||||
import javax.json.JsonObjectBuilder;
|
||||
import jakarta.json.Json;
|
||||
import jakarta.json.JsonArray;
|
||||
import jakarta.json.JsonArrayBuilder;
|
||||
import jakarta.json.JsonObject;
|
||||
import jakarta.json.JsonObjectBuilder;
|
||||
|
||||
public class UpdateInfoTest extends BaseTestCase {
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.JAXBContext;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
|
||||
import info.openrocket.core.document.OpenRocketDocument;
|
||||
import info.openrocket.core.document.OpenRocketDocumentFactory;
|
||||
|
||||
@ -8,9 +8,9 @@ import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import javax.xml.bind.Marshaller;
|
||||
import javax.xml.bind.Unmarshaller;
|
||||
import jakarta.xml.bind.JAXBContext;
|
||||
import jakarta.xml.bind.Marshaller;
|
||||
import jakarta.xml.bind.Unmarshaller;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.awt.image.DataBufferByte;
|
||||
import java.io.StringReader;
|
||||
|
||||
@ -95,7 +95,6 @@ dependencies {
|
||||
|
||||
implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0'
|
||||
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0'
|
||||
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
|
||||
|
||||
implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.5.0'
|
||||
implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version: '2.5.0'
|
||||
|
||||
@ -28,7 +28,7 @@ import javax.swing.JSeparator;
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
import javax.xml.bind.JAXBException;
|
||||
import jakarta.xml.bind.JAXBException;
|
||||
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
import info.openrocket.swing.gui.preset.ButtonColumn;
|
||||
|
||||
@ -17,7 +17,7 @@ open module info.openrocket.swing {
|
||||
requires org.jogamp.jogl.all;
|
||||
requires java.scripting;
|
||||
requires org.fife.RSyntaxTextArea;
|
||||
requires java.xml.bind;
|
||||
requires jakarta.xml.bind;
|
||||
requires jcommon;
|
||||
requires java.prefs;
|
||||
requires com.jthemedetector;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user