projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76374e3
)
Rename “localSones” method to a more traditional “getSones”.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 13 Oct 2010 14:21:03 +0000
(16:21 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 13 Oct 2010 14:21:03 +0000
(16:21 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/LoginPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
31e2680
..
7ddc247
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-95,7
+95,7
@@
public class Core extends AbstractService {
*
* @return The local Sones
*/
*
* @return The local Sones
*/
- public Set<Sone>
local
Sones() {
+ public Set<Sone>
get
Sones() {
return Collections.unmodifiableSet(localSones);
}
return Collections.unmodifiableSet(localSones);
}
diff --git
a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index
a72fd02
..
39c3cdc
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@
-53,12
+53,12
@@
public class LoginPage extends SoneTemplatePage {
@Override
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
@Override
protected void processTemplate(Request request, Template template) throws RedirectException {
super.processTemplate(request, template);
- Set<Sone> localSones = webInterface.core().
local
Sones();
+ Set<Sone> localSones = webInterface.core().
get
Sones();
template.set("sones", localSones);
if (request.getMethod() == Method.POST) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
Sone selectedSone = null;
template.set("sones", localSones);
if (request.getMethod() == Method.POST) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
Sone selectedSone = null;
- for (Sone sone : webInterface.core().
local
Sones()) {
+ for (Sone sone : webInterface.core().
get
Sones()) {
if (sone.getId().equals(soneId)) {
selectedSone = sone;
break;
if (sone.getId().equals(soneId)) {
selectedSone = sone;
break;
diff --git
a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index
c271024
..
6afc3b7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@
-111,7
+111,7
@@
public class SoneTemplatePage extends TemplatePage {
return null;
}
String soneId = (String) session.getAttribute("Sone.CurrentSone");
return null;
}
String soneId = (String) session.getAttribute("Sone.CurrentSone");
- for (Sone sone : webInterface.core().
local
Sones()) {
+ for (Sone sone : webInterface.core().
get
Sones()) {
if (sone.getId().equals(soneId)) {
return sone;
}
if (sone.getId().equals(soneId)) {
return sone;
}