Remove exception from Identity interface, let null signal an error.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / SoneAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index 5b787a9..0cb92ff 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -21,6 +21,7 @@ import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
@@ -69,14 +70,14 @@ public class SoneAccessor extends ReflectionAccessor {
                        return sone.getInsertUri() != null;
                } else if (member.equals("friend")) {
                        Sone currentSone = (Sone) dataProvider.getData("currentSone");
-                       return (currentSone != null) && currentSone.hasFriend(sone);
+                       return (currentSone != null) && currentSone.hasFriend(sone.getId());
                } else if (member.equals("current")) {
                        Sone currentSone = (Sone) dataProvider.getData("currentSone");
                        return (currentSone != null) && currentSone.equals(sone);
                } else if (member.equals("modified")) {
-                       return sone.getModificationCounter() > 0;
+                       return core.isModifiedSone(sone);
                } else if (member.equals("status")) {
-                       return core.getSoneStatus(sone).toString();
+                       return core.getSoneStatus(sone);
                } else if (member.equals("unknown")) {
                        return core.getSoneStatus(sone) == SoneStatus.unknown;
                } else if (member.equals("idle")) {
@@ -85,6 +86,16 @@ public class SoneAccessor extends ReflectionAccessor {
                        return core.getSoneStatus(sone) == SoneStatus.inserting;
                } else if (member.equals("downloading")) {
                        return core.getSoneStatus(sone) == SoneStatus.downloading;
+               } else if (member.equals("new")) {
+                       return core.isNewSone(sone);
+               } else if (member.equals("locked")) {
+                       return core.isLocked(sone);
+               } else if (member.equals("trust")) {
+                       Sone currentSone = (Sone) dataProvider.getData("currentSone");
+                       Trust trust = core.getTrust(currentSone, sone);
+                       if (trust == null) {
+                               return new Trust(null, null, null);
+                       }
                }
                return super.get(dataProvider, object, member);
        }
@@ -107,7 +118,7 @@ public class SoneAccessor extends ReflectionAccessor {
                String lastName = profile.getLastName();
                if (firstName == null) {
                        if (lastName == null) {
-                               return sone.getName();
+                               return String.valueOf(sone.getName());
                        }
                        return lastName;
                }