projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.8'
[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
bc72776
..
c134fc0
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@
-21,9
+21,9
@@
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
import java.util.logging.Logger;
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.data.Profile;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
import net.pterodactylus.sone.freenet.wot.Trust;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
@@
-86,17
+86,17
@@
public class SoneAccessor extends ReflectionAccessor {
} else if (member.equals("modified")) {
return core.isModifiedSone(sone);
} else if (member.equals("status")) {
} else if (member.equals("modified")) {
return core.isModifiedSone(sone);
} else if (member.equals("status")) {
- return
core.getSoneStatus(sone
);
+ return
sone.getStatus(
);
} else if (member.equals("unknown")) {
} else if (member.equals("unknown")) {
- return
core.getSoneStatus(sone
) == SoneStatus.unknown;
+ return
sone.getStatus(
) == SoneStatus.unknown;
} else if (member.equals("idle")) {
} else if (member.equals("idle")) {
- return
core.getSoneStatus(sone
) == SoneStatus.idle;
+ return
sone.getStatus(
) == SoneStatus.idle;
} else if (member.equals("inserting")) {
} else if (member.equals("inserting")) {
- return
core.getSoneStatus(sone
) == SoneStatus.inserting;
+ return
sone.getStatus(
) == SoneStatus.inserting;
} else if (member.equals("downloading")) {
} else if (member.equals("downloading")) {
- return
core.getSoneStatus(sone
) == SoneStatus.downloading;
+ return
sone.getStatus(
) == SoneStatus.downloading;
} else if (member.equals("new")) {
} else if (member.equals("new")) {
- return
core.isNewSone(sone.getId()
);
+ return
!sone.isKnown(
);
} else if (member.equals("locked")) {
return core.isLocked(sone);
} else if (member.equals("lastUpdatedText")) {
} else if (member.equals("locked")) {
return core.isLocked(sone);
} else if (member.equals("lastUpdatedText")) {
@@
-112,12
+112,6
@@
public class SoneAccessor extends ReflectionAccessor {
return new Trust(null, null, null);
}
return trust;
return new Trust(null, null, null);
}
return trust;
- } else if (member.equals("avatar")) {
- String avatarId = sone.getAvatar();
- if (avatarId == null) {
- return null;
- }
- return core.getImage(avatarId);
}
return super.get(templateContext, object, member);
}
}
return super.get(templateContext, object, member);
}