Commit: 40 - JCBLScore (svn)

Commit MetaInfo

• Revision: 40 (tree)
• Time: 2016-03-12 23:52:01
• Author: ckoshien

Log Message

選手情報カラムを追加

Change Summary

• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/team/index.jsp
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/player/result.jsp
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/player/update.jsp
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/result/index.jsp
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/form/PlayerForm.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PitchingNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Player.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/GameNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetailNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSumNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/ResultNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/League.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Names.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Pitching.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Game.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/TeamNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetail.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSum.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Result.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PlayerNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Team.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/LeagueNames.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java

Incremental Difference

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/form/PlayerForm.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/form/PlayerForm.java	(revision 40)
@@ -1,5 +1,6 @@
 package cx.myhome.ckoshien.form;
 
+import org.seasar.struts.annotation.Maxlength;
 import org.seasar.struts.annotation.Required;
 
 public class PlayerForm {
@@ -16,4 +17,7 @@
 	public String password;
 
 	public String id;
+
+	@Maxlength(maxlength=1000)
+	public String comment;
 }

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PitchingNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PitchingNames.java	(revision 40)
@@ -10,7 +10,7 @@
  * {@link Pitching}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class PitchingNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Player.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Player.java	(revision 40)
@@ -17,7 +17,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class Player implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -48,6 +48,10 @@
     @Column(precision = 10, nullable = true, unique = false)
     public Integer authority;
 
+    /** commentプロパティ */
+    @Column(length = 1000, nullable = true, unique = false)
+    public String comment;
+
     /** battingDetailList関連プロパティ */
     @OneToMany(mappedBy = "player")
     public List<BattingDetail> battingDetailList;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/GameNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/GameNames.java	(revision 40)
@@ -14,7 +14,7 @@
  * {@link Game}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class GameNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetailNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetailNames.java	(revision 40)
@@ -10,7 +10,7 @@
  * {@link BattingDetail}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class BattingDetailNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSumNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSumNames.java	(revision 40)
@@ -10,7 +10,7 @@
  * {@link BattingSum}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class BattingSumNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/ResultNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/ResultNames.java	(revision 40)
@@ -10,7 +10,7 @@
  * {@link Result}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class ResultNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/League.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/League.java	(revision 40)
@@ -16,7 +16,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class League implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Names.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Names.java	(revision 40)
@@ -14,7 +14,7 @@
  * 名前クラスの集約です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesAggregateModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesAggregateModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class Names {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Pitching.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Pitching.java	(revision 40)
@@ -15,7 +15,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class Pitching implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Game.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Game.java	(revision 40)
@@ -18,7 +18,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class Game implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/TeamNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/TeamNames.java	(revision 40)
@@ -13,7 +13,7 @@
  * {@link Team}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class TeamNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetail.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingDetail.java	(revision 40)
@@ -15,7 +15,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class BattingDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSum.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/BattingSum.java	(revision 40)
@@ -15,7 +15,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class BattingSum implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Result.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Result.java	(revision 40)
@@ -15,7 +15,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class Result implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PlayerNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/PlayerNames.java	(revision 40)
@@ -11,7 +11,7 @@
  * {@link Player}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class PlayerNames {
 
     /**
@@ -69,6 +69,15 @@
     }
 
     /**
+     * commentのプロパティ名を返します。
+     * 
+     * @return commentのプロパティ名
+     */
+    public static PropertyName<String> comment() {
+        return new PropertyName<String>("comment");
+    }
+
+    /**
      * battingDetailListのプロパティ名を返します。
      * 
      * @return battingDetailListのプロパティ名
@@ -201,6 +210,15 @@
         }
 
         /**
+         * commentのプロパティ名を返します。
+         *
+         * @return commentのプロパティ名
+         */
+        public PropertyName<String> comment() {
+            return new PropertyName<String>(this, "comment");
+        }
+
+        /**
          * battingDetailListのプロパティ名を返します。
          * 
          * @return battingDetailListのプロパティ名

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Team.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/Team.java	(revision 40)
@@ -15,7 +15,7 @@
  * 
  */
 @Entity
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2015/07/22 16:23:17")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.EntityModelFactoryImpl"}, date = "2016/03/12 22:46:17")
 public class Team implements Serializable {
 
     private static final long serialVersionUID = 1L;

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/LeagueNames.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/entity/LeagueNames.java	(revision 40)
@@ -10,7 +10,7 @@
  * {@link League}のプロパティ名の集合です。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2015/07/22 16:23:20")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.NamesModelFactoryImpl"}, date = "2016/03/12 23:42:26")
 public class LeagueNames {
 
     /**

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 39)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 40)
@@ -80,12 +80,13 @@
 	}
 
 	@Aspect(value="loginConfInterceptor")
-	@Execute(validator = true,input="update",stopOnValidationError=false,validate="createValidate")
+	@Execute(validator = true,input="update/{id}",stopOnValidationError=true,validate="createValidate")
 	public String updateComplete(){
 		player=playerService.findById(Integer.parseInt(playerForm.id));
 		player.id=Integer.parseInt(playerForm.id);
 		player.name=playerForm.name;
 		player.teamId=Integer.parseInt(playerForm.teamId);
+		player.comment=playerForm.comment;
 		playerService.update(player);
         return "index&redirect=true";
 	}
@@ -92,6 +93,7 @@
 
 	@Execute(urlPattern="show/{id}",validator = false)
 	public String show(){
+		player=playerService.findById(Integer.parseInt(playerForm.id));
 		pbrList=battingSumService.findPBRById(Integer.parseInt(playerForm.id));
 		pbrgoList=battingSumService.findPBRGOById(Integer.parseInt(playerForm.id));
         pprList=pitchingService.findPPRById(Integer.parseInt(playerForm.id));
@@ -103,7 +105,10 @@
 		ActionMessages errors = new ActionMessages();
 		player=playerService.findByNameAndTeamId(playerForm.name, Integer.parseInt(playerForm.teamId));
 		if(player!=null){
-			errors.add("name", new ActionMessage("既に登録されています", false));
+			if(player.comment.equals(playerForm.comment)){
+				errors.add("name", new ActionMessage("既に登録されています", false));
+			}
+
 		}
 		return errors;
 	}