ダイヤモンド演算子適用

diff --git a/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java b/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java
index 43e4ead..c5835ee 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/EventData.java
@@ -22,11 +22,11 @@ public class EventData extends TopicData{
 
     private SysEventType eventType = null;
 
-    private final List<AvatarData> avatarList = new LinkedList<AvatarData>();
-    private final List<Integer> intList = new LinkedList<Integer>();
-    private final List<GameRole> roleList = new LinkedList<GameRole>();
+    private final List<AvatarData> avatarList = new LinkedList<>();
+    private final List<Integer> intList = new LinkedList<>();
+    private final List<GameRole> roleList = new LinkedList<>();
     private final List<DecodedContent> strList =
-            new LinkedList<DecodedContent>();
+            new LinkedList<>();
 
 
     /**
@@ -504,6 +504,7 @@ public class EventData extends TopicData{
      * @param writer 出力先
      * @throws IOException 出力エラー
      */
+    @Override
     public void dumpXml(Writer writer) throws IOException{
         String tagName = getTagName(this.eventType);
 

diff --git a/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java b/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java
index 9237b41..4567ac7 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/HttpAccess.java
@@ -185,7 +185,7 @@ public final class HttpAccess{
         @Override
         public void startParse(DecodedContent content)
                 throws HtmlParseException{
-            this.resourceList = new LinkedList<PeriodResource>();
+            this.resourceList = new LinkedList<>();
             this.progressDays = 0;
             this.hasDone = false;
             return;

diff --git a/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java b/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java
index b2b7831..a211d46 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/PeriodData.java
@@ -31,7 +31,7 @@ public class PeriodData{
     private DisclosureType disclosureType = DisclosureType.HOT;
     private boolean hasMurderResult = false;
 
-    private final List<TopicData> topicList = new LinkedList<TopicData>();
+    private final List<TopicData> topicList = new LinkedList<>();
 
     /**
      * コンストラクタ。

diff --git a/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java b/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java
index 6df83a0..1c988fc 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/TopicData.java
@@ -20,8 +20,7 @@ public abstract class TopicData{
 
     private static final DecodedContent BREAK = new DecodedContent("\n");
 
-    private final List<DecodedContent> lineList =
-            new LinkedList<DecodedContent>();
+    private final List<DecodedContent> lineList = new LinkedList<>();
 
     /**
      * コンストラクタ。

diff --git a/src/main/java/jp/sourceforge/jindolf/archiver/VillageData.java b/src/main/java/jp/sourceforge/jindolf/archiver/VillageData.java
index d19ccf0..fce44ab 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/archiver/VillageData.java
+++ b/src/main/java/jp/sourceforge/jindolf/archiver/VillageData.java
@@ -34,10 +34,10 @@ public class VillageData{
     private int commitMinute = -1;
     private String graveIconUri;
 
-    private final List<AvatarData> avatarList = new LinkedList<AvatarData>();
+    private final List<AvatarData> avatarList = new LinkedList<>();
     private int undefAvatarNo = 1;
 
-    private final List<PeriodData> periodList = new LinkedList<PeriodData>();
+    private final List<PeriodData> periodList = new LinkedList<>();
 
 
     /**
@@ -49,7 +49,7 @@ public class VillageData{
 
         validatePeriodResource(resourceList);
 
-        this.resourceList = new LinkedList<PeriodResource>(resourceList);
+        this.resourceList = new LinkedList<>(resourceList);
 
         PeriodResource resource1st = this.resourceList.get(0);
         this.landDef   = resource1st.getLandDef();