From b4857199107164377bd9192b9eee5a0298055cb8 Mon Sep 17 00:00:00 2001 From: Stefan Posch Date: Thu, 15 Mar 2018 00:17:55 +0100 Subject: [PATCH] moved packages with jaxb generted code to rhizoTrak/xsd; added RhizoTrakProjectConfig.xsd; removed jaxb generated source from repo and added these to .gitignore --- .gitignore | 1 + pom.xml | 5 +- src/main/java/META-INF/sun-jaxb.episode | 11 +- .../informatik/rhizoTrak/addon/RhizoIO.java | 12 +- .../informatik/rhizoTrak/config/Config.java | 390 ------------------ .../rhizoTrak/config/GlobalSettings.java | 390 ------------------ .../rhizoTrak/config/ObjectFactory.java | 87 ---- .../display/addonGui/VisibilityPanel.java | 2 +- .../schemas/RhizoTrakProjectConfig.xsd | 24 ++ src/main/resources/schemas/config.xsd | 5 +- 10 files changed, 46 insertions(+), 881 deletions(-) delete mode 100644 src/main/java/de/unihalle/informatik/rhizoTrak/config/Config.java delete mode 100644 src/main/java/de/unihalle/informatik/rhizoTrak/config/GlobalSettings.java delete mode 100644 src/main/java/de/unihalle/informatik/rhizoTrak/config/ObjectFactory.java create mode 100644 src/main/resources/schemas/RhizoTrakProjectConfig.xsd diff --git a/.gitignore b/.gitignore index ecc86004d..c31dfaee1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ target/ .project .settings .classpath +src/main/java/de/unihalle/informatik/rhizoTrak/xsd/* diff --git a/pom.xml b/pom.xml index 122b7534e..21b1814a0 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,7 @@ https://raw.githubusercontent.com/RootSystemML/RSMLValidator/master/rsml.xsd - de.unihalle.informatik.rhizoTrak.rsml + de.unihalle.informatik.rhizoTrak.xsd.rsml true false true @@ -286,9 +286,10 @@ src/main/resources/schemas/config.xsd src/main/resources/schemas/settings.xsd + src/main/resources/schemas/RhizoTrakProjectConfig.xsd false - de.unihalle.informatik.rhizoTrak.config + de.unihalle.informatik.rhizoTrak.xsd.config diff --git a/src/main/java/META-INF/sun-jaxb.episode b/src/main/java/META-INF/sun-jaxb.episode index 55940dbb5..5ed18a523 100644 --- a/src/main/java/META-INF/sun-jaxb.episode +++ b/src/main/java/META-INF/sun-jaxb.episode @@ -5,18 +5,21 @@ Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert Siehe http://java.sun.com/xml/jaxb Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. -Generiert: 2018.03.14 um 08:10:58 PM CET +Generiert: 2018.03.15 um 12:09:09 AM CET --> - + + + + - + - + diff --git a/src/main/java/de/unihalle/informatik/rhizoTrak/addon/RhizoIO.java b/src/main/java/de/unihalle/informatik/rhizoTrak/addon/RhizoIO.java index 57e28d86d..cf6346f44 100644 --- a/src/main/java/de/unihalle/informatik/rhizoTrak/addon/RhizoIO.java +++ b/src/main/java/de/unihalle/informatik/rhizoTrak/addon/RhizoIO.java @@ -18,12 +18,12 @@ import javax.xml.bind.Unmarshaller; import de.unihalle.informatik.rhizoTrak.Project; -import de.unihalle.informatik.rhizoTrak.config.Config; -import de.unihalle.informatik.rhizoTrak.config.GlobalSettings; -import de.unihalle.informatik.rhizoTrak.config.Config.StatusList; -import de.unihalle.informatik.rhizoTrak.config.Config.StatusList.Status; -import de.unihalle.informatik.rhizoTrak.config.GlobalSettings.GlobalStatusList; -import de.unihalle.informatik.rhizoTrak.config.GlobalSettings.GlobalStatusList.GlobalStatus; +import de.unihalle.informatik.rhizoTrak.xsd.config.Config; +import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings; +import de.unihalle.informatik.rhizoTrak.xsd.config.Config.StatusList; +import de.unihalle.informatik.rhizoTrak.xsd.config.Config.StatusList.Status; +import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings.GlobalStatusList; +import de.unihalle.informatik.rhizoTrak.xsd.config.GlobalSettings.GlobalStatusList.GlobalStatus; import de.unihalle.informatik.rhizoTrak.display.Connector; import de.unihalle.informatik.rhizoTrak.display.Displayable; import de.unihalle.informatik.rhizoTrak.display.LayerSet; diff --git a/src/main/java/de/unihalle/informatik/rhizoTrak/config/Config.java b/src/main/java/de/unihalle/informatik/rhizoTrak/config/Config.java deleted file mode 100644 index 73a2bc0d2..000000000 --- a/src/main/java/de/unihalle/informatik/rhizoTrak/config/Config.java +++ /dev/null @@ -1,390 +0,0 @@ -// -// Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert -// Siehe http://java.sun.com/xml/jaxb -// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. -// Generiert: 2018.03.14 um 08:10:59 PM CET -// - - -package de.unihalle.informatik.rhizoTrak.config; - -import java.math.BigInteger; -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.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="statusList">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="status" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "statusList" -}) -@XmlRootElement(name = "config") -public class Config { - - @XmlElement(required = true) - protected Config.StatusList statusList; - - /** - * Ruft den Wert der statusList-Eigenschaft ab. - * - * @return - * possible object is - * {@link Config.StatusList } - * - */ - public Config.StatusList getStatusList() { - return statusList; - } - - /** - * Legt den Wert der statusList-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link Config.StatusList } - * - */ - public void setStatusList(Config.StatusList value) { - this.statusList = value; - } - - - /** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="status" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                   <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                   <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "status" - }) - public static class StatusList { - - @XmlElement(required = true) - protected List status; - - /** - * Gets the value of the status property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the status property. - * - *

- * For example, to add a new item, do as follows: - * 

-         *    getStatus().add(newItem);
-         *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Config.StatusList.Status } - * - * - */ - public List getStatus() { - if (status == null) { - status = new ArrayList(); - } - return this.status; - } - - - /** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "fullName", - "abbreviation", - "red", - "green", - "blue", - "alpha", - "selectable" - }) - public static class Status { - - @XmlElement(required = true) - protected String fullName; - @XmlElement(required = true) - protected String abbreviation; - @XmlElement(required = true) - protected BigInteger red; - @XmlElement(required = true) - protected BigInteger green; - @XmlElement(required = true) - protected BigInteger blue; - @XmlElement(required = true) - protected BigInteger alpha; - protected boolean selectable; - - /** - * Ruft den Wert der fullName-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFullName() { - return fullName; - } - - /** - * Legt den Wert der fullName-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFullName(String value) { - this.fullName = value; - } - - /** - * Ruft den Wert der abbreviation-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAbbreviation() { - return abbreviation; - } - - /** - * Legt den Wert der abbreviation-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAbbreviation(String value) { - this.abbreviation = value; - } - - /** - * Ruft den Wert der red-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getRed() { - return red; - } - - /** - * Legt den Wert der red-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setRed(BigInteger value) { - this.red = value; - } - - /** - * Ruft den Wert der green-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getGreen() { - return green; - } - - /** - * Legt den Wert der green-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setGreen(BigInteger value) { - this.green = value; - } - - /** - * Ruft den Wert der blue-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getBlue() { - return blue; - } - - /** - * Legt den Wert der blue-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setBlue(BigInteger value) { - this.blue = value; - } - - /** - * Ruft den Wert der alpha-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getAlpha() { - return alpha; - } - - /** - * Legt den Wert der alpha-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setAlpha(BigInteger value) { - this.alpha = value; - } - - /** - * Ruft den Wert der selectable-Eigenschaft ab. - * - */ - public boolean isSelectable() { - return selectable; - } - - /** - * Legt den Wert der selectable-Eigenschaft fest. - * - */ - public void setSelectable(boolean value) { - this.selectable = value; - } - - } - - } - -} diff --git a/src/main/java/de/unihalle/informatik/rhizoTrak/config/GlobalSettings.java b/src/main/java/de/unihalle/informatik/rhizoTrak/config/GlobalSettings.java deleted file mode 100644 index 38d54565b..000000000 --- a/src/main/java/de/unihalle/informatik/rhizoTrak/config/GlobalSettings.java +++ /dev/null @@ -1,390 +0,0 @@ -// -// Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert -// Siehe http://java.sun.com/xml/jaxb -// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. -// Generiert: 2018.03.14 um 08:10:59 PM CET -// - - -package de.unihalle.informatik.rhizoTrak.config; - -import java.math.BigInteger; -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.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="globalStatusList">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="globalStatus" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *                             <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *                             <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "globalStatusList" -}) -@XmlRootElement(name = "globalSettings") -public class GlobalSettings { - - @XmlElement(required = true) - protected GlobalSettings.GlobalStatusList globalStatusList; - - /** - * Ruft den Wert der globalStatusList-Eigenschaft ab. - * - * @return - * possible object is - * {@link GlobalSettings.GlobalStatusList } - * - */ - public GlobalSettings.GlobalStatusList getGlobalStatusList() { - return globalStatusList; - } - - /** - * Legt den Wert der globalStatusList-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link GlobalSettings.GlobalStatusList } - * - */ - public void setGlobalStatusList(GlobalSettings.GlobalStatusList value) { - this.globalStatusList = value; - } - - - /** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="globalStatus" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                   <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
-     *                   <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-     *                   <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "globalStatus" - }) - public static class GlobalStatusList { - - @XmlElement(required = true) - protected List globalStatus; - - /** - * Gets the value of the globalStatus property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the globalStatus property. - * - *

- * For example, to add a new item, do as follows: - * 

-         *    getGlobalStatus().add(newItem);
-         *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link GlobalSettings.GlobalStatusList.GlobalStatus } - * - * - */ - public List getGlobalStatus() { - if (globalStatus == null) { - globalStatus = new ArrayList(); - } - return this.globalStatus; - } - - - /** - *

Java-Klasse für anonymous complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="fullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="abbreviation" type="{http://www.w3.org/2001/XMLSchema}string"/>
-         *         <element name="red" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="green" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="blue" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="alpha" type="{http://www.w3.org/2001/XMLSchema}integer"/>
-         *         <element name="selectable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
-         *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "fullName", - "abbreviation", - "red", - "green", - "blue", - "alpha", - "selectable" - }) - public static class GlobalStatus { - - @XmlElement(required = true) - protected String fullName; - @XmlElement(required = true) - protected String abbreviation; - @XmlElement(required = true) - protected BigInteger red; - @XmlElement(required = true) - protected BigInteger green; - @XmlElement(required = true) - protected BigInteger blue; - @XmlElement(required = true) - protected BigInteger alpha; - protected boolean selectable; - - /** - * Ruft den Wert der fullName-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFullName() { - return fullName; - } - - /** - * Legt den Wert der fullName-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFullName(String value) { - this.fullName = value; - } - - /** - * Ruft den Wert der abbreviation-Eigenschaft ab. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAbbreviation() { - return abbreviation; - } - - /** - * Legt den Wert der abbreviation-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAbbreviation(String value) { - this.abbreviation = value; - } - - /** - * Ruft den Wert der red-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getRed() { - return red; - } - - /** - * Legt den Wert der red-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setRed(BigInteger value) { - this.red = value; - } - - /** - * Ruft den Wert der green-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getGreen() { - return green; - } - - /** - * Legt den Wert der green-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setGreen(BigInteger value) { - this.green = value; - } - - /** - * Ruft den Wert der blue-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getBlue() { - return blue; - } - - /** - * Legt den Wert der blue-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setBlue(BigInteger value) { - this.blue = value; - } - - /** - * Ruft den Wert der alpha-Eigenschaft ab. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getAlpha() { - return alpha; - } - - /** - * Legt den Wert der alpha-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setAlpha(BigInteger value) { - this.alpha = value; - } - - /** - * Ruft den Wert der selectable-Eigenschaft ab. - * - */ - public boolean isSelectable() { - return selectable; - } - - /** - * Legt den Wert der selectable-Eigenschaft fest. - * - */ - public void setSelectable(boolean value) { - this.selectable = value; - } - - } - - } - -} diff --git a/src/main/java/de/unihalle/informatik/rhizoTrak/config/ObjectFactory.java b/src/main/java/de/unihalle/informatik/rhizoTrak/config/ObjectFactory.java deleted file mode 100644 index dd6c61635..000000000 --- a/src/main/java/de/unihalle/informatik/rhizoTrak/config/ObjectFactory.java +++ /dev/null @@ -1,87 +0,0 @@ -// -// Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 generiert -// Siehe http://java.sun.com/xml/jaxb -// Änderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. -// Generiert: 2018.03.14 um 08:10:59 PM CET -// - - -package de.unihalle.informatik.rhizoTrak.config; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the de.unihalle.informatik.rhizoTrak.config package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: de.unihalle.informatik.rhizoTrak.config - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Config } - * - */ - public Config createConfig() { - return new Config(); - } - - /** - * Create an instance of {@link GlobalSettings } - * - */ - public GlobalSettings createGlobalSettings() { - return new GlobalSettings(); - } - - /** - * Create an instance of {@link GlobalSettings.GlobalStatusList } - * - */ - public GlobalSettings.GlobalStatusList createGlobalSettingsGlobalStatusList() { - return new GlobalSettings.GlobalStatusList(); - } - - /** - * Create an instance of {@link Config.StatusList } - * - */ - public Config.StatusList createConfigStatusList() { - return new Config.StatusList(); - } - - /** - * Create an instance of {@link GlobalSettings.GlobalStatusList.GlobalStatus } - * - */ - public GlobalSettings.GlobalStatusList.GlobalStatus createGlobalSettingsGlobalStatusListGlobalStatus() { - return new GlobalSettings.GlobalStatusList.GlobalStatus(); - } - - /** - * Create an instance of {@link Config.StatusList.Status } - * - */ - public Config.StatusList.Status createConfigStatusListStatus() { - return new Config.StatusList.Status(); - } - -} diff --git a/src/main/java/de/unihalle/informatik/rhizoTrak/display/addonGui/VisibilityPanel.java b/src/main/java/de/unihalle/informatik/rhizoTrak/display/addonGui/VisibilityPanel.java index b29e1edc3..61d0e8fed 100644 --- a/src/main/java/de/unihalle/informatik/rhizoTrak/display/addonGui/VisibilityPanel.java +++ b/src/main/java/de/unihalle/informatik/rhizoTrak/display/addonGui/VisibilityPanel.java @@ -73,7 +73,7 @@ import de.unihalle.informatik.rhizoTrak.addon.RhizoIO; import de.unihalle.informatik.rhizoTrak.addon.RhizoMain; -import de.unihalle.informatik.rhizoTrak.config.Config.StatusList.Status; +import de.unihalle.informatik.rhizoTrak.xsd.config.Config.StatusList.Status; import de.unihalle.informatik.rhizoTrak.utils.Utils; public class VisibilityPanel extends JPanel diff --git a/src/main/resources/schemas/RhizoTrakProjectConfig.xsd b/src/main/resources/schemas/RhizoTrakProjectConfig.xsd new file mode 100644 index 000000000..97af88a62 --- /dev/null +++ b/src/main/resources/schemas/RhizoTrakProjectConfig.xsd @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/schemas/config.xsd b/src/main/resources/schemas/config.xsd index 9ab343c23..88fce84d8 100644 --- a/src/main/resources/schemas/config.xsd +++ b/src/main/resources/schemas/config.xsd @@ -26,4 +26,7 @@ - \ No newline at end of file + + + +