From 74edc74c2c7b3236f00bf92499bb884837673b7d Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 20:13:13 +1000 Subject: Reformatting code --- src/main/java/cuchaz/enigma/convert/MatchesReader.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/cuchaz/enigma/convert/MatchesReader.java') diff --git a/src/main/java/cuchaz/enigma/convert/MatchesReader.java b/src/main/java/cuchaz/enigma/convert/MatchesReader.java index 773566d..f7853ac 100644 --- a/src/main/java/cuchaz/enigma/convert/MatchesReader.java +++ b/src/main/java/cuchaz/enigma/convert/MatchesReader.java @@ -28,7 +28,7 @@ public class MatchesReader { throws IOException { try (BufferedReader in = new BufferedReader(new FileReader(file))) { ClassMatches matches = new ClassMatches(); - String line = null; + String line; while ((line = in.readLine()) != null) { matches.add(readClassMatch(line)); } @@ -56,8 +56,8 @@ public class MatchesReader { public static MemberMatches readMembers(File file) throws IOException { try (BufferedReader in = new BufferedReader(new FileReader(file))) { - MemberMatches matches = new MemberMatches(); - String line = null; + MemberMatches matches = new MemberMatches<>(); + String line; while ((line = in.readLine()) != null) { readMemberMatch(matches, line); } @@ -90,13 +90,8 @@ public class MatchesReader { } String[] parts = in.split(" "); if (parts.length == 3 && parts[2].indexOf('(') < 0) { - return (T) new FieldEntry( - new ClassEntry(parts[0]), - parts[1], - new Type(parts[2]) - ); + return (T) new FieldEntry(new ClassEntry(parts[0]), parts[1], new Type(parts[2])); } else { - assert (parts.length == 2 || parts.length == 3); if (parts.length == 2) { return (T) EntryFactory.getBehaviorEntry(parts[0], parts[1]); } else if (parts.length == 3) { -- cgit v1.2.3