From 6eef456fc2e44c108352a5f3e2241313467d8b64 Mon Sep 17 00:00:00 2001
From: Senju Higurashi <senju@users.sourceforge.jp>
Date: Sun, 27 Sep 2009 20:10:50 +0900
Subject: [PATCH] =?utf8?q?=E7=92=B0=E5=A2=83=E3=81=BE=E3=82=8F=E3=82=8A?=
 =?utf8?q?=E3=81=AE=E7=B4=B0=E3=81=8B=E3=81=84=E4=BF=AE=E6=AD=A3(=E5=89=8D?=
 =?utf8?q?=E5=9B=9E=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E3=81=97=E5=BF=98?=
 =?utf8?q?=E3=82=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

eclipseでjdk6が使用されるよう修正。
eclipseでのビルド時にlogback.xmlが削除されるのを修正。
eclipseのビルドパス修正。
GAE SDKのバージョンアップ。
---
 .classpath                                         |  2 +-
 .settings/org.eclipse.jdt.ui.prefs                 | 54 +++++++++++++++++++++-
 build.xml                                          |  3 +-
 .../rabbitBTS/controllers/RegisterController.java  |  4 +-
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index 3b2a545..14b5cab 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/spring-webmvc.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/spring-modules-validation.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/aspectjrt.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/aspectjweaver.jar"/>
@@ -18,5 +17,6 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-lang-2.4.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/spring-orm.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/spring-tx.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/slf4j-api-1.5.8.jar"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 6e6261d..5d4a17d 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,56 @@
-#Wed Jul 29 20:41:23 JST 2009
+#Sun Sep 27 19:55:26 JST 2009
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
+cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 org.eclipse.jdt.ui.javadoc=false
diff --git a/build.xml b/build.xml
index 9c563fa..28f5534 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <!-- vim:set et sw=2 sts=2 ts=2 fenc=utf-8: -->
 <project default="compile">
-  <property name="sdk.dir" location="../appengine-java-sdk-1.2.2" />
+  <property name="sdk.dir" location="../appengine-java-sdk-1.2.5" />
 
   <import file="${sdk.dir}/config/user/ant-macros.xml" />
 
@@ -15,6 +15,7 @@
   </path>
 
   <target name="init">
+    <!-- 不要ファイルの削除 -->
     <delete>
       <fileset dir=".">
         <include name="**/*.swp" />
diff --git a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
index 60c09ed..00a9e00 100644
--- a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
@@ -18,7 +18,6 @@
 package jp.sourceforge.rabbitBTS.controllers;
 
 import java.util.Date;
-import java.util.logging.Level;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -118,8 +117,7 @@ public final class RegisterController extends BaseController implements
 
 		try {
 			// nickName重複チェック
-			if (this.accountService.getAccountByNickName(account
-					.getNickName()) != null) {
+			if (this.accountService.getAccountByNickName(account.getNickName()) != null) {
 				result.rejectValue("nickName", "Account.nickName[duplicate]");
 				Sht.log(this).trace("nickName重複チェックエラー");
 				return null;
-- 
2.11.0