• R/O
  • HTTP
  • SSH
  • HTTPS

RabbitBTS: Commit

RabbitBTSのgitリポジトリ


Commit MetaInfo

Revision1f8200b1defa1f3f38aa6a115e15fcb57a4e2516 (tree)
Time2009-08-25 19:06:16
Authorsenju <senju@user...>
Commitersenju

Log Message

Merge branch 'master' of senju@git.sourceforge.jp:/gitroot/rabbit-bts/RabbitBTS

Change Summary

Incremental Difference

--- a/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
@@ -54,7 +54,7 @@ public class MembersController extends BaseController implements IController {
5454 return;
5555 }
5656 // TODO:他の条件が入った場合修正
57- final Account account = this.accountService.fetchAccountByNickName(form
57+ final Account account = this.accountService.getAccountByNickName(form
5858 .getNickName());
5959 final List<Account> accList = new ArrayList<Account>(1);
6060 map.addAttribute("accounts", accList);
@@ -70,7 +70,7 @@ public class MembersController extends BaseController implements IController {
7070 // TODO: 管理者チェック
7171 Account account = null;
7272 if (accountId != null) {
73- account = this.accountService.fetchAccountById(accountId);
73+ account = this.accountService.getAccountById(accountId);
7474 }
7575
7676 if (account == null) {
@@ -89,7 +89,7 @@ public class MembersController extends BaseController implements IController {
8989 // TODO: 管理者チェック
9090 if (accountId != null) {
9191 final Account accForDel = this.accountService
92- .fetchAccountById(accountId);
92+ .getAccountById(accountId);
9393 // TODO: 取得できたかチェック
9494 this.accountService.deleteAccount(accForDel);
9595 // TODO: ランタイム例外の処理
--- a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
@@ -118,7 +118,7 @@ public final class RegisterController extends BaseController implements
118118
119119 try {
120120 // nickName重複チェック
121- if (this.accountService.fetchAccountByNickName(account
121+ if (this.accountService.getAccountByNickName(account
122122 .getNickName()) != null) {
123123 result.rejectValue("nickName", "Account.nickName[duplicate]");
124124 Sht.log(this).trace("nickName重複チェックエラー");
--- a/src/jp/sourceforge/rabbitBTS/services/AccountService.java
+++ b/src/jp/sourceforge/rabbitBTS/services/AccountService.java
@@ -132,7 +132,7 @@ public class AccountService {
132132 * 検索するアカウントのニックネーム
133133 * @return 見つかったアカウント。無い場合null。
134134 */
135- public Account fetchAccountByNickName(String nickName) {
135+ public Account getAccountByNickName(String nickName) {
136136 final Account account = this.accountDao.findAccountByNickName(nickName);
137137 return account;
138138 }
@@ -144,7 +144,7 @@ public class AccountService {
144144 * 検索対象のID
145145 * @return 見つかったアカウント。見つからない場合null。
146146 */
147- public Account fetchAccountById(Long id) {
147+ public Account getAccountById(Long id) {
148148 try {
149149 return this.accountDao.get(id);
150150 } catch (final DataRetrievalFailureException e) {
@@ -172,13 +172,6 @@ public class AccountService {
172172 }
173173
174174 /**
175- * @return the firstSuperUser
176- */
177- public String getFirstSuperUser() {
178- return this.firstSuperUser;
179- }
180-
181- /**
182175 * @param firstSuperUser
183176 * the firstSuperUser to set
184177 */
Show on old repository browser