use diamond operator.

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/BoneGroup.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/BoneGroup.java
index 564eff7..d605875 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/BoneGroup.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/BoneGroup.java
@@ -18,11 +18,11 @@ import jp.sfjp.mikutoga.corelib.I18nText;
  * 通し番号0のボーングループは、
  * 暗黙に用意される「デフォルトボーングループ」とする。
  */
  * 通し番号0のボーングループは、
  * 暗黙に用意される「デフォルトボーングループ」とする。
  */

-public class BoneGroup implements SerialNumbered , Iterable<BoneInfo> {
+public class BoneGroup implements SerialNumbered, Iterable<BoneInfo> {

 
     private final I18nText groupName = new I18nText();
 
 
     private final I18nText groupName = new I18nText();
 

-    private final List<BoneInfo> boneList = new ArrayList<BoneInfo>();
+    private final List<BoneInfo> boneList = new ArrayList<>();

 
     private int serialNo = -1;
 
 
     private int serialNo = -1;
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/IKChain.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/IKChain.java
index 58134d1..929d589 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/IKChain.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/IKChain.java
@@ -21,7 +21,7 @@ public class IKChain implements Iterable<BoneInfo> {
     private int ikDepth;
     private float ikWeight;
 
     private int ikDepth;
     private float ikWeight;
 

-    private final List<BoneInfo> chainList = new ArrayList<BoneInfo>();
+    private final List<BoneInfo> chainList = new ArrayList<>();

 
 
     /**
 
 
     /**

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/Material.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/Material.java
index e17a6bc..1a1d1c3 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/Material.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/Material.java
@@ -39,7 +39,7 @@ public class Material implements Iterable<Surface> {
 
     private boolean edgeAppearance = true;
 
 
     private boolean edgeAppearance = true;
 

-    private final List<Surface> surfaceList = new ArrayList<Surface>();
+    private final List<Surface> surfaceList = new ArrayList<>();

 
 
     /**
 
 
     /**

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/MorphPart.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/MorphPart.java
index e9a7463..fc5615d 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/MorphPart.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/MorphPart.java
@@ -23,7 +23,7 @@ public class MorphPart implements SerialNumbered, Iterable<MorphVertex> {
     private MorphType type;
 
     private final List<MorphVertex> morphVertexList =
     private MorphType type;
 
     private final List<MorphVertex> morphVertexList =

-            new ArrayList<MorphVertex>();
+            new ArrayList<>();

 
     private int morphSerialNo = -1;
 
 
     private int morphSerialNo = -1;
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/PmdModel.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/PmdModel.java
index cc34259..82dda6d 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/PmdModel.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/PmdModel.java
@@ -29,23 +29,23 @@ public class PmdModel {
     private final I18nText modelName = new I18nText();
     private final I18nText description = new I18nText();
 
     private final I18nText modelName = new I18nText();
     private final I18nText description = new I18nText();
 

-    private final List<Vertex> vertexList = new ArrayList<Vertex>();
-    private final List<Surface> surfaceList = new ArrayList<Surface>();
-    private final List<Material> materialList = new LinkedList<Material>();
+    private final List<Vertex> vertexList = new ArrayList<>();
+    private final List<Surface> surfaceList = new ArrayList<>();
+    private final List<Material> materialList = new LinkedList<>();

 
 

-    private final List<BoneInfo> boneList = new ArrayList<BoneInfo>();
-    private final List<BoneGroup> boneGroupList = new ArrayList<BoneGroup>();
+    private final List<BoneInfo> boneList = new ArrayList<>();
+    private final List<BoneGroup> boneGroupList = new ArrayList<>();

 
 

-    private final List<IKChain> ikChainList = new ArrayList<IKChain>();
+    private final List<IKChain> ikChainList = new ArrayList<>();

 
     private final Map<MorphType, List<MorphPart>> morphMap =
 
     private final Map<MorphType, List<MorphPart>> morphMap =

-            new EnumMap<MorphType, List<MorphPart>>(MorphType.class);
+            new EnumMap<>(MorphType.class);

 
 

-    private final List<RigidInfo> rigidList = new ArrayList<RigidInfo>();
+    private final List<RigidInfo> rigidList = new ArrayList<>();

     private final List<RigidGroup> rigidGroupList =
     private final List<RigidGroup> rigidGroupList =

-            new ArrayList<RigidGroup>();
+            new ArrayList<>();

 
 

-    private final List<JointInfo> jointList = new ArrayList<JointInfo>();
+    private final List<JointInfo> jointList = new ArrayList<>();

 
     private ToonMap toonMap = new ToonMap();
 
 
     private ToonMap toonMap = new ToonMap();
 


@@ -59,10 +59,10 @@ public class PmdModel {
         assert this.vertexList instanceof RandomAccess;
         assert this.surfaceList instanceof RandomAccess;
 
         assert this.vertexList instanceof RandomAccess;
         assert this.surfaceList instanceof RandomAccess;
 

-        this.morphMap.put(MorphType.EYEBROW, new ArrayList<MorphPart>());
-        this.morphMap.put(MorphType.EYE,     new ArrayList<MorphPart>());
-        this.morphMap.put(MorphType.LIP,     new ArrayList<MorphPart>());
-        this.morphMap.put(MorphType.EXTRA,   new ArrayList<MorphPart>());
+        this.morphMap.put(MorphType.EYEBROW, new ArrayList<>());
+        this.morphMap.put(MorphType.EYE,     new ArrayList<>());
+        this.morphMap.put(MorphType.LIP,     new ArrayList<>());
+        this.morphMap.put(MorphType.EXTRA,   new ArrayList<>());

 
         return;
     }
 
         return;
     }


@@ -235,7 +235,7 @@ public class PmdModel {
      * @return モーフ頂点リスト
      */
     private List<MorphVertex> getAllMorphVertexList(){
      * @return モーフ頂点リスト
      */
     private List<MorphVertex> getAllMorphVertexList(){

-        List<MorphVertex> allList = new ArrayList<MorphVertex>();
+        List<MorphVertex> allList = new ArrayList<>();

 
         for(MorphType type : this.morphMap.keySet()){
             if(type.isBase()) continue;
 
         for(MorphType type : this.morphMap.keySet()){
             if(type.isBase()) continue;


@@ -261,9 +261,9 @@ public class PmdModel {
      */
     private List<MorphVertex> getUniqueMorphVertexList(
             List<MorphVertex> allList ){
      */
     private List<MorphVertex> getUniqueMorphVertexList(
             List<MorphVertex> allList ){

-        List<MorphVertex> result = new ArrayList<MorphVertex>();
+        List<MorphVertex> result = new ArrayList<>();

 
 

-        Set<Vertex> mergedVertexSet = new HashSet<Vertex>();
+        Set<Vertex> mergedVertexSet = new HashSet<>();

 
         for(MorphVertex morphVertex : allList){
             Vertex vertex = morphVertex.getBaseVertex();
 
         for(MorphVertex morphVertex : allList){
             Vertex vertex = morphVertex.getBaseVertex();


@@ -297,7 +297,7 @@ public class PmdModel {
         ListUtil.assignIndexedSerial(result);
 
         Map<Vertex, MorphVertex> numberedMap =
         ListUtil.assignIndexedSerial(result);
 
         Map<Vertex, MorphVertex> numberedMap =

-                new HashMap<Vertex, MorphVertex>();
+                new HashMap<>();

         for(MorphVertex morphVertex : result){
             Vertex vertex = morphVertex.getBaseVertex();
             numberedMap.put(vertex, morphVertex);
         for(MorphVertex morphVertex : result){
             Vertex vertex = morphVertex.getBaseVertex();
             numberedMap.put(vertex, morphVertex);


@@ -341,7 +341,7 @@ public class PmdModel {
      * @return トリミングされた面リスト
      */
     private List<Surface> trimmingSurfaceList(){
      * @return トリミングされた面リスト
      */
     private List<Surface> trimmingSurfaceList(){

-        Set<Surface> materialedSurfaceSet = new HashSet<Surface>();
+        Set<Surface> materialedSurfaceSet = new HashSet<>();

         for(Material material : this.materialList){
             if(material == null) continue;
             for(Surface surface : material){
         for(Material material : this.materialList){
             if(material == null) continue;
             for(Surface surface : material){


@@ -352,7 +352,7 @@ public class PmdModel {
 
         materialedSurfaceSet.removeAll(this.surfaceList);
 
 
         materialedSurfaceSet.removeAll(this.surfaceList);
 

-        List<Surface> result = new ArrayList<Surface>();
+        List<Surface> result = new ArrayList<>();

         for(Surface surface : this.surfaceList){
             if(surface == null) continue;
             result.add(surface);
         for(Surface surface : this.surfaceList){
             if(surface == null) continue;
             result.add(surface);


@@ -378,7 +378,7 @@ public class PmdModel {
      * @return トリミングされた頂点リスト
      */
     private List<Vertex> trimmingVertexList(){
      * @return トリミングされた頂点リスト
      */
     private List<Vertex> trimmingVertexList(){

-        Set<Vertex> surfacedVertexSet = new HashSet<Vertex>();
+        Set<Vertex> surfacedVertexSet = new HashSet<>();

         for(Surface surface : this.surfaceList){
             if(surface == null) continue;
             for(Vertex vertex : surface){
         for(Surface surface : this.surfaceList){
             if(surface == null) continue;
             for(Vertex vertex : surface){


@@ -388,7 +388,7 @@ public class PmdModel {
 
         surfacedVertexSet.removeAll(this.vertexList);
 
 
         surfacedVertexSet.removeAll(this.vertexList);
 

-        List<Vertex> result = new ArrayList<Vertex>();
+        List<Vertex> result = new ArrayList<>();

         for(Vertex vertex : this.vertexList){
             if(vertex == null) continue;
             result.add(vertex);
         for(Vertex vertex : this.vertexList){
             if(vertex == null) continue;
             result.add(vertex);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidGroup.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidGroup.java
index a28eea7..710dfdd 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidGroup.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidGroup.java
@@ -21,7 +21,7 @@ public class RigidGroup implements SerialNumbered, Iterable<RigidInfo> {
     public static final int MAX_RIGID_GROUP = 16;
 
 
     public static final int MAX_RIGID_GROUP = 16;
 
 

-    private final List<RigidInfo> rigidList = new ArrayList<RigidInfo>();
+    private final List<RigidInfo> rigidList = new ArrayList<>();

 
     private int rigidGroupSerialNo = -1;
 
 
     private int rigidGroupSerialNo = -1;
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidInfo.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidInfo.java
index 95adef8..13b7af9 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidInfo.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/RigidInfo.java
@@ -32,7 +32,7 @@ public class RigidInfo implements SerialNumbered {
     private final DynamicsInfo dynamicsInfo = new DynamicsInfo();
 
     private final Collection<RigidGroup> throughGroupColl =
     private final DynamicsInfo dynamicsInfo = new DynamicsInfo();
 
     private final Collection<RigidGroup> throughGroupColl =

-            new ArrayList<RigidGroup>();
+            new ArrayList<>();

 
     private RigidGroup rigidGroup;
 
 
     private RigidGroup rigidGroup;
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/SerialNumbered.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/SerialNumbered.java
index b8df4be..2e1636e 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/SerialNumbered.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/SerialNumbered.java
@@ -15,20 +15,23 @@ import java.util.Comparator;
 public interface SerialNumbered {
 
     /** 昇順での比較子。 */
 public interface SerialNumbered {
 
     /** 昇順での比較子。 */

-    Comparator<SerialNumbered> COMPARATOR = new SerialComparator();
+    public static final Comparator<SerialNumbered> COMPARATOR =
+            new SerialComparator();

 
 
     /**
      * 通し番号を設定する。
 
 
     /**
      * 通し番号を設定する。

+     *

      * @param num 通し番号
      */
      * @param num 通し番号
      */

-    void setSerialNumber(int num);
+    public abstract void setSerialNumber(int num);

 
     /**
      * 通し番号を返す。
 
     /**
      * 通し番号を返す。

+     *

      * @return 通し番号
      */
      * @return 通し番号
      */

-    int getSerialNumber();
+    public abstract int getSerialNumber();

 
 
     /**
 
 
     /**


@@ -36,7 +39,7 @@ public interface SerialNumbered {
      * 通し番号の昇順を定義づける。
      */
     @SuppressWarnings("serial")
      * 通し番号の昇順を定義づける。
      */
     @SuppressWarnings("serial")

-    class SerialComparator
+    public static class SerialComparator

             implements Comparator<SerialNumbered> {
 
         /**
             implements Comparator<SerialNumbered> {
 
         /**


@@ -50,6 +53,7 @@ public interface SerialNumbered {
 
         /**
          * {@inheritDoc}
 
         /**
          * {@inheritDoc}

+         *

          * @param o1 {@inheritDoc}
          * @param o2 {@inheritDoc}
          * @return {@inheritDoc}
          * @param o1 {@inheritDoc}
          * @param o2 {@inheritDoc}
          * @return {@inheritDoc}

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/Surface.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/Surface.java
index 892fbc2..6e4b33d 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/Surface.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/Surface.java
@@ -119,7 +119,7 @@ public class Surface implements SerialNumbered, Iterable<Vertex> {
      */
     @Override
     public Iterator<Vertex> iterator(){
      */
     @Override
     public Iterator<Vertex> iterator(){

-        List<Vertex> list = new ArrayList<Vertex>(TRIANGLE);
+        List<Vertex> list = new ArrayList<>(TRIANGLE);

 
         list.add(this.vertex1);
         list.add(this.vertex2);
 
         list.add(this.vertex1);
         list.add(this.vertex2);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/ToonMap.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/ToonMap.java
index a7a29e0..f57f5da 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/ToonMap.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/ToonMap.java
@@ -33,7 +33,7 @@ public class ToonMap {
     private static final int IDX_SP = 0xff;  // 特殊トゥーンのインデックス
 
     static{
     private static final int IDX_SP = 0xff;  // 特殊トゥーンのインデックス
 
     static{

-        Map<Integer, String> map = new TreeMap<Integer, String>();
+        Map<Integer, String> map = new TreeMap<>();

 
         int idx = 0x00;
         map.put(idx++, "toon01.bmp");
 
         int idx = 0x00;
         map.put(idx++, "toon01.bmp");


@@ -57,7 +57,7 @@ public class ToonMap {
 
 
     private final Map<Integer, String> toonDefMap =
 
 
     private final Map<Integer, String> toonDefMap =

-            new TreeMap<Integer, String>(DEF_TOONMAP);
+            new TreeMap<>(DEF_TOONMAP);

 
 
     /**
 
 
     /**

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/BoneBuilder.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/BoneBuilder.java
index 391d4f0..3ae3255 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/BoneBuilder.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/BoneBuilder.java
@@ -158,7 +158,7 @@ class BoneBuilder implements PmdBoneHandler {
      * 所属グループの無いボーンをデフォルトボーングループへ登録する。
      */
     private void pickOrphanBone(){
      * 所属グループの無いボーンをデフォルトボーングループへ登録する。
      */
     private void pickOrphanBone(){

-        List<BoneInfo> orpahnList = new LinkedList<BoneInfo>();
+        List<BoneInfo> orpahnList = new LinkedList<>();

         orpahnList.addAll(this.boneList);
         for(BoneGroup group : this.boneGroupList){
             orpahnList.removeAll(group.getBoneList());
         orpahnList.addAll(this.boneList);
         for(BoneGroup group : this.boneGroupList){
             orpahnList.removeAll(group.getBoneList());

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/MorphBuilder.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/MorphBuilder.java
index ec93d41..869d931 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/MorphBuilder.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/MorphBuilder.java
@@ -34,7 +34,7 @@ class MorphBuilder implements PmdMorphHandler {
     private MorphPart currentMorphPart;
     private final List<Vertex> vertexList;
 
     private MorphPart currentMorphPart;
     private final List<Vertex> vertexList;
 

-    private final List<Vertex> morphVertexList = new ArrayList<Vertex>();
+    private final List<Vertex> morphVertexList = new ArrayList<>();

 
     /**
      * コンストラクタ。
 
     /**
      * コンストラクタ。


@@ -183,7 +183,7 @@ class MorphBuilder implements PmdMorphHandler {
 
         List<MorphPart> partList = this.morphMap.get(type);
         if(partList == null){
 
         List<MorphPart> partList = this.morphMap.get(type);
         if(partList == null){

-            partList = new LinkedList<MorphPart>();
+            partList = new LinkedList<>();

             this.morphMap.put(type, partList);
         }
         partList.add(part);
             this.morphMap.put(type, partList);
         }
         partList.add(part);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdExporterBase.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdExporterBase.java
index 5c60e0f..3a8596f 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdExporterBase.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdExporterBase.java
@@ -510,7 +510,7 @@ public class PmdExporterBase extends BinaryExporter{
             throws IOException, IllegalTextExportException{
         Map<MorphType, List<MorphPart>> morphMap = model.getMorphMap();
         Set<MorphType> typeSet = morphMap.keySet();
             throws IOException, IllegalTextExportException{
         Map<MorphType, List<MorphPart>> morphMap = model.getMorphMap();
         Set<MorphType> typeSet = morphMap.keySet();

-        List<MorphPart> morphPartList = new LinkedList<MorphPart>();
+        List<MorphPart> morphPartList = new LinkedList<>();

 
         for(MorphType type : typeSet){
             List<MorphPart> partList = morphMap.get(type);
 
         for(MorphType type : typeSet){
             List<MorphPart> partList = morphMap.get(type);


@@ -592,7 +592,7 @@ public class PmdExporterBase extends BinaryExporter{
         }
         dumpByte(totalMorph);
 
         }
         dumpByte(totalMorph);
 

-        List<MorphType> typeList = new LinkedList<MorphType>();
+        List<MorphType> typeList = new LinkedList<>();

         for(MorphType type : typeSet){
             assert ! type.isBase();
             typeList.add(type);
         for(MorphType type : typeSet){
             assert ! type.isBase();
             typeList.add(type);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdLoader.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdLoader.java
index 82645d0..e237b91 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdLoader.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/binio/PmdLoader.java
@@ -81,7 +81,7 @@ public class PmdLoader {
         RigidBuilder    rigidBuilder    = new RigidBuilder(model);
         JointBuilder    jointBuilder    = new JointBuilder(model);
 
         RigidBuilder    rigidBuilder    = new RigidBuilder(model);
         JointBuilder    jointBuilder    = new JointBuilder(model);
 

-        List<MorphPart> morphPartList = new ArrayList<MorphPart>();
+        List<MorphPart> morphPartList = new ArrayList<>();

         morphBuilder.setMorphPartList(morphPartList);
         textBuilder.setMorphPartList(morphPartList);
 
         morphBuilder.setMorphPartList(morphPartList);
         textBuilder.setMorphPartList(morphPartList);
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/PmdTag.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/PmdTag.java
index d7a977f..a5e831c 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/PmdTag.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/PmdTag.java
@@ -93,7 +93,7 @@ enum PmdTag {
     ;
 
     private static final Map<String, PmdTag> NAME_MAP =
     ;
 
     private static final Map<String, PmdTag> NAME_MAP =

-            new HashMap<String, PmdTag>();
+            new HashMap<>();

 
     static{
         for(PmdTag tag : values()){
 
     static{
         for(PmdTag tag : values()){

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/RefHelper.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/RefHelper.java
index 86d7e46..c9fa6b9 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/RefHelper.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/RefHelper.java
@@ -28,41 +28,41 @@ class RefHelper {
 
     // マテリアル関連
     private final List<IdRefHolder<Material>> materialSfcGroupIdRefList =
 
     // マテリアル関連
     private final List<IdRefHolder<Material>> materialSfcGroupIdRefList =

-            new LinkedList<IdRefHolder<Material>>();
+            new LinkedList<>();

     private final List<IdRefHolder<Material>> materialToonIdRefList =
     private final List<IdRefHolder<Material>> materialToonIdRefList =

-            new LinkedList<IdRefHolder<Material>>();
+            new LinkedList<>();

     private final Map<String, Integer> toonIdxMap =
     private final Map<String, Integer> toonIdxMap =

-            new HashMap<String, Integer>();
+            new HashMap<>();

 
     // ボーン関連
     private final Map<String, BoneInfo> boneIdMap =
 
     // ボーン関連
     private final Map<String, BoneInfo> boneIdMap =

-            new HashMap<String, BoneInfo>();
+            new HashMap<>();

     private final List<IdRefHolder<BoneInfo>> boneChainIdRefList =
     private final List<IdRefHolder<BoneInfo>> boneChainIdRefList =

-            new LinkedList<IdRefHolder<BoneInfo>>();
+            new LinkedList<>();

     private final List<IdRefHolder<BoneInfo>> boneSourceIdRefList =
     private final List<IdRefHolder<BoneInfo>> boneSourceIdRefList =

-            new LinkedList<IdRefHolder<BoneInfo>>();
+            new LinkedList<>();

 
     // モーフ関連
     private final List<IdRefHolder<MorphVertex>> morphVertexIdRefList =
 
     // モーフ関連
     private final List<IdRefHolder<MorphVertex>> morphVertexIdRefList =

-            new LinkedList<IdRefHolder<MorphVertex>>();
+            new LinkedList<>();

 
     // 剛体関連
     private final Map<String, RigidInfo> rigidIdMap =
 
     // 剛体関連
     private final Map<String, RigidInfo> rigidIdMap =

-            new HashMap<String, RigidInfo>();
+            new HashMap<>();

     private final Map<String, RigidGroup> rigidGroupIdMap =
     private final Map<String, RigidGroup> rigidGroupIdMap =

-            new HashMap<String, RigidGroup>();
+            new HashMap<>();

     private final List<IdRefHolder<RigidInfo>> thghRigidGroupIdRefList =
     private final List<IdRefHolder<RigidInfo>> thghRigidGroupIdRefList =

-            new LinkedList<IdRefHolder<RigidInfo>>();
+            new LinkedList<>();

 
     // 面関連
     private final Map<String, List<Surface>> surfaceGroupIdMap =
 
     // 面関連
     private final Map<String, List<Surface>> surfaceGroupIdMap =

-            new HashMap<String, List<Surface>>();
+            new HashMap<>();

     private final List<IdRefHolder<Surface>> surfaceVertexIdRef =
     private final List<IdRefHolder<Surface>> surfaceVertexIdRef =

-            new LinkedList<IdRefHolder<Surface>>();
+            new LinkedList<>();

 
     // 頂点関連
     private final Map<String, Vertex> vertexIdMap =
 
     // 頂点関連
     private final Map<String, Vertex> vertexIdMap =

-            new HashMap<String, Vertex>();
+            new HashMap<>();

 
 
     /**
 
 
     /**


@@ -81,7 +81,7 @@ class RefHelper {
      */
     void addSurfaceGroupIdRef(Material material, String idRef){
         IdRefHolder<Material> holder =
      */
     void addSurfaceGroupIdRef(Material material, String idRef){
         IdRefHolder<Material> holder =

-                new IdRefHolder<Material>(material, idRef);
+                new IdRefHolder<>(material, idRef);

         this.materialSfcGroupIdRefList.add(holder);
 
         return;
         this.materialSfcGroupIdRefList.add(holder);
 
         return;


@@ -96,7 +96,7 @@ class RefHelper {
         List<Surface> surfaceGroup =
                 this.surfaceGroupIdMap.get(surfaceGroupId);
         if(surfaceGroup == null){
         List<Surface> surfaceGroup =
                 this.surfaceGroupIdMap.get(surfaceGroupId);
         if(surfaceGroup == null){

-            surfaceGroup = new LinkedList<Surface>();
+            surfaceGroup = new LinkedList<>();

             this.surfaceGroupIdMap.put(surfaceGroupId, surfaceGroup);
         }
 
             this.surfaceGroupIdMap.put(surfaceGroupId, surfaceGroup);
         }
 


@@ -130,7 +130,7 @@ class RefHelper {
      */
     void addToonFileIdRef(Material material, String idRef){
         IdRefHolder<Material> holder =
      */
     void addToonFileIdRef(Material material, String idRef){
         IdRefHolder<Material> holder =

-                new IdRefHolder<Material>(material, idRef);
+                new IdRefHolder<>(material, idRef);

         this.materialToonIdRefList.add(holder);
         return;
     }
         this.materialToonIdRefList.add(holder);
         return;
     }


@@ -190,7 +190,7 @@ class RefHelper {
     void addBoneChain(BoneInfo bone,
                         String prevBoneIdRef, String nextBoneIdRef ){
         IdRefHolder<BoneInfo> holder =
     void addBoneChain(BoneInfo bone,
                         String prevBoneIdRef, String nextBoneIdRef ){
         IdRefHolder<BoneInfo> holder =

-                new IdRefHolder<BoneInfo>(bone, prevBoneIdRef, nextBoneIdRef);
+                new IdRefHolder<>(bone, prevBoneIdRef, nextBoneIdRef);

         this.boneChainIdRefList.add(holder);
         return;
     }
         this.boneChainIdRefList.add(holder);
         return;
     }


@@ -225,7 +225,7 @@ class RefHelper {
      */
     void addSrcBoneIdRef(BoneInfo bone, String srcBoneIdRef){
         IdRefHolder<BoneInfo> holder =
      */
     void addSrcBoneIdRef(BoneInfo bone, String srcBoneIdRef){
         IdRefHolder<BoneInfo> holder =

-                new IdRefHolder<BoneInfo>(bone, srcBoneIdRef);
+                new IdRefHolder<>(bone, srcBoneIdRef);

         this.boneSourceIdRefList.add(holder);
         return;
     }
         this.boneSourceIdRefList.add(holder);
         return;
     }


@@ -253,7 +253,7 @@ class RefHelper {
      */
     void addMorphVertexIdRef(MorphVertex morphVertex, String vertexIdRef){
         IdRefHolder<MorphVertex> holder =
      */
     void addMorphVertexIdRef(MorphVertex morphVertex, String vertexIdRef){
         IdRefHolder<MorphVertex> holder =

-                new IdRefHolder<MorphVertex>(morphVertex, vertexIdRef);
+                new IdRefHolder<>(morphVertex, vertexIdRef);

         this.morphVertexIdRefList.add(holder);
         return;
     }
         this.morphVertexIdRefList.add(holder);
         return;
     }


@@ -285,7 +285,7 @@ class RefHelper {
      */
     void addThroughRigidGroupIdRef(RigidInfo rigid, String rigidGroupIdRef){
         IdRefHolder<RigidInfo> holder =
      */
     void addThroughRigidGroupIdRef(RigidInfo rigid, String rigidGroupIdRef){
         IdRefHolder<RigidInfo> holder =

-                new IdRefHolder<RigidInfo>(rigid, rigidGroupIdRef);
+                new IdRefHolder<>(rigid, rigidGroupIdRef);

         this.thghRigidGroupIdRefList.add(holder);
         return;
     }
         this.thghRigidGroupIdRefList.add(holder);
         return;
     }


@@ -329,10 +329,10 @@ class RefHelper {
                             String vtxIdRef2,
                             String vtxIdRef3 ){
         IdRefHolder<Surface> holder =
                             String vtxIdRef2,
                             String vtxIdRef3 ){
         IdRefHolder<Surface> holder =

-                new IdRefHolder<Surface>(surface,
-                                         vtxIdRef1,
-                                         vtxIdRef2,
-                                         vtxIdRef3 );
+                new IdRefHolder<>(surface,
+                                  vtxIdRef1,
+                                  vtxIdRef2,
+                                  vtxIdRef3 );

 
         this.surfaceVertexIdRef.add(holder);
 
 
         this.surfaceVertexIdRef.add(holder);
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java
index 1f9a4b0..66b94aa 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxListener.java
@@ -53,7 +53,7 @@ class SaxListener {
      */
     private static Collection<Method> filtMethod(Class<?> klass,
                                    Class<? extends Annotation> filter ){
      */
     private static Collection<Method> filtMethod(Class<?> klass,
                                    Class<? extends Annotation> filter ){

-        Collection<Method> result = new LinkedList<Method>();
+        Collection<Method> result = new LinkedList<>();

 
         for(Method method : klass.getDeclaredMethods()){
             int modifiers = method.getModifiers();
 
         for(Method method : klass.getDeclaredMethods()){
             int modifiers = method.getModifiers();


@@ -77,7 +77,7 @@ class SaxListener {
      */
     private static Map<PmdTag, Method> getOpenDispatcher(Class<?> klass){
         Map<PmdTag, Method> result =
      */
     private static Map<PmdTag, Method> getOpenDispatcher(Class<?> klass){
         Map<PmdTag, Method> result =

-                new EnumMap<PmdTag, Method>(PmdTag.class);
+                new EnumMap<>(PmdTag.class);

 
         for(Method method : filtMethod(klass, OpenXmlMark.class)){
             Annotation anno = method.getAnnotation(OpenXmlMark.class);
 
         for(Method method : filtMethod(klass, OpenXmlMark.class)){
             Annotation anno = method.getAnnotation(OpenXmlMark.class);


@@ -96,7 +96,7 @@ class SaxListener {
      */
     private static Map<PmdTag, Method> getCloseDispatcher(Class<?> klass){
         Map<PmdTag, Method> result =
      */
     private static Map<PmdTag, Method> getCloseDispatcher(Class<?> klass){
         Map<PmdTag, Method> result =

-                new EnumMap<PmdTag, Method>(PmdTag.class);
+                new EnumMap<>(PmdTag.class);

 
         for(Method method : filtMethod(klass, CloseXmlMark.class)){
             Annotation anno = method.getAnnotation(CloseXmlMark.class);
 
         for(Method method : filtMethod(klass, CloseXmlMark.class)){
             Annotation anno = method.getAnnotation(CloseXmlMark.class);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxMorphListener.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxMorphListener.java
index c118b28..06ac0fc 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxMorphListener.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/SaxMorphListener.java
@@ -54,7 +54,7 @@ class SaxMorphListener extends SaxListener{
     void closeMorphList(){
         Map<MorphType, List<MorphPart>> morphMap =
                 getPmdModel().getMorphMap();
     void closeMorphList(){
         Map<MorphType, List<MorphPart>> morphMap =
                 getPmdModel().getMorphMap();

-        List<MorphPart> tempList = new LinkedList<MorphPart>();
+        List<MorphPart> tempList = new LinkedList<>();

 
         tempList.addAll(morphMap.get(MorphType.EYEBROW));
         tempList.addAll(morphMap.get(MorphType.EYE));
 
         tempList.addAll(morphMap.get(MorphType.EYEBROW));
         tempList.addAll(morphMap.get(MorphType.EYE));

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/XmlHandler.java b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/XmlHandler.java
index b5d28e2..0efa1aa 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/XmlHandler.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd/model/xml/XmlHandler.java
@@ -45,7 +45,7 @@ class XmlHandler implements ContentHandler{
         SaxListener dynamicsListener = new SaxDynamicsListener(helper);
         SaxListener shapeListener    = new SaxShapeListener(helper);
 
         SaxListener dynamicsListener = new SaxDynamicsListener(helper);
         SaxListener shapeListener    = new SaxShapeListener(helper);
 

-        this.listenerMap = new EnumMap<PmdTag, SaxListener>(PmdTag.class);
+        this.listenerMap = new EnumMap<>(PmdTag.class);

         this.listenerMap.put(PmdTag.PMD_MODEL,          modelListener);
         this.listenerMap.put(PmdTag.MATERIAL_LIST,      materialListener);
         this.listenerMap.put(PmdTag.BONE_LIST,          boneListener);
         this.listenerMap.put(PmdTag.PMD_MODEL,          modelListener);
         this.listenerMap.put(PmdTag.MATERIAL_LIST,      materialListener);
         this.listenerMap.put(PmdTag.BONE_LIST,          boneListener);

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd2xml/CmdLine.java b/src/main/java/jp/sfjp/mikutoga/pmd2xml/CmdLine.java
index f98a6ee..5fe350f 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd2xml/CmdLine.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd2xml/CmdLine.java
@@ -49,7 +49,7 @@ final class CmdLine {
      * @return 解析されたコマンドライン並び
      */
     static List<CmdLine> parse(List<String> argList){
      * @return 解析されたコマンドライン並び
      */
     static List<CmdLine> parse(List<String> argList){

-        List<CmdLine> result = new LinkedList<CmdLine>();
+        List<CmdLine> result = new LinkedList<>();

 
         Iterator<String> it = argList.iterator();
         while (it.hasNext()) {
 
         Iterator<String> it = argList.iterator();
         while (it.hasNext()) {


@@ -64,7 +64,7 @@ final class CmdLine {
             if (info.opt != null) {
                 exArgNum = info.opt.getExArgNum();
             }
             if (info.opt != null) {
                 exArgNum = info.opt.getExArgNum();
             }

-            info.optArgs = new ArrayList<String>(exArgNum + 1);
+            info.optArgs = new ArrayList<>(exArgNum + 1);

 
             info.optArgs.add(arg);
 
 
             info.optArgs.add(arg);
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd2xml/ModelFileType.java b/src/main/java/jp/sfjp/mikutoga/pmd2xml/ModelFileType.java
index d474e3b..048219a 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd2xml/ModelFileType.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd2xml/ModelFileType.java
@@ -53,7 +53,7 @@ public enum ModelFileType {
     /**
      * コンストラクタ。
      */
     /**
      * コンストラクタ。
      */

-    private ModelFileType(){
+    ModelFileType(){

         return;
     }
 
         return;
     }
 

diff --git a/src/main/java/jp/sfjp/mikutoga/pmd2xml/OptSwitch.java b/src/main/java/jp/sfjp/mikutoga/pmd2xml/OptSwitch.java
index bc4ab7b..b4ce1d2 100644 (file)
--- a/src/main/java/jp/sfjp/mikutoga/pmd2xml/OptSwitch.java
+++ b/src/main/java/jp/sfjp/mikutoga/pmd2xml/OptSwitch.java
@@ -50,7 +50,7 @@ enum OptSwitch {
     private static final Map<String, OptSwitch> MAP_OPT;
 
     static{
     private static final Map<String, OptSwitch> MAP_OPT;
 
     static{

-        Map<String, OptSwitch> map = new HashMap<String, OptSwitch>();
+        Map<String, OptSwitch> map = new HashMap<>();

 
         for(OptSwitch opt : values()){
             for(String cmdarg : opt.cmdopts){
 
         for(OptSwitch opt : values()){
             for(String cmdarg : opt.cmdopts){


@@ -73,7 +73,7 @@ enum OptSwitch {
      * @param argnum 必要な引数の数
      * @param cmdopts オプションスイッチパターン群
      */
      * @param argnum 必要な引数の数
      * @param cmdopts オプションスイッチパターン群
      */

-    private OptSwitch(int argnum, String... cmdopts) {
+    OptSwitch(int argnum, String... cmdopts) {

         this.exArgNum = argnum;
 
         List<String> optlist;
         this.exArgNum = argnum;
 
         List<String> optlist;