From 24c68c8966c664039120aae53e74dab46f20e109 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Sat, 18 Jun 2016 01:02:48 +0900
Subject: [PATCH] =?utf8?q?=E3=83=80=E3=82=A4=E3=83=A4=E3=83=A2=E3=83=B3?=
 =?utf8?q?=E3=83=89=E6=BC=94=E7=AE=97=E5=AD=90=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/java/jp/sfjp/jindolf/config/EnvInfo.java       |  4 ++--
 src/main/java/jp/sfjp/jindolf/config/OptionInfo.java    |  8 ++++----
 src/main/java/jp/sfjp/jindolf/data/Anchor.java          |  2 +-
 src/main/java/jp/sfjp/jindolf/data/Avatar.java          |  4 ++--
 src/main/java/jp/sfjp/jindolf/data/Land.java            |  6 +++---
 src/main/java/jp/sfjp/jindolf/data/LandsModel.java      |  8 ++++----
 src/main/java/jp/sfjp/jindolf/data/Period.java          | 14 +++++++-------
 src/main/java/jp/sfjp/jindolf/data/SysEvent.java        | 10 +++++-----
 src/main/java/jp/sfjp/jindolf/data/Village.java         | 14 +++++++-------
 src/main/java/jp/sfjp/jindolf/dxchg/UriExporter.java    |  2 +-
 src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java        |  4 ++--
 src/main/java/jp/sfjp/jindolf/editor/EditArray.java     |  2 +-
 src/main/java/jp/sfjp/jindolf/glyph/Discussion.java     |  4 ++--
 src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java        |  4 ++--
 src/main/java/jp/sfjp/jindolf/glyph/GlyphDraw.java      |  4 ++--
 src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java       |  2 +-
 src/main/java/jp/sfjp/jindolf/log/MomentaryHandler.java |  2 +-
 src/main/java/jp/sfjp/jindolf/net/ServerAccess.java     |  4 ++--
 src/main/java/jp/sfjp/jindolf/summary/GameSummary.java  | 16 ++++++++--------
 src/main/java/jp/sfjp/jindolf/view/ActionManager.java   |  8 ++++----
 src/main/java/jp/sfjp/jindolf/view/FilterPanel.java     |  4 ++--
 src/main/java/jp/sfjp/jindolf/view/TabBrowser.java      |  2 +-
 src/main/java/jp/sfjp/jindolf/view/WindowManager.java   |  2 +-
 23 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java b/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java
