From 4155196163dbedf385ff96ed04742f848c00b68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolay=20Schi=C3=B8ll-Johansen?=
 <nicolayschiolljohansen@gmail.com>
Date: Wed, 15 Apr 2020 20:54:22 +0200
Subject: [PATCH] Revert "replaced use of toString with Eiriks new method"

This reverts commit 1594e96a59c9be684282851ddf23ec15ff602446.
---
 .../NTNU/IDATT1002/controllers/Search.java    |  3 +--
 .../java/NTNU/IDATT1002/models/Metadata.java  | 25 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/NTNU/IDATT1002/controllers/Search.java b/src/main/java/NTNU/IDATT1002/controllers/Search.java
index b4489988..fc54d59d 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Search.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Search.java
@@ -4,7 +4,6 @@ import NTNU.IDATT1002.App;
 import NTNU.IDATT1002.service.ImageService;
 import NTNU.IDATT1002.service.TagService;
 import NTNU.IDATT1002.utils.ImageUtil;
-import NTNU.IDATT1002.utils.MetadataStringFormatter;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.Initializable;
@@ -98,7 +97,7 @@ public class Search implements Initializable {
             Text title_Field = setText("SKAL BILDENE HA TITTEL?", 700, 66, "System Bold", 48);
             String tagsString = TagService.getTagsAsString(images.get(i).getTags());
             Text tag_Field = setText(tagsString, 700, 97, "System Bold", 24);
-            Text metadata_Field = setText(MetadataStringFormatter.format(images.get(i).getMetadata(), '\n'), 700, 126, "System Bold", 18);
+            Text metadata_Field = setText(images.get(i).getMetadata().toString(), 700, 126, "System Bold", 18);
             VBox metaBox = new VBox();
             metaBox.getChildren().add(metadata_Field);
             ScrollPane meta = new ScrollPane();
diff --git a/src/main/java/NTNU/IDATT1002/models/Metadata.java b/src/main/java/NTNU/IDATT1002/models/Metadata.java
index 9b6118c5..963f198c 100644
--- a/src/main/java/NTNU/IDATT1002/models/Metadata.java
+++ b/src/main/java/NTNU/IDATT1002/models/Metadata.java
@@ -165,18 +165,17 @@ public class Metadata {
     @Override
     public String toString() {
         return "Metadata{" +
-                "metadataId=" + metadataId +
-                "camera='" + camera + '\'' +
-                "lens='" + lens + '\'' +
-                "aperture='" + aperture + '\'' +
-                "shutterSpeed='" + shutterSpeed + '\'' +
-                "ISO='" + ISO + '\'' +
-                "focalLength='" + focalLength + '\'' +
-                "fileType='" + fileType + '\'' +
-                "photoDate='" + photoDate + '\'' +
-                "fileSize='" + fileSize + '\'' +
-                "fileDimension='" + fileDimension + '\'' +
-                '}';
-
+            "\nmetadataId=" + metadataId +
+            "\ncamera='" + camera + '\'' +
+            "\nlens='" + lens + '\'' +
+            "\naperture='" + aperture + '\'' +
+            "\nshutterSpeed='" + shutterSpeed + '\'' +
+            "\nISO='" + ISO + '\'' +
+            "\nfocalLength='" + focalLength + '\'' +
+            "\nfileType='" + fileType + '\'' +
+            "\nphotoDate='" + photoDate + '\'' +
+            "\nfileSize='" + fileSize + '\'' +
+            "\nfileDimension='" + fileDimension + '\'' +
+            '}';
     }
 }
-- 
GitLab