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.2'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
CollectionAccessor.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
index
2b91592
..
afa22ec
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - CollectionAccessor.java - Copyright © 2010 David Roden
+ * Sone - CollectionAccessor.java - Copyright © 2010
–2012
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-24,8
+24,8
@@
import java.util.List;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.Accessor;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
/**
* {@link Accessor} for {@link Collection}s that adds a couple of specialized
/**
* {@link Accessor} for {@link Collection}s that adds a couple of specialized
@@
-44,7
+44,7
@@
public class CollectionAccessor extends ReflectionAccessor {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public Object get(
DataProvider dataProvider
, Object object, String member) {
+ public Object get(
TemplateContext templateContext
, Object object, String member) {
if (object == null) {
return null;
}
if (object == null) {
return null;
}
@@
-61,13
+61,13
@@
public class CollectionAccessor extends ReflectionAccessor {
StringBuilder soneNames = new StringBuilder();
for (Sone sone : sones) {
if (soneNames.length() > 0) {
StringBuilder soneNames = new StringBuilder();
for (Sone sone : sones) {
if (soneNames.length() > 0) {
- soneNames.append(
'\n'
);
+ soneNames.append(
", "
);
}
soneNames.append(SoneAccessor.getNiceName(sone));
}
return soneNames.toString();
}
}
soneNames.append(SoneAccessor.getNiceName(sone));
}
return soneNames.toString();
}
- return super.get(
dataProvider
, object, member);
+ return super.get(
templateContext
, object, member);
}
}
}
}