Merge branch 'fix/pdf' into 'dev'

Quickfix pdf formatting user and metadata

See merge request !217

src/main/java/NTNU/IDATT1002/service/PdfDocument.java

@@ -3,6 +3,7 @@ package NTNU.IDATT1002.service;
 import NTNU.IDATT1002.models.Album;
 import NTNU.IDATT1002.models.Image;
 import NTNU.IDATT1002.models.Metadata;
+import NTNU.IDATT1002.utils.MetadataStringFormatter;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.PdfWriter;
 import org.slf4j.Logger;
@@ -97,7 +98,7 @@ public class PdfDocument implements AlbumDocument {
         addEmptyLineTo(headline, 1);
 
         headline.add(new Paragraph(
-                "Generated by: " + album.getUser().getUsername() + ", "
+                "Generated by: " + ApplicationState.getCurrentUser().getUsername() + ", "
                         + new Date(),
                 smallFont));
         addEmptyLineTo(headline, 2);
@@ -207,7 +208,9 @@ public class PdfDocument implements AlbumDocument {
     private void addImageMetaData(Image image) throws DocumentException {
         Metadata metadata = image.getMetadata();
         if (metadata != null)
-            document.add(new Paragraph(metadata.toString()));
+            document.add(new Paragraph("Title: " +
+                            image.getTitle() + "\n" +
+                            MetadataStringFormatter.format(metadata, "\n")));
     }
 
     /**