Add javadoc for exception.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneDownloader.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 4d63130..b085ade 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -219,8 +219,10 @@ public class SoneDownloader extends AbstractService {
         * @param soneInputStream
         *            The input stream to parse the Sone from
         * @return The parsed Sone
+        * @throws SoneException
+        *             if a parse error occurs, or the protocol is invalid
         */
-       public Sone parseSone(Sone originalSone, InputStream soneInputStream) {
+       public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
                /* TODO - impose a size limit? */
 
                Document document;
@@ -336,8 +338,8 @@ public class SoneDownloader extends AbstractService {
                if (profileFieldsXml != null) {
                        for (SimpleXML fieldXml : profileFieldsXml.getNodes("field")) {
                                String fieldName = fieldXml.getValue("field-name", null);
-                               String fieldValue = fieldXml.getValue("field-value", null);
-                               if ((fieldName == null) || (fieldValue == null)) {
+                               String fieldValue = fieldXml.getValue("field-value", "");
+                               if (fieldName == null) {
                                        logger.log(Level.WARNING, "Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", new Object[] { sone, fieldName, fieldValue });
                                        return null;
                                }
@@ -442,7 +444,7 @@ public class SoneDownloader extends AbstractService {
                                String id = albumXml.getValue("id", null);
                                String parentId = albumXml.getValue("parent", null);
                                String title = albumXml.getValue("title", null);
-                               String description = albumXml.getValue("description", null);
+                               String description = albumXml.getValue("description", "");
                                String albumImageId = albumXml.getValue("album-image", null);
                                if ((id == null) || (title == null) || (description == null)) {
                                        logger.log(Level.WARNING, "Downloaded Sone %s contains invalid album!", new Object[] { sone });
@@ -456,7 +458,7 @@ public class SoneDownloader extends AbstractService {
                                                return null;
                                        }
                                }
-                               Album album = core.getAlbum(id).setSone(sone).setTitle(title).setDescription(description).setAlbumImage(albumImageId);
+                               Album album = core.getAlbum(id).setSone(sone).setTitle(title).setDescription(description);
                                if (parent != null) {
                                        parent.addAlbum(album);
                                } else {
@@ -489,6 +491,7 @@ public class SoneDownloader extends AbstractService {
                                                album.addImage(image);
                                        }
                                }
+                               album.setAlbumImage(albumImageId);
                        }
                }