Make all classes in be.nikiroo.fanfix.data Serializable

diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar
index 604c7611fbf7593d2b6a9e9c246fb48e8ca33fd4..1d12611260a6fa53488f82782246e75971000547 100644 (file)
Binary files a/libs/nikiroo-utils-4.7.2-dev-sources.jar and b/libs/nikiroo-utils-4.7.2-dev-sources.jar differ

diff --git a/src/be/nikiroo/fanfix/data/Chapter.java b/src/be/nikiroo/fanfix/data/Chapter.java
index 873dcb801f89b03f5ca648bd9c2f67f84ab761f6..d490058a4703b51e042bb369effdf4b4fa511be6 100644 (file)
--- a/src/be/nikiroo/fanfix/data/Chapter.java
+++ b/src/be/nikiroo/fanfix/data/Chapter.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix.data;
 
 package be.nikiroo.fanfix.data;
 

+import java.io.Serializable;

 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;


@@ -9,7 +10,9 @@ import java.util.List;
  * 
  * @author niki
  */
  * 
  * @author niki
  */

-public class Chapter implements Iterable<Paragraph>, Cloneable {
+public class Chapter implements Iterable<Paragraph>, Cloneable, Serializable {
+       private static final long serialVersionUID = 1L;
+       

        private String name;
        private int number;
        private List<Paragraph> paragraphs = new ArrayList<Paragraph>();
        private String name;
        private int number;
        private List<Paragraph> paragraphs = new ArrayList<Paragraph>();

diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java
index cbaf84e3c75def8646332cb7975a650dfe703013..67fedbd35627a5da59968fe92e13b21533cae869 100644 (file)
--- a/src/be/nikiroo/fanfix/data/MetaData.java
+++ b/src/be/nikiroo/fanfix/data/MetaData.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix.data;
 
 package be.nikiroo.fanfix.data;
 

+import java.io.Serializable;

 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;
 


@@ -10,7 +11,9 @@ import be.nikiroo.utils.Image;
  * 
  * @author niki
  */
  * 
  * @author niki
  */

-public class MetaData implements Cloneable, Comparable<MetaData> {
+public class MetaData implements Cloneable, Comparable<MetaData>, Serializable {
+       private static final long serialVersionUID = 1L;
+

        private String title;
        private String author;
        private String date;
        private String title;
        private String author;
        private String date;

diff --git a/src/be/nikiroo/fanfix/data/Paragraph.java b/src/be/nikiroo/fanfix/data/Paragraph.java
index 0ed61fbb614f494725ebbc0f1c632a7ffcd7a29a..9adc51c420e815492858adbcffbd1b606dab7eda 100644 (file)
--- a/src/be/nikiroo/fanfix/data/Paragraph.java
+++ b/src/be/nikiroo/fanfix/data/Paragraph.java
@@ -1,5 +1,7 @@
 package be.nikiroo.fanfix.data;
 
 package be.nikiroo.fanfix.data;
 

+import java.io.Serializable;
+

 import be.nikiroo.utils.Image;
 
 /**
 import be.nikiroo.utils.Image;
 
 /**


@@ -7,7 +9,9 @@ import be.nikiroo.utils.Image;
  * 
  * @author niki
  */
  * 
  * @author niki
  */

-public class Paragraph implements Cloneable {
+public class Paragraph implements Cloneable, Serializable {
+       private static final long serialVersionUID = 1L;
+

        /**
         * A paragraph type, that will dictate how the paragraph will be handled.
         * 
        /**
         * A paragraph type, that will dictate how the paragraph will be handled.
         * 

diff --git a/src/be/nikiroo/fanfix/data/Story.java b/src/be/nikiroo/fanfix/data/Story.java
index 0e0279f096adad91003c62e290fdefb60f1cfec6..fc3f909880031910c5b1ff698b247c949d6ffe38 100644 (file)
--- a/src/be/nikiroo/fanfix/data/Story.java
+++ b/src/be/nikiroo/fanfix/data/Story.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix.data;
 
 package be.nikiroo.fanfix.data;
 

+import java.io.Serializable;

 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;


@@ -9,7 +10,9 @@ import java.util.List;
  * 
  * @author niki
  */
  * 
  * @author niki
  */

-public class Story implements Iterable<Chapter>, Cloneable {
+public class Story implements Iterable<Chapter>, Cloneable, Serializable {
+       private static final long serialVersionUID = 1L;
+       

        private MetaData meta;
        private List<Chapter> chapters = new ArrayList<Chapter>();
        private List<Chapter> empty = new ArrayList<Chapter>();
        private MetaData meta;
        private List<Chapter> chapters = new ArrayList<Chapter>();
        private List<Chapter> empty = new ArrayList<Chapter>();

diff --git a/src/be/nikiroo/fanfix/data/package-info.java b/src/be/nikiroo/fanfix/data/package-info.java
index aaa02c3d1e0df7881c3540113770c41d25f7bcca..57db36b42047aa08e7ccf1050077c793e3a1d6a3 100644 (file)
--- a/src/be/nikiroo/fanfix/data/package-info.java
+++ b/src/be/nikiroo/fanfix/data/package-info.java
@@ -1,6 +1,8 @@
 /**
  * This package contains the data structure used by the program, without the 
  * logic behind them.
 /**
  * This package contains the data structure used by the program, without the 
  * logic behind them.

+ * <p>
+ * All the classes inside are serializable.

  * 
  * @author niki
  */
  * 
  * @author niki
  */