• R/O
  • HTTP
  • SSH
  • HTTPS

Pmd2XML: コミット

Pmd2XMLは、3D動画制作ツール、MikuMikuDance(MMD)で用いられるモデルデータファイル(*.pmd)の内容を、XML形式のデータファイルと交換するためのアプリケーションです。


コミットメタ情報

リビジョンabcb0a55f7087667f35fcc696fc476bfb1408df1 (tree)
日時2019-07-04 02:09:30
作者Olyutorskii <olyutorskii@user...>
コミッターOlyutorskii

ログメッセージ

use diamond operator.

変更サマリ

差分

--- 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;
1818 * 通し番号0のボーングループは、
1919 * 暗黙に用意される「デフォルトボーングループ」とする。
2020 */
21-public class BoneGroup implements SerialNumbered , Iterable<BoneInfo> {
21+public class BoneGroup implements SerialNumbered, Iterable<BoneInfo> {
2222
2323 private final I18nText groupName = new I18nText();
2424
25- private final List<BoneInfo> boneList = new ArrayList<BoneInfo>();
25+ private final List<BoneInfo> boneList = new ArrayList<>();
2626
2727 private int serialNo = -1;
2828
--- 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> {
2121 private int ikDepth;
2222 private float ikWeight;
2323
24- private final List<BoneInfo> chainList = new ArrayList<BoneInfo>();
24+ private final List<BoneInfo> chainList = new ArrayList<>();
2525
2626
2727 /**
--- 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> {
3939
4040 private boolean edgeAppearance = true;
4141
42- private final List<Surface> surfaceList = new ArrayList<Surface>();
42+ private final List<Surface> surfaceList = new ArrayList<>();
4343
4444
4545 /**
--- 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> {
2323 private MorphType type;
2424
2525 private final List<MorphVertex> morphVertexList =
26- new ArrayList<MorphVertex>();
26+ new ArrayList<>();
2727
2828 private int morphSerialNo = -1;
2929
--- 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 {
2929 private final I18nText modelName = new I18nText();
3030 private final I18nText description = new I18nText();
3131
32- private final List<Vertex> vertexList = new ArrayList<Vertex>();
33- private final List<Surface> surfaceList = new ArrayList<Surface>();
34- private final List<Material> materialList = new LinkedList<Material>();
32+ private final List<Vertex> vertexList = new ArrayList<>();
33+ private final List<Surface> surfaceList = new ArrayList<>();
34+ private final List<Material> materialList = new LinkedList<>();
3535
36- private final List<BoneInfo> boneList = new ArrayList<BoneInfo>();
37- private final List<BoneGroup> boneGroupList = new ArrayList<BoneGroup>();
36+ private final List<BoneInfo> boneList = new ArrayList<>();
37+ private final List<BoneGroup> boneGroupList = new ArrayList<>();
3838
39- private final List<IKChain> ikChainList = new ArrayList<IKChain>();
39+ private final List<IKChain> ikChainList = new ArrayList<>();
4040
4141 private final Map<MorphType, List<MorphPart>> morphMap =
42- new EnumMap<MorphType, List<MorphPart>>(MorphType.class);
42+ new EnumMap<>(MorphType.class);
4343
44- private final List<RigidInfo> rigidList = new ArrayList<RigidInfo>();
44+ private final List<RigidInfo> rigidList = new ArrayList<>();
4545 private final List<RigidGroup> rigidGroupList =
46- new ArrayList<RigidGroup>();
46+ new ArrayList<>();
4747
48- private final List<JointInfo> jointList = new ArrayList<JointInfo>();
48+ private final List<JointInfo> jointList = new ArrayList<>();
4949
5050 private ToonMap toonMap = new ToonMap();
5151
@@ -59,10 +59,10 @@ public class PmdModel {
5959 assert this.vertexList instanceof RandomAccess;
6060 assert this.surfaceList instanceof RandomAccess;
6161
62- this.morphMap.put(MorphType.EYEBROW, new ArrayList<MorphPart>());
63- this.morphMap.put(MorphType.EYE, new ArrayList<MorphPart>());
64- this.morphMap.put(MorphType.LIP, new ArrayList<MorphPart>());
65- this.morphMap.put(MorphType.EXTRA, new ArrayList<MorphPart>());
62+ this.morphMap.put(MorphType.EYEBROW, new ArrayList<>());
63+ this.morphMap.put(MorphType.EYE, new ArrayList<>());
64+ this.morphMap.put(MorphType.LIP, new ArrayList<>());
65+ this.morphMap.put(MorphType.EXTRA, new ArrayList<>());
6666
6767 return;
6868 }
@@ -235,7 +235,7 @@ public class PmdModel {
235235 * @return モーフ頂点リスト
236236 */
237237 private List<MorphVertex> getAllMorphVertexList(){
238- List<MorphVertex> allList = new ArrayList<MorphVertex>();
238+ List<MorphVertex> allList = new ArrayList<>();
239239
240240 for(MorphType type : this.morphMap.keySet()){
241241 if(type.isBase()) continue;
@@ -261,9 +261,9 @@ public class PmdModel {
261261 */
262262 private List<MorphVertex> getUniqueMorphVertexList(
263263 List<MorphVertex> allList ){
264- List<MorphVertex> result = new ArrayList<MorphVertex>();
264+ List<MorphVertex> result = new ArrayList<>();
265265
266- Set<Vertex> mergedVertexSet = new HashSet<Vertex>();
266+ Set<Vertex> mergedVertexSet = new HashSet<>();
267267
268268 for(MorphVertex morphVertex : allList){
269269 Vertex vertex = morphVertex.getBaseVertex();
@@ -297,7 +297,7 @@ public class PmdModel {
297297 ListUtil.assignIndexedSerial(result);
298298
299299 Map<Vertex, MorphVertex> numberedMap =
300- new HashMap<Vertex, MorphVertex>();
300+ new HashMap<>();
301301 for(MorphVertex morphVertex : result){
302302 Vertex vertex = morphVertex.getBaseVertex();
303303 numberedMap.put(vertex, morphVertex);
@@ -341,7 +341,7 @@ public class PmdModel {
341341 * @return トリミングされた面リスト
342342 */
343343 private List<Surface> trimmingSurfaceList(){
344- Set<Surface> materialedSurfaceSet = new HashSet<Surface>();
344+ Set<Surface> materialedSurfaceSet = new HashSet<>();
345345 for(Material material : this.materialList){
346346 if(material == null) continue;
347347 for(Surface surface : material){
@@ -352,7 +352,7 @@ public class PmdModel {
352352
353353 materialedSurfaceSet.removeAll(this.surfaceList);
354354
355- List<Surface> result = new ArrayList<Surface>();
355+ List<Surface> result = new ArrayList<>();
356356 for(Surface surface : this.surfaceList){
357357 if(surface == null) continue;
358358 result.add(surface);
@@ -378,7 +378,7 @@ public class PmdModel {
378378 * @return トリミングされた頂点リスト
379379 */
380380 private List<Vertex> trimmingVertexList(){
381- Set<Vertex> surfacedVertexSet = new HashSet<Vertex>();
381+ Set<Vertex> surfacedVertexSet = new HashSet<>();
382382 for(Surface surface : this.surfaceList){
383383 if(surface == null) continue;
384384 for(Vertex vertex : surface){
@@ -388,7 +388,7 @@ public class PmdModel {
388388
389389 surfacedVertexSet.removeAll(this.vertexList);
390390
391- List<Vertex> result = new ArrayList<Vertex>();
391+ List<Vertex> result = new ArrayList<>();
392392 for(Vertex vertex : this.vertexList){
393393 if(vertex == null) continue;
394394 result.add(vertex);
--- 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> {
2121 public static final int MAX_RIGID_GROUP = 16;
2222
2323
24- private final List<RigidInfo> rigidList = new ArrayList<RigidInfo>();
24+ private final List<RigidInfo> rigidList = new ArrayList<>();
2525
2626 private int rigidGroupSerialNo = -1;
2727
--- 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 {
3232 private final DynamicsInfo dynamicsInfo = new DynamicsInfo();
3333
3434 private final Collection<RigidGroup> throughGroupColl =
35- new ArrayList<RigidGroup>();
35+ new ArrayList<>();
3636
3737 private RigidGroup rigidGroup;
3838
--- 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;
1515 public interface SerialNumbered {
1616
1717 /** 昇順での比較子。 */
18- Comparator<SerialNumbered> COMPARATOR = new SerialComparator();
18+ public static final Comparator<SerialNumbered> COMPARATOR =
19+ new SerialComparator();
1920
2021
2122 /**
2223 * 通し番号を設定する。
24+ *
2325 * @param num 通し番号
2426 */
25- void setSerialNumber(int num);
27+ public abstract void setSerialNumber(int num);
2628
2729 /**
2830 * 通し番号を返す。
31+ *
2932 * @return 通し番号
3033 */
31- int getSerialNumber();
34+ public abstract int getSerialNumber();
3235
3336
3437 /**
@@ -36,7 +39,7 @@ public interface SerialNumbered {
3639 * 通し番号の昇順を定義づける。
3740 */
3841 @SuppressWarnings("serial")
39- class SerialComparator
42+ public static class SerialComparator
4043 implements Comparator<SerialNumbered> {
4144
4245 /**
@@ -50,6 +53,7 @@ public interface SerialNumbered {
5053
5154 /**
5255 * {@inheritDoc}
56+ *
5357 * @param o1 {@inheritDoc}
5458 * @param o2 {@inheritDoc}
5559 * @return {@inheritDoc}
--- 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> {
119119 */
120120 @Override
121121 public Iterator<Vertex> iterator(){
122- List<Vertex> list = new ArrayList<Vertex>(TRIANGLE);
122+ List<Vertex> list = new ArrayList<>(TRIANGLE);
123123
124124 list.add(this.vertex1);
125125 list.add(this.vertex2);
--- 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 {
3333 private static final int IDX_SP = 0xff; // 特殊トゥーンのインデックス
3434
3535 static{
36- Map<Integer, String> map = new TreeMap<Integer, String>();
36+ Map<Integer, String> map = new TreeMap<>();
3737
3838 int idx = 0x00;
3939 map.put(idx++, "toon01.bmp");
@@ -57,7 +57,7 @@ public class ToonMap {
5757
5858
5959 private final Map<Integer, String> toonDefMap =
60- new TreeMap<Integer, String>(DEF_TOONMAP);
60+ new TreeMap<>(DEF_TOONMAP);
6161
6262
6363 /**
--- 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 {
158158 * 所属グループの無いボーンをデフォルトボーングループへ登録する。
159159 */
160160 private void pickOrphanBone(){
161- List<BoneInfo> orpahnList = new LinkedList<BoneInfo>();
161+ List<BoneInfo> orpahnList = new LinkedList<>();
162162 orpahnList.addAll(this.boneList);
163163 for(BoneGroup group : this.boneGroupList){
164164 orpahnList.removeAll(group.getBoneList());
--- 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 {
3434 private MorphPart currentMorphPart;
3535 private final List<Vertex> vertexList;
3636
37- private final List<Vertex> morphVertexList = new ArrayList<Vertex>();
37+ private final List<Vertex> morphVertexList = new ArrayList<>();
3838
3939 /**
4040 * コンストラクタ。
@@ -183,7 +183,7 @@ class MorphBuilder implements PmdMorphHandler {
183183
184184 List<MorphPart> partList = this.morphMap.get(type);
185185 if(partList == null){
186- partList = new LinkedList<MorphPart>();
186+ partList = new LinkedList<>();
187187 this.morphMap.put(type, partList);
188188 }
189189 partList.add(part);
--- 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{
510510 throws IOException, IllegalTextExportException{
511511 Map<MorphType, List<MorphPart>> morphMap = model.getMorphMap();
512512 Set<MorphType> typeSet = morphMap.keySet();
513- List<MorphPart> morphPartList = new LinkedList<MorphPart>();
513+ List<MorphPart> morphPartList = new LinkedList<>();
514514
515515 for(MorphType type : typeSet){
516516 List<MorphPart> partList = morphMap.get(type);
@@ -592,7 +592,7 @@ public class PmdExporterBase extends BinaryExporter{
592592 }
593593 dumpByte(totalMorph);
594594
595- List<MorphType> typeList = new LinkedList<MorphType>();
595+ List<MorphType> typeList = new LinkedList<>();
596596 for(MorphType type : typeSet){
597597 assert ! type.isBase();
598598 typeList.add(type);
--- 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 {
8181 RigidBuilder rigidBuilder = new RigidBuilder(model);
8282 JointBuilder jointBuilder = new JointBuilder(model);
8383
84- List<MorphPart> morphPartList = new ArrayList<MorphPart>();
84+ List<MorphPart> morphPartList = new ArrayList<>();
8585 morphBuilder.setMorphPartList(morphPartList);
8686 textBuilder.setMorphPartList(morphPartList);
8787
--- 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 {
9393 ;
9494
9595 private static final Map<String, PmdTag> NAME_MAP =
96- new HashMap<String, PmdTag>();
96+ new HashMap<>();
9797
9898 static{
9999 for(PmdTag tag : values()){
--- 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 {
2828
2929 // マテリアル関連
3030 private final List<IdRefHolder<Material>> materialSfcGroupIdRefList =
31- new LinkedList<IdRefHolder<Material>>();
31+ new LinkedList<>();
3232 private final List<IdRefHolder<Material>> materialToonIdRefList =
33- new LinkedList<IdRefHolder<Material>>();
33+ new LinkedList<>();
3434 private final Map<String, Integer> toonIdxMap =
35- new HashMap<String, Integer>();
35+ new HashMap<>();
3636
3737 // ボーン関連
3838 private final Map<String, BoneInfo> boneIdMap =
39- new HashMap<String, BoneInfo>();
39+ new HashMap<>();
4040 private final List<IdRefHolder<BoneInfo>> boneChainIdRefList =
41- new LinkedList<IdRefHolder<BoneInfo>>();
41+ new LinkedList<>();
4242 private final List<IdRefHolder<BoneInfo>> boneSourceIdRefList =
43- new LinkedList<IdRefHolder<BoneInfo>>();
43+ new LinkedList<>();
4444
4545 // モーフ関連
4646 private final List<IdRefHolder<MorphVertex>> morphVertexIdRefList =
47- new LinkedList<IdRefHolder<MorphVertex>>();
47+ new LinkedList<>();
4848
4949 // 剛体関連
5050 private final Map<String, RigidInfo> rigidIdMap =
51- new HashMap<String, RigidInfo>();
51+ new HashMap<>();
5252 private final Map<String, RigidGroup> rigidGroupIdMap =
53- new HashMap<String, RigidGroup>();
53+ new HashMap<>();
5454 private final List<IdRefHolder<RigidInfo>> thghRigidGroupIdRefList =
55- new LinkedList<IdRefHolder<RigidInfo>>();
55+ new LinkedList<>();
5656
5757 // 面関連
5858 private final Map<String, List<Surface>> surfaceGroupIdMap =
59- new HashMap<String, List<Surface>>();
59+ new HashMap<>();
6060 private final List<IdRefHolder<Surface>> surfaceVertexIdRef =
61- new LinkedList<IdRefHolder<Surface>>();
61+ new LinkedList<>();
6262
6363 // 頂点関連
6464 private final Map<String, Vertex> vertexIdMap =
65- new HashMap<String, Vertex>();
65+ new HashMap<>();
6666
6767
6868 /**
@@ -81,7 +81,7 @@ class RefHelper {
8181 */
8282 void addSurfaceGroupIdRef(Material material, String idRef){
8383 IdRefHolder<Material> holder =
84- new IdRefHolder<Material>(material, idRef);
84+ new IdRefHolder<>(material, idRef);
8585 this.materialSfcGroupIdRefList.add(holder);
8686
8787 return;
@@ -96,7 +96,7 @@ class RefHelper {
9696 List<Surface> surfaceGroup =
9797 this.surfaceGroupIdMap.get(surfaceGroupId);
9898 if(surfaceGroup == null){
99- surfaceGroup = new LinkedList<Surface>();
99+ surfaceGroup = new LinkedList<>();
100100 this.surfaceGroupIdMap.put(surfaceGroupId, surfaceGroup);
101101 }
102102
@@ -130,7 +130,7 @@ class RefHelper {
130130 */
131131 void addToonFileIdRef(Material material, String idRef){
132132 IdRefHolder<Material> holder =
133- new IdRefHolder<Material>(material, idRef);
133+ new IdRefHolder<>(material, idRef);
134134 this.materialToonIdRefList.add(holder);
135135 return;
136136 }
@@ -190,7 +190,7 @@ class RefHelper {
190190 void addBoneChain(BoneInfo bone,
191191 String prevBoneIdRef, String nextBoneIdRef ){
192192 IdRefHolder<BoneInfo> holder =
193- new IdRefHolder<BoneInfo>(bone, prevBoneIdRef, nextBoneIdRef);
193+ new IdRefHolder<>(bone, prevBoneIdRef, nextBoneIdRef);
194194 this.boneChainIdRefList.add(holder);
195195 return;
196196 }
@@ -225,7 +225,7 @@ class RefHelper {
225225 */
226226 void addSrcBoneIdRef(BoneInfo bone, String srcBoneIdRef){
227227 IdRefHolder<BoneInfo> holder =
228- new IdRefHolder<BoneInfo>(bone, srcBoneIdRef);
228+ new IdRefHolder<>(bone, srcBoneIdRef);
229229 this.boneSourceIdRefList.add(holder);
230230 return;
231231 }
@@ -253,7 +253,7 @@ class RefHelper {
253253 */
254254 void addMorphVertexIdRef(MorphVertex morphVertex, String vertexIdRef){
255255 IdRefHolder<MorphVertex> holder =
256- new IdRefHolder<MorphVertex>(morphVertex, vertexIdRef);
256+ new IdRefHolder<>(morphVertex, vertexIdRef);
257257 this.morphVertexIdRefList.add(holder);
258258 return;
259259 }
@@ -285,7 +285,7 @@ class RefHelper {
285285 */
286286 void addThroughRigidGroupIdRef(RigidInfo rigid, String rigidGroupIdRef){
287287 IdRefHolder<RigidInfo> holder =
288- new IdRefHolder<RigidInfo>(rigid, rigidGroupIdRef);
288+ new IdRefHolder<>(rigid, rigidGroupIdRef);
289289 this.thghRigidGroupIdRefList.add(holder);
290290 return;
291291 }
@@ -329,10 +329,10 @@ class RefHelper {
329329 String vtxIdRef2,
330330 String vtxIdRef3 ){
331331 IdRefHolder<Surface> holder =
332- new IdRefHolder<Surface>(surface,
333- vtxIdRef1,
334- vtxIdRef2,
335- vtxIdRef3 );
332+ new IdRefHolder<>(surface,
333+ vtxIdRef1,
334+ vtxIdRef2,
335+ vtxIdRef3 );
336336
337337 this.surfaceVertexIdRef.add(holder);
338338
--- 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 {
5353 */
5454 private static Collection<Method> filtMethod(Class<?> klass,
5555 Class<? extends Annotation> filter ){
56- Collection<Method> result = new LinkedList<Method>();
56+ Collection<Method> result = new LinkedList<>();
5757
5858 for(Method method : klass.getDeclaredMethods()){
5959 int modifiers = method.getModifiers();
@@ -77,7 +77,7 @@ class SaxListener {
7777 */
7878 private static Map<PmdTag, Method> getOpenDispatcher(Class<?> klass){
7979 Map<PmdTag, Method> result =
80- new EnumMap<PmdTag, Method>(PmdTag.class);
80+ new EnumMap<>(PmdTag.class);
8181
8282 for(Method method : filtMethod(klass, OpenXmlMark.class)){
8383 Annotation anno = method.getAnnotation(OpenXmlMark.class);
@@ -96,7 +96,7 @@ class SaxListener {
9696 */
9797 private static Map<PmdTag, Method> getCloseDispatcher(Class<?> klass){
9898 Map<PmdTag, Method> result =
99- new EnumMap<PmdTag, Method>(PmdTag.class);
99+ new EnumMap<>(PmdTag.class);
100100
101101 for(Method method : filtMethod(klass, CloseXmlMark.class)){
102102 Annotation anno = method.getAnnotation(CloseXmlMark.class);
--- 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{
5454 void closeMorphList(){
5555 Map<MorphType, List<MorphPart>> morphMap =
5656 getPmdModel().getMorphMap();
57- List<MorphPart> tempList = new LinkedList<MorphPart>();
57+ List<MorphPart> tempList = new LinkedList<>();
5858
5959 tempList.addAll(morphMap.get(MorphType.EYEBROW));
6060 tempList.addAll(morphMap.get(MorphType.EYE));
--- 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{
4545 SaxListener dynamicsListener = new SaxDynamicsListener(helper);
4646 SaxListener shapeListener = new SaxShapeListener(helper);
4747
48- this.listenerMap = new EnumMap<PmdTag, SaxListener>(PmdTag.class);
48+ this.listenerMap = new EnumMap<>(PmdTag.class);
4949 this.listenerMap.put(PmdTag.PMD_MODEL, modelListener);
5050 this.listenerMap.put(PmdTag.MATERIAL_LIST, materialListener);
5151 this.listenerMap.put(PmdTag.BONE_LIST, boneListener);
--- 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 {
4949 * @return 解析されたコマンドライン並び
5050 */
5151 static List<CmdLine> parse(List<String> argList){
52- List<CmdLine> result = new LinkedList<CmdLine>();
52+ List<CmdLine> result = new LinkedList<>();
5353
5454 Iterator<String> it = argList.iterator();
5555 while (it.hasNext()) {
@@ -64,7 +64,7 @@ final class CmdLine {
6464 if (info.opt != null) {
6565 exArgNum = info.opt.getExArgNum();
6666 }
67- info.optArgs = new ArrayList<String>(exArgNum + 1);
67+ info.optArgs = new ArrayList<>(exArgNum + 1);
6868
6969 info.optArgs.add(arg);
7070
--- 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 {
5353 /**
5454 * コンストラクタ。
5555 */
56- private ModelFileType(){
56+ ModelFileType(){
5757 return;
5858 }
5959
--- 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 {
5050 private static final Map<String, OptSwitch> MAP_OPT;
5151
5252 static{
53- Map<String, OptSwitch> map = new HashMap<String, OptSwitch>();
53+ Map<String, OptSwitch> map = new HashMap<>();
5454
5555 for(OptSwitch opt : values()){
5656 for(String cmdarg : opt.cmdopts){
@@ -73,7 +73,7 @@ enum OptSwitch {
7373 * @param argnum 必要な引数の数
7474 * @param cmdopts オプションスイッチパターン群
7575 */
76- private OptSwitch(int argnum, String... cmdopts) {
76+ OptSwitch(int argnum, String... cmdopts) {
7777 this.exArgNum = argnum;
7878
7979 List<String> optlist;
旧リポジトリブラウザで表示