index d728546..baf44d2 100644
--- a/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java
+++ b/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java
@@ -33,10 +33,10 @@ public final class EnvInfo{
     public static final long MAX_MEMORY;
 
     private static final SortedMap<String, String> propertyMap =
-            new TreeMap<String, String>();
+            new TreeMap<>();
 
     private static final SortedMap<String, String> environmentMap =
-            new TreeMap<String, String>();
+            new TreeMap<>();
 
     private static final String[] classpaths;
 
diff --git a/src/main/java/jp/sfjp/jindolf/config/OptionInfo.java b/src/main/java/jp/sfjp/jindolf/config/OptionInfo.java
index 715d9d7..61d42d5 100644
--- a/src/main/java/jp/sfjp/jindolf/config/OptionInfo.java
+++ b/src/main/java/jp/sfjp/jindolf/config/OptionInfo.java
@@ -54,12 +54,12 @@ public class OptionInfo{
     private Integer frameXpos   = null;
     private Integer frameYpos   = null;
 
-    private final List<String> invokeArgs = new LinkedList<String>();
-    private final List<CmdOption> optionList = new LinkedList<CmdOption>();
+    private final List<String> invokeArgs = new LinkedList<>();
+    private final List<CmdOption> optionList = new LinkedList<>();
     private final Map<CmdOption, Boolean> boolOptionMap =
-            new EnumMap<CmdOption, Boolean>(CmdOption.class);
+            new EnumMap<>(CmdOption.class);
     private final Map<CmdOption, String> stringOptionMap =
-            new EnumMap<CmdOption, String>(CmdOption.class);
+            new EnumMap<>(CmdOption.class);
 
 
     /**
diff --git a/src/main/java/jp/sfjp/jindolf/data/Anchor.java b/src/main/java/jp/sfjp/jindolf/data/Anchor.java
index ad07a22..4ac2531 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Anchor.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Anchor.java
@@ -156,7 +156,7 @@ public final class Anchor{
      */
     public static List<Anchor> getAnchorList(CharSequence source,
                                                int currentDay      ){
-        List<Anchor> result = new LinkedList<Anchor>();
+        List<Anchor> result = new LinkedList<>();
 
         Matcher matcher = ANCHOR_PATTERN.matcher(source);
         int regionEnd = source.length();
diff --git a/src/main/java/jp/sfjp/jindolf/data/Avatar.java b/src/main/java/jp/sfjp/jindolf/data/Avatar.java
index eee0726..ffe904a 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Avatar.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Avatar.java
@@ -53,7 +53,7 @@ public class Avatar implements Comparable<Avatar> {
 
         AVATAR_LIST = buildAvatarList(predefs);
 
-        AVATAR_MAP = new HashMap<String, Avatar>();
+        AVATAR_MAP = new HashMap<>();
         for(Avatar avatar : AVATAR_LIST){
             String fullName = avatar.getFullName();
             AVATAR_MAP.put(fullName, avatar);
@@ -145,7 +145,7 @@ public class Avatar implements Comparable<Avatar> {
      * @return ソートされた定義済みAvatarのリスト
      */
     private static List<Avatar> buildAvatarList(List<PreDefAvatar> predefs){
-        List<Avatar> result = new ArrayList<Avatar>(predefs.size());
+        List<Avatar> result = new ArrayList<>(predefs.size());
 
         for(PreDefAvatar preDefAvatar : predefs){
             String shortName = preDefAvatar.getShortName();
diff --git a/src/main/java/jp/sfjp/jindolf/data/Land.java b/src/main/java/jp/sfjp/jindolf/data/Land.java
index f48e3ca..ae085ab 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Land.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Land.java
@@ -48,7 +48,7 @@ public class Land {
     private final HtmlParser parser = new HtmlParser();
     private final VillageListHandler handler = new VillageListHandler();
 
-    private final List<Village> villageList = new LinkedList<Village>();
+    private final List<Village> villageList = new LinkedList<>();
 
 
     /**
@@ -256,7 +256,7 @@ public class Land {
         ServerAccess server = getServerAccess();
 
         // たまに同じ村が複数回出現するので注意！
-        SortedSet<Village> result = new TreeSet<Village>();
+        SortedSet<Village> result = new TreeSet<>();
 
         // トップページ
         if(state.equals(LandState.ACTIVE) || isVanillaWolf){
@@ -365,7 +365,7 @@ public class Land {
         public void startParse(DecodedContent content)
                 throws HtmlParseException{
             reset();
-            this.villageList = new LinkedList<Village>();
+            this.villageList = new LinkedList<>();
             return;
         }
 
diff --git a/src/main/java/jp/sfjp/jindolf/data/LandsModel.java b/src/main/java/jp/sfjp/jindolf/data/LandsModel.java
index d8263f6..0bb8c3d 100644
--- a/src/main/java/jp/sfjp/jindolf/data/LandsModel.java
+++ b/src/main/java/jp/sfjp/jindolf/data/LandsModel.java
@@ -40,11 +40,11 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
     private static final Logger LOGGER = Logger.getAnonymousLogger();
 
 
-    private final List<Land> landList = new LinkedList<Land>();
+    private final List<Land> landList = new LinkedList<>();
     private final List<Land> unmodList =
             Collections.unmodifiableList(this.landList);
     private final Map<Land, List<VillageSection>> sectionMap =
-            new HashMap<Land, List<VillageSection>>();
+            new HashMap<>();
     private boolean isLandListLoaded = false;
 
     private final EventListenerList listeners = new EventListenerList();
@@ -347,7 +347,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
         private final int endID;
         private final String prefix;
 
-        private final List<Village> villageList = new LinkedList<Village>();
+        private final List<Village> villageList = new LinkedList<>();
 
 
         /**
@@ -401,7 +401,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
             int startID = village1st.getVillageIDNum();
             int endID = villageLast.getVillageIDNum();
 
-            List<VillageSection> result = new LinkedList<VillageSection>();
+            List<VillageSection> result = new LinkedList<>();
 
             int fixedStart = startID / interval * interval;
             for(int ct = fixedStart; ct <= endID; ct += interval){
diff --git a/src/main/java/jp/sfjp/jindolf/data/Period.java b/src/main/java/jp/sfjp/jindolf/data/Period.java
index 9886682..c3ca180 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Period.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Period.java
@@ -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);
 
@@ -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<>();
 
         /**
          * コンストラクタ。
diff --git a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
index 4450c95..082b5ef 100644
--- a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
+++ b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
@@ -28,11 +28,11 @@ public class SysEvent implements Topic{
     private SysEventType sysEventType;
     private DecodedContent content;
 
-    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<>();
 
     /**
      * コンストラクタ。
@@ -223,7 +223,7 @@ public class SysEvent implements Topic{
      */
     public Set<Avatar> getVoterSet(Set<Avatar> set){
         Set<Avatar> result;
-        if(set == null) result = new HashSet<Avatar>();
+        if(set == null) result = new HashSet<>();
         else            result = set;
 
         if(   this.sysEventType != SysEventType.COUNTING
diff --git a/src/main/java/jp/sfjp/jindolf/data/Village.java b/src/main/java/jp/sfjp/jindolf/data/Village.java
index 473e5e1..9c5be0f 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Village.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Village.java
@@ -103,21 +103,21 @@ public class Village implements Comparable<Village> {
 
     private VillageState state = VillageState.UNKNOWN;
 
-    private final LinkedList<Period> periodList = new LinkedList<Period>();
+    private final LinkedList<Period> periodList = new LinkedList<>();
     private final List<Period> unmodList =
             Collections.unmodifiableList(this.periodList);
 
     private final Map<String, Avatar> avatarMap =
-            new HashMap<String, Avatar>();
+            new HashMap<>();
 
     private final Map<Avatar, BufferedImage> faceImageMap =
-            new HashMap<Avatar, BufferedImage>();
+            new HashMap<>();
     private final Map<Avatar, BufferedImage> bodyImageMap =
-            new HashMap<Avatar, BufferedImage>();
+            new HashMap<>();
     private final Map<Avatar, BufferedImage> faceMonoImageMap =
-            new HashMap<Avatar, BufferedImage>();
+            new HashMap<>();
     private final Map<Avatar, BufferedImage> bodyMonoImageMap =
-            new HashMap<Avatar, BufferedImage>();
+            new HashMap<>();
 
 
     /**
@@ -567,7 +567,7 @@ public class Village implements Comparable<Village> {
      */
     public List<Talk> getTalkListFromAnchor(Anchor anchor)
             throws IOException{
-        List<Talk> result = new LinkedList<Talk>();
+        List<Talk> result = new LinkedList<>();
 
         /* G国アンカー対応 */
         if(anchor.hasTalkNo()){
diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/UriExporter.java b/src/main/java/jp/sfjp/jindolf/dxchg/UriExporter.java
index 6e6bb3f..a992f31 100644
--- a/src/main/java/jp/sfjp/jindolf/dxchg/UriExporter.java
+++ b/src/main/java/jp/sfjp/jindolf/dxchg/UriExporter.java
@@ -26,7 +26,7 @@ public class UriExporter implements Transferable{
         "text/plain",
     };
     private static final List<DataFlavor> URI_FLAVORS =
-            new ArrayList<DataFlavor>(MIMES.length);
+            new ArrayList<>(MIMES.length);
 
     static{
         String stringClassName = "class=" + String.class.getName();
diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java b/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java
index b4404b1..0c9d947 100644
--- a/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java
+++ b/src/main/java/jp/sfjp/jindolf/dxchg/WolfBBS.java
@@ -49,7 +49,7 @@ public final class WolfBBS{
             "resources/wolfbbs/faceIconSet.properties";
     private static final String ORDER_PREFIX = "iconset.order.";
     private static final List<FaceIconSet> FACEICONSET_LIST =
-            new LinkedList<FaceIconSet>();
+            new LinkedList<>();
 
     private static final Charset CHARSET_EUC = Charset.forName("EUC-JP");
 
@@ -119,7 +119,7 @@ public final class WolfBBS{
 
         Set<Object> keySet = properties.keySet();
 
-        SortedSet<Integer> orderSet = new TreeSet<Integer>();
+        SortedSet<Integer> orderSet = new TreeSet<>();
         for(Object keyObj : keySet){
             if(keyObj == null) continue;
             String key = keyObj.toString();
diff --git a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java b/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
index f04acb7..1922600 100644
--- a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
+++ b/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
@@ -42,7 +42,7 @@ public class EditArray extends JPanel
 
     private static final int MAX_EDITORS = 50;
 
-    private final List<TalkEditor> editorList = new ArrayList<TalkEditor>();
+    private final List<TalkEditor> editorList = new ArrayList<>();
     private boolean onAdjusting = false;
 
     private final NavigationFilter keyNavigator = new CustomNavigation();
diff --git a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java
index 54538ae..95ae6f0 100644
--- a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java
@@ -73,8 +73,8 @@ public class Discussion extends JComponent
     private static final int MARGINBOTTOM = 100;
 
     private Period period;
-    private final List<TextRow> rowList       = new LinkedList<TextRow>();
-    private final List<TalkDraw> talkDrawList = new LinkedList<TalkDraw>();
+    private final List<TextRow> rowList       = new LinkedList<>();
+    private final List<TalkDraw> talkDrawList = new LinkedList<>();
 
     private TopicFilter topicFilter;
     private TopicFilter.FilterContext filterContext;
diff --git a/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java b/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java
index de8f75b..770d71e 100644
--- a/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java
@@ -147,7 +147,7 @@ public class FontEnv {
 
         yield();
 
-        Collection<String> result = new HashSet<String>();
+        Collection<String> result = new HashSet<>();
         int ct = 0;
         for(Font font : allFonts){
             if(++ct % STRIDE == 0) yield();
@@ -253,7 +253,7 @@ public class FontEnv {
                     createFontSet(FontEnv.this.proveChars);
             yield();
 
-            List<String> result = new ArrayList<String>(fontSet);
+            List<String> result = new ArrayList<>(fontSet);
             Collections.sort(result);
             yield();
 
diff --git a/src/main/java/jp/sfjp/jindolf/glyph/GlyphDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/GlyphDraw.java
index b2d98be..3dcb21f 100644
--- a/src/main/java/jp/sfjp/jindolf/glyph/GlyphDraw.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/GlyphDraw.java
@@ -40,9 +40,9 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
     private final CharSequence source;
 
     private float[] dimArray;
-    private final List<GlyphVector> lines = new LinkedList<GlyphVector>();
+    private final List<GlyphVector> lines = new LinkedList<>();
     private Collection<Anchor> anchorSet;
-    private final List<MatchInfo> matchList = new LinkedList<MatchInfo>();
+    private final List<MatchInfo> matchList = new LinkedList<>();
     private MatchInfo hotTarget = null;
 
     private int selectStart = -1;
diff --git a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
index c48d882..00b0548 100644
--- a/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/TalkDraw.java
@@ -88,7 +88,7 @@ public class TalkDraw extends AbstractTextRow{
     private final GlyphDraw caption;
     private BufferedImage faceImage;
     private final GlyphDraw dialog;
-    private final List<AnchorDraw> anchorTalks = new LinkedList<AnchorDraw>();
+    private final List<AnchorDraw> anchorTalks = new LinkedList<>();
     private Point imageOrigin;
     private Point dialogOrigin;
     private Point tipOrigin;
diff --git a/src/main/java/jp/sfjp/jindolf/log/MomentaryHandler.java b/src/main/java/jp/sfjp/jindolf/log/MomentaryHandler.java
index 70828df..fbafa7a 100644
--- a/src/main/java/jp/sfjp/jindolf/log/MomentaryHandler.java
+++ b/src/main/java/jp/sfjp/jindolf/log/MomentaryHandler.java
@@ -44,7 +44,7 @@ public class MomentaryHandler extends Handler{
      */
     public static List<MomentaryHandler>
             getMomentaryHandlers(Logger logger){
-        List<MomentaryHandler> result = new LinkedList<MomentaryHandler>();
+        List<MomentaryHandler> result = new LinkedList<>();
 
         for(Handler handler : logger.getHandlers()){
             if( ! (handler instanceof MomentaryHandler) ) continue;
diff --git a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
index 227b53e..318c487 100644
--- a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
+++ b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
@@ -47,7 +47,7 @@ public class ServerAccess{
 
     static{
         Map<String, SoftReference<BufferedImage>> cache =
-                new HashMap<String, SoftReference<BufferedImage>>();
+                new HashMap<>();
         IMAGE_CACHE = Collections.synchronizedMap(cache);
     }
 
@@ -118,7 +118,7 @@ public class ServerAccess{
         synchronized(IMAGE_CACHE){
             if(getImageCache(key) != null) return;
             SoftReference<BufferedImage> ref =
-                    new SoftReference<BufferedImage>(image);
+                    new SoftReference<>(image);
             IMAGE_CACHE.put(key, ref);
         }
 
diff --git a/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java b/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java
index 6770915..f472e67 100644
--- a/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java
+++ b/src/main/java/jp/sfjp/jindolf/summary/GameSummary.java
@@ -51,11 +51,11 @@ public class GameSummary{
 
 
     private final Map<Avatar, Player> playerMap =
-            new HashMap<Avatar, Player>();
+            new HashMap<>();
     private final List<Player> playerList =
-            new LinkedList<Player>();
+            new LinkedList<>();
     private final Map<SysEventType, List<SysEvent>> eventMap =
-            new EnumMap<SysEventType, List<SysEvent>>(SysEventType.class);
+            new EnumMap<>(SysEventType.class);
 
     private final Village village;
 
@@ -111,7 +111,7 @@ public class GameSummary{
      * @return 役職バランス文字列
      */
     public static String getRoleBalanceSequence(List<Player> players){
-        List<GameRole> roleList = new LinkedList<GameRole>();
+        List<GameRole> roleList = new LinkedList<>();
         for(Player player : players){
             GameRole role = player.getRole();
             roleList.add(role);
@@ -152,7 +152,7 @@ public class GameSummary{
      */
     private void buildEventMap(){
         for(SysEventType type : SysEventType.values()){
-            List<SysEvent> eventList = new LinkedList<SysEvent>();
+            List<SysEvent> eventList = new LinkedList<>();
             this.eventMap.put(type, eventList);
         }
 
@@ -918,7 +918,7 @@ public class GameSummary{
             throw new IndexOutOfBoundsException();
         }
 
-        List<Player> result = new LinkedList<Player>();
+        List<Player> result = new LinkedList<>();
 
         Period period = this.village.getPeriod(day);
 
@@ -968,7 +968,7 @@ public class GameSummary{
      */
     public List<Player> getCastingPlayerList(){
         List<Player> sortedPlayers =
-                new LinkedList<Player>();
+                new LinkedList<>();
         sortedPlayers.addAll(this.playerList);
         Collections.sort(sortedPlayers, COMPARATOR_CASTING);
         return sortedPlayers;
@@ -980,7 +980,7 @@ public class GameSummary{
      * @return 役職に合致するプレイヤーのリスト
      */
     public List<Player> getRoledPlayerList(GameRole role){
-        List<Player> result = new LinkedList<Player>();
+        List<Player> result = new LinkedList<>();
 
         for(Player player : this.playerList){
             if(player.getRole() == role){
diff --git a/src/main/java/jp/sfjp/jindolf/view/ActionManager.java b/src/main/java/jp/sfjp/jindolf/view/ActionManager.java
index 2f98aaa..2865083 100644
--- a/src/main/java/jp/sfjp/jindolf/view/ActionManager.java
+++ b/src/main/java/jp/sfjp/jindolf/view/ActionManager.java
@@ -141,11 +141,11 @@ public class ActionManager{
     }
 
     private final Set<AbstractButton> actionItems =
-            new HashSet<AbstractButton>();
+            new HashSet<>();
     private final Map<String, JMenuItem> namedMenuItems =
-            new HashMap<String, JMenuItem>();
+            new HashMap<>();
     private final Map<String, JButton> namedToolButtons =
-            new HashMap<String, JButton>();
+            new HashMap<>();
 
     private final JMenuBar menuBar;
 
@@ -160,7 +160,7 @@ public class ActionManager{
     private final JMenu menuLook;
     private final ButtonGroup landfGroup = new ButtonGroup();
     private final Map<ButtonModel, String> landfMap =
-        new HashMap<ButtonModel, String>();
+        new HashMap<>();
 
     private final JToolBar browseToolBar;
 
diff --git a/src/main/java/jp/sfjp/jindolf/view/FilterPanel.java b/src/main/java/jp/sfjp/jindolf/view/FilterPanel.java
index e9ed3e7..ee09578 100644
--- a/src/main/java/jp/sfjp/jindolf/view/FilterPanel.java
+++ b/src/main/java/jp/sfjp/jindolf/view/FilterPanel.java
@@ -64,8 +64,8 @@ public class FilterPanel extends JDialog
     private final JButton applyButton = new JButton("フィルタ適用");
 
     private final Map<Avatar, JCheckBox> cbMap =
-            new HashMap<Avatar, JCheckBox>();
-    private final List<JCheckBox> cbList = new LinkedList<JCheckBox>();
+            new HashMap<>();
+    private final List<JCheckBox> cbList = new LinkedList<>();
 
     private final EventListenerList listeners = new EventListenerList();
 
diff --git a/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java b/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java
index eefd000..cb7eafd 100644
--- a/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java
+++ b/src/main/java/jp/sfjp/jindolf/view/TabBrowser.java
@@ -192,7 +192,7 @@ public class TabBrowser extends JTabbedPane{
      * @return PeriodView の List
      */
     public List<PeriodView> getPeriodViewList(){
-        List<PeriodView> result = new LinkedList<PeriodView>();
+        List<PeriodView> result = new LinkedList<>();
 
         int tabCount = getTabCount();
         for(int tabIndex = 0; tabIndex <= tabCount - 1; tabIndex++){
diff --git a/src/main/java/jp/sfjp/jindolf/view/WindowManager.java b/src/main/java/jp/sfjp/jindolf/view/WindowManager.java
index 1bbf8c3..755b349 100644
--- a/src/main/java/jp/sfjp/jindolf/view/WindowManager.java
+++ b/src/main/java/jp/sfjp/jindolf/view/WindowManager.java
@@ -60,7 +60,7 @@ public class WindowManager {
     private HelpFrame helpFrame;
     private TopFrame topFrame;
 
-    private final List<Window> windowSet = new LinkedList<Window>();
+    private final List<Window> windowSet = new LinkedList<>();
 
 
     /**
-- 
2.11.0