projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b624d6
)
Use traditional getter name.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 5 Nov 2010 09:29:31 +0000
(10:29 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 5 Nov 2010 09:29:31 +0000
(10:29 +0100)
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/WebInterface.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index
1646935
..
f38e845
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@
-73,7
+73,7
@@
public class SoneTemplatePage extends TemplatePage {
* Whether this page requires a login
*/
public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface, boolean requireLogin) {
* Whether this page requires a login
*/
public SoneTemplatePage(String path, Template template, String pageTitleKey, WebInterface webInterface, boolean requireLogin) {
- super(path, template, webInterface.
l
10n(), pageTitleKey, "noPermission.html");
+ super(path, template, webInterface.
getL
10n(), pageTitleKey, "noPermission.html");
this.webInterface = webInterface;
this.requireLogin = requireLogin;
template.set("webInterface", webInterface);
this.webInterface = webInterface;
this.requireLogin = requireLogin;
template.set("webInterface", webInterface);
diff --git
a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index
2ba96ec
..
c6dbca9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/
src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@
-120,7
+120,7
@@
public class WebInterface {
*
* @return The node’s l10n helper
*/
*
* @return The node’s l10n helper
*/
- public BaseL10n
l
10n() {
+ public BaseL10n
getL
10n() {
return sonePlugin.l10n().getBase();
}
return sonePlugin.l10n().getBase();
}
@@
-181,7
+181,7
@@
public class WebInterface {
templateFactory.addAccessor(Reply.class, new ReplyAccessor(core()));
templateFactory.addAccessor(Identity.class, new IdentityAccessor(core()));
templateFactory.addFilter("date", new DateFilter());
templateFactory.addAccessor(Reply.class, new ReplyAccessor(core()));
templateFactory.addAccessor(Identity.class, new IdentityAccessor(core()));
templateFactory.addFilter("date", new DateFilter());
- templateFactory.addFilter("l10n", new L10nFilter(
l
10n()));
+ templateFactory.addFilter("l10n", new L10nFilter(
getL
10n()));
templateFactory.addFilter("substring", new SubstringFilter());
templateFactory.addFilter("xml", new XmlFilter());
templateFactory.addFilter("change", new RequestChangeFilter());
templateFactory.addFilter("substring", new SubstringFilter());
templateFactory.addFilter("xml", new XmlFilter());
templateFactory.addFilter("change", new RequestChangeFilter());
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
index
68f1777
..
20f1636
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java
@@
-47,7
+47,7
@@
public class GetTranslationPage extends JsonPage {
@Override
protected JsonObject createJsonObject(Request request) {
String key = request.getHttpRequest().getParam("key");
@Override
protected JsonObject createJsonObject(Request request) {
String key = request.getHttpRequest().getParam("key");
- String translation = webInterface.
l
10n().getString(key);
+ String translation = webInterface.
getL
10n().getString(key);
return new JsonObject().put("value", translation);
}
return new JsonObject().put("value", translation);
}