From 87429b018c246e45de7e5e562116af42e49f8499 Mon Sep 17 00:00:00 2001
From: Knut Forkalsrud <knut@forkalsrud.org>
Date: Sat, 4 Jan 2014 16:43:57 -0800
Subject: [PATCH] Better diagnostic

---
 .../java/org/forkalsrud/album/exif/Entry.java | 57 +++++++++++++++++--
 .../album/exif/EntryWithChildren.java         |  9 +++
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/forkalsrud/album/exif/Entry.java b/src/main/java/org/forkalsrud/album/exif/Entry.java
index f91586e..d3942d2 100644
--- a/src/main/java/org/forkalsrud/album/exif/Entry.java
+++ b/src/main/java/org/forkalsrud/album/exif/Entry.java
@@ -8,8 +8,6 @@ package org.forkalsrud.album.exif;
 import java.io.File;
 import java.util.Date;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 
 /**
  * Represents one item inside the album, typically file or directory, aka photo or album
@@ -128,10 +126,61 @@ public abstract class Entry {
         return false;
     }
 
+    
+    
+    protected void appendDiagnostic(StringBuilder buf) {
+        buf.append("file: ");
+        appendFile(buf);
+        buf.append(",");
+        buf.append("thumbnail: ");
+        if (thumbnail != null) {
+            buf.append(thumbnail);
+        } else {
+            buf.append("null");
+        }
+        buf.append(",");
+        buf.append("caption: ");
+        if (caption != null) {
+            buf.append(caption);
+        } else {
+            buf.append("null");
+        }
+        buf.append(",");
+        buf.append("date: ");
+        buf.append(date);
+        buf.append(",");
+        buf.append("next: ");
+        if (next != null) {
+            next.appendFile(buf);
+        } else {
+            buf.append("null");
+        }
+        buf.append(",");
+        buf.append("prev: ");
+        if (prev != null) {
+            prev.appendFile(buf);
+        } else {
+            buf.append("null");
+        }
+        buf.append(",");
+        buf.append("type: ");
+        buf.append(type);
+    }
 
-
+    
+    protected void appendFile(StringBuilder buf) {
+        if (file != null) {
+            buf.append(file.getAbsolutePath());
+        } else {
+            buf.append("null");
+        }
+    }
+    
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+        StringBuilder buf = new StringBuilder("{");
+        appendDiagnostic(buf);
+        buf.append("}");
+        return buf.toString();
     }
 }
diff --git a/src/main/java/org/forkalsrud/album/exif/EntryWithChildren.java b/src/main/java/org/forkalsrud/album/exif/EntryWithChildren.java
index 23dd512..d52e47f 100644
--- a/src/main/java/org/forkalsrud/album/exif/EntryWithChildren.java
+++ b/src/main/java/org/forkalsrud/album/exif/EntryWithChildren.java
@@ -56,4 +56,13 @@ public class EntryWithChildren<T extends Entry> extends Entry {
         }
         return null;
     }
+
+
+    @Override
+    protected void appendDiagnostic(StringBuilder buf) {
+        super.appendDiagnostic(buf);
+        buf.append(",");
+        buf.append("children: list of ");
+        buf.append(children != null ? String.valueOf(children.size()) : "null");
+    }
 }