diff --git a/.gitignore b/.gitignore index 288436f5c22977bf0acbde4e6d3455f50a0ca91c..44410ac86943b3307089108dfae7faa2c09d491e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ .project .classpath +tournament.xml +tournament.obj .DS_Store diff --git a/src/main/java/cz/jezek/lab11/Oponents.java b/src/main/java/cz/jezek/lab11/Oponents.java index 428893e975f4a6ecef5febba3a5f0253f2b584ab..6057d2d6799ac05e5e2b1f2680c17738885cd3ed 100644 --- a/src/main/java/cz/jezek/lab11/Oponents.java +++ b/src/main/java/cz/jezek/lab11/Oponents.java @@ -3,7 +3,8 @@ package cz.jezek.lab11; import java.io.Serializable; import java.util.Objects; -import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlIDREF; public class Oponents implements Serializable{ @@ -12,10 +13,12 @@ public class Oponents implements Serializable{ */ private static final long serialVersionUID = 1L; - @XmlElement + @XmlIDREF + @XmlAttribute private Player player1; - @XmlElement + @XmlIDREF + @XmlAttribute private Player player2; public Oponents() { diff --git a/src/main/java/cz/jezek/lab11/Player.java b/src/main/java/cz/jezek/lab11/Player.java index ab7d0e63f6cd717e21282e999abd67e082cd17c2..8611a00664d7e79289f9de02b03ec32ffe0e073c 100644 --- a/src/main/java/cz/jezek/lab11/Player.java +++ b/src/main/java/cz/jezek/lab11/Player.java @@ -2,12 +2,21 @@ package cz.jezek.lab11; import java.io.Serializable; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlID; + public class Player implements Serializable{ private static final long serialVersionUID = 1L; private String firstName; private String lastName; - + + @XmlID + @XmlAttribute(name = "id") + public String getFullNane () { + return toString(); + } + public static Player generateRandom() { return new Player(RandomGenarator.selectRandom(RandomGenarator.NAMES), RandomGenarator.selectRandom(RandomGenarator.SURNAMES)); diff --git a/tournament.obj b/tournament.obj deleted file mode 100644 index d71f9ba749edf52cb9f33e56af3abb2a87930339..0000000000000000000000000000000000000000 Binary files a/tournament.obj and /dev/null differ diff --git a/tournament.xml b/tournament.xml deleted file mode 100644 index 3bda513b2e8cc951ffca044183dda80df5b1df57..0000000000000000000000000000000000000000 --- a/tournament.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tournament> - <players> - <player> - <firstName>Jonh</firstName> - <lastName>Doe</lastName> - </player> - <player> - <firstName>Marry</firstName> - <lastName>Jane</lastName> - </player> - </players> - <matches> - <match player1Scorel="0" player2Scorel="0"> - <oponents> - <player1> - <firstName>Jonh</firstName> - <lastName>Doe</lastName> - </player1> - <player2> - <firstName>Marry</firstName> - <lastName>Jane</lastName> - </player2> - </oponents> - </match> - </matches> -</tournament>