Set default language to Undefined instead of English

.gitignore

@@ -7,3 +7,5 @@ epublib-tools/.classpath
 epublib-tools/.project
 epublib-core/.settings
 epublib-tools/.settings/
+!/.idea/
+*.iml

epublib-core/pom.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -15,11 +15,16 @@
 	<parent>
     	<groupId>nl.siegmann.epublib</groupId>
 		<artifactId>epublib-parent</artifactId>
-		<version>4.0</version>
+		<version>4.0.1-EPUB3-SNAPSHOT</version>
 		<relativePath>../epublib-parent/pom.xml</relativePath>
   	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.11.0</version>
+		</dependency>
 		<dependency>
 		    <groupId>net.sf.kxml</groupId>
 		    <artifactId>kxml2</artifactId>

epublib-core/src/main/java/nl/siegmann/epublib/domain/Author.java

@@ -16,7 +16,17 @@ public class Author implements Serializable {
 
 	private String firstname;
 	private String lastname;
-	private Relator relator = Relator.AUTHOR;
+	private Relator relator;
+
+	public Scheme getScheme() {
+		return scheme;
+	}
+
+	public void setScheme(Scheme scheme) {
+		this.scheme = scheme;
+	}
+
+	private Scheme scheme;
 
 	public Author(String singleName) {
 		this("", singleName);

epublib-core/src/main/java/nl/siegmann/epublib/domain/Identifier.java

@@ -20,16 +20,9 @@ public class Identifier implements Serializable {
 	 * 
 	 */
 	private static final long serialVersionUID = 955949951416391810L;
-
-	public interface Scheme {
-		String UUID = "UUID";
-		String ISBN = "ISBN";
-		String URL = "URL";
-		String URI = "URI";
-	}
 
 	private boolean bookId = false;
-	private String scheme;
+	private Scheme scheme;
 	private String value;
 
 	/**
@@ -40,11 +33,19 @@ public Identifier() {
 	}
 
 
-	public Identifier(String scheme, String value) {
+	public Identifier(Scheme scheme, String value) {
 		this.scheme = scheme;
 		this.value = value;
 	}
 
+	public Scheme getScheme() {
+		return scheme;
+	}
+
+	public void setScheme(Scheme scheme) {
+		this.scheme = scheme;
+	}
+
 	/**
 	 * The first identifier for which the bookId is true is made the bookId identifier.
 	 * If no identifier has bookId == true then the first bookId identifier is written as the primary.
@@ -72,12 +73,6 @@ public static Identifier getBookIdIdentifier(List<Identifier> identifiers) {
 		return result;
 	}
 
-	public String getScheme() {
-		return scheme;
-	}
-	public void setScheme(String scheme) {
-		this.scheme = scheme;
-	}
 	public String getValue() {
 		return value;
 	}
@@ -104,19 +99,19 @@ public boolean isBookId() {
 	}
 
 	public int hashCode() {
-		return StringUtil.defaultIfNull(scheme).hashCode() ^ StringUtil.defaultIfNull(value).hashCode();
+		return StringUtil.defaultIfNull(scheme.getName()).hashCode() ^ StringUtil.defaultIfNull(value).hashCode();
 	}
 
 	public boolean equals(Object otherIdentifier) {
 		if(! (otherIdentifier instanceof Identifier)) {
 			return false;
 		}
-		return StringUtil.equals(scheme, ((Identifier) otherIdentifier).scheme)
+		return StringUtil.equals(scheme.getName(), ((Identifier) otherIdentifier).scheme.getName())
 		&& StringUtil.equals(value, ((Identifier) otherIdentifier).value);
 	}
 
 	public String toString() {
-		if (StringUtil.isBlank(scheme)) {
+		if (StringUtil.isBlank(scheme.getName())) {
 			return "" + value;
 		}
 		return "" + scheme + ":" + value;

epublib-core/src/main/java/nl/siegmann/epublib/domain/LazyResource.java

@@ -4,15 +4,14 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 import nl.siegmann.epublib.service.MediatypeService;
 import nl.siegmann.epublib.util.IOUtil;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A Resource that loads its data only on-demand.
  * This way larger books can fit into memory and can be opened faster.
@@ -28,7 +27,7 @@ public class LazyResource extends Resource {
 	private String filename;
 	private long cachedSize;
 
-	private static final Logger LOG = LoggerFactory.getLogger(LazyResource.class);
+	private static final Logger LOG = Logger.getLogger(LazyResource.class.getName());
 
 	/**
 	 * Creates a Lazy resource, by not actually loading the data for this entry.
@@ -102,8 +101,9 @@ public void initialize() throws IOException {
 	public byte[] getData() throws IOException {
 
 		if ( data == null ) {
-
-			LOG.debug("Initializing lazy resource " + filename + "#" + this.getHref() );
+			if (LOG.isLoggable(Level.FINE)) {
+				LOG.fine("Initializing lazy resource " + filename + "#" + this.getHref());
+			}
 
 			InputStream in = getResourceStream();
 			byte[] readData = IOUtil.toByteArray(in, (int) this.cachedSize);

epublib-core/src/main/java/nl/siegmann/epublib/domain/Metadata.java

@@ -25,7 +25,11 @@ public class Metadata implements Serializable {
 	 */
 	private static final long serialVersionUID = -2437262888962149444L;
 
-	public static final String DEFAULT_LANGUAGE = "en";
+	/**
+	 * Default language is now set to "undefined" so people can check if the epub declares a language.
+	 * They may want to try and detect the language based on the book text if there's no language metadata.
+	 */
+	public static final String DEFAULT_LANGUAGE = "und";
 
 	private boolean autoGeneratedId = true;
 	private List<Author> authors = new ArrayList<Author>();
@@ -34,7 +38,7 @@ public class Metadata implements Serializable {
 	private String language = DEFAULT_LANGUAGE;
 	private Map<QName, String> otherProperties = new HashMap<QName, String>();
 	private List<String> rights = new ArrayList<String>();
-	private List<String> titles = new ArrayList<String>();
+	private List<Title> titles = new ArrayList<>();
 	private List<Identifier> identifiers = new ArrayList<Identifier>();
 	private List<String> subjects = new ArrayList<String>();
 	private String format = MediatypeService.EPUB.getName();
@@ -126,27 +130,27 @@ public List<String> getRights() {
 	 * 
 	 * @return the first non-blank title of the book.
 	 */
-	public String getFirstTitle() {
+	public Title getFirstTitle() {
 		if (titles == null || titles.isEmpty()) {
-			return "";
+			return Title.EMPTY;
 		}
-		for (String title: titles) {
-			if (StringUtil.isNotBlank(title)) {
+		for (Title title: titles) {
+			if (StringUtil.isNotBlank(title.value)) {
 				return title;
 			}
 		}
-		return "";
+		return Title.EMPTY;
 	}
 
 
-	public String addTitle(String title) {
+	public Title addTitle(Title title) {
 		this.titles.add(title);
 		return title;
 	}
-	public void setTitles(List<String> titles) {
+	public void setTitles(List<Title> titles) {
 		this.titles = titles;
 	}
-	public List<String> getTitles() {
+	public List<Title> getTitles() {
 		return titles;
 	}
 

epublib-core/src/main/java/nl/siegmann/epublib/domain/OpfResource.java

@@ -0,0 +1,38 @@
+package nl.siegmann.epublib.domain;
+
+import java.io.IOException;
+
+public class OpfResource extends Resource {
+
+    public static final String DEFAULT_VERSION = "2.0";
+
+    private String version;
+
+    private String prefix;
+
+    public OpfResource(Resource resource) throws IOException {
+        super(
+                resource.getId(),
+                resource.getData(),
+                resource.getHref(),
+                resource.getMediaType(),
+                resource.getInputEncoding()
+        );
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+}

epublib-core/src/main/java/nl/siegmann/epublib/domain/Resource.java

@@ -32,7 +32,10 @@ public class Resource implements Serializable {
 	private MediaType mediaType;
 	private String inputEncoding = Constants.CHARACTER_ENCODING;
 	protected byte[] data;
-
+	private boolean isNav;
+	private boolean containingSvg;
+	private boolean isScripted;
+
 	/**
 	 * Creates an empty Resource with the given href.
 	 * 
@@ -137,6 +140,30 @@ public Resource(String id, byte[] data, String href, MediaType mediaType, String
 		this.inputEncoding = inputEncoding;
 		this.data = data;
 	}
+
+	public boolean isNav() {
+		return isNav;
+	}
+
+	public void setNav(boolean nav) {
+		isNav = nav;
+	}
+
+	public boolean isContainingSvg() {
+		return containingSvg;
+	}
+
+	public void setContainingSvg(boolean containingSvg) {
+		this.containingSvg = containingSvg;
+	}
+
+	public boolean isScripted() {
+		return isScripted;
+	}
+
+	public void setScripted(boolean scripted) {
+		isScripted = scripted;
+	}
 
 	/**
 	 * Gets the contents of the Resource as an InputStream.

epublib-core/src/main/java/nl/siegmann/epublib/domain/Resources.java

@@ -28,9 +28,19 @@ public class Resources implements Serializable {
 	private static final String IMAGE_PREFIX = "image_";
 	private static final String ITEM_PREFIX = "item_";
 	private int lastId = 1;
-
+	private Resource navResource;
+
 	private Map<String, Resource> resources = new HashMap<String, Resource>();
-
+
+	public Resource getNavResource() {
+		return navResource;
+	}
+
+	public void setNavResource(Resource navResource) {
+		this.navResource = navResource;
+	}
+
+
 	/**
 	 * Adds a resource to the resources.
 	 * 

epublib-core/src/main/java/nl/siegmann/epublib/domain/Scheme.java

@@ -0,0 +1,36 @@
+package nl.siegmann.epublib.domain;
+
+public class Scheme {
+
+    public final static Scheme UUID = new Scheme("UUID");
+
+    public final static Scheme ISBN = new Scheme("ISBN");
+
+    private String name;
+    private String value;
+
+    public Scheme(String name) {
+        this.name = name;
+    }
+
+    public Scheme(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}