ホワイトスペース修正

[jindolf/Jindolf.git] / src / main / java / jp / sfjp / jindolf / data / Period.java

diff --git a/src/main/java/jp/sfjp/jindolf/data/Period.java b/src/main/java/jp/sfjp/jindolf/data/Period.java
index 9886682..319a5f2 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/data/Period.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Period.java
@@ -40,7 +40,7 @@ import jp.sourceforge.jindolf.parser.SeqRange;
  * いわゆる「日」。
  * 村の進行の一区切り。プロローグやエピローグも含まれる。
  *
- * 将来、24時間更新でなくなる可能性の考慮が必要。
+ * <p>将来、24時間更新でなくなる可能性の考慮が必要。
  * 人気のないプロローグなどで、
  * 24時間以上の期間を持つPeriodが生成される可能性の考慮が必要。
  */
@@ -68,7 +68,7 @@ public class Period{
     private String loginName;
     private boolean isFullOpen = false;
 
-    private final List<Topic> topicList = new LinkedList<Topic>();
+    private final List<Topic> topicList = new LinkedList<>();
     private final List<Topic> unmodList =
             Collections.unmodifiableList(this.topicList);
 
@@ -113,8 +113,8 @@ public class Period{
                     int day,
                     boolean isHot)
                     throws NullPointerException{
-        if(   homeVillage == null
-           || periodType  == null ) throw new NullPointerException();
+        if(    homeVillage == null
+            || periodType  == null ) throw new NullPointerException();
         if(day < 0){
             throw new IllegalArgumentException("Period day is too small !");
         }
@@ -147,7 +147,7 @@ public class Period{
      * Periodを更新する。Topicのリストが更新される。
      * @param period 日
      * @param force trueなら強制再読み込み。
-     * falseならまだ読み込んで無い時のみ読み込み。
+     *     falseならまだ読み込んで無い時のみ読み込み。
      * @throws IOException ネットワーク入力エラー
      */
     public static void parsePeriod(Period period, boolean force)
@@ -489,7 +489,7 @@ public class Period{
      * @return 投票に参加したAvatarのSet
      */
     public Set<Avatar> getVoterSet(){
-        Set<Avatar> result = new HashSet<Avatar>();
+        Set<Avatar> result = new HashSet<>();
 
         for(Topic topic : getTopicList()){
             if( ! (topic instanceof SysEvent) ) continue;
@@ -527,7 +527,7 @@ public class Period{
                 new EntityConverter();
 
         private final Map<Avatar, int[]> countMap =
-                new HashMap<Avatar, int[]>();
+                new HashMap<>();
 
         private Period period = null;
 
@@ -542,11 +542,11 @@ public class Period{
         private EventFamily eventFamily;
         private SysEventType sysEventType;
         private DecodedContent eventContent = null;
-        private final List<Avatar> avatarList = new LinkedList<Avatar>();
-        private final List<GameRole> roleList = new LinkedList<GameRole>();
-        private final List<Integer> integerList = new LinkedList<Integer>();
+        private final List<Avatar> avatarList = new LinkedList<>();
+        private final List<GameRole> roleList = new LinkedList<>();
+        private final List<Integer> integerList = new LinkedList<>();
         private final List<CharSequence>  charseqList =
-            new LinkedList<CharSequence>();
+            new LinkedList<>();
 
         /**
          * コンストラクタ。
@@ -687,8 +687,8 @@ public class Period{
 
             if(this.period.getType() != periodType) return;
 
-            if(   periodType == PeriodType.PROGRESS
-               && this.period.getDay() != day ){
+            if(    periodType == PeriodType.PROGRESS
+                && this.period.getDay() != day ){
                 return;
             }
 
@@ -1207,8 +1207,8 @@ public class Period{
 
             this.period.addTopic(event);
 
-            if(   this.sysEventType == SysEventType.MURDERED
-               || this.sysEventType == SysEventType.NOMURDER ){
+            if(    this.sysEventType == SysEventType.MURDERED
+                || this.sysEventType == SysEventType.NOMURDER ){
                 for(Topic topic : this.period.topicList){
                     if( ! (topic instanceof Talk) ) continue;
                     Talk talk = (Talk) topic;