From 64c359d3c1d2347001e5c6becb1d7561457f52cc Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 18:04:57 +1000 Subject: Renamed Fields --- .../java/cuchaz/enigma/analysis/EntryRenamer.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/main/java/cuchaz/enigma/analysis/EntryRenamer.java') diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java index b99537c..9c3d051 100644 --- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java +++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java @@ -36,7 +36,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entrySet()) { - entriesToAdd.add(new AbstractMap.SimpleEntry( + entriesToAdd.add(new AbstractMap.SimpleEntry<>( renameClassesInThing(renames, entry.getKey()), renameClassesInThing(renames, entry.getValue()) )); @@ -51,7 +51,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entries()) { - entriesToAdd.add(new AbstractMap.SimpleEntry( + entriesToAdd.add(new AbstractMap.SimpleEntry<>( renameClassesInThing(renames, entry.getKey()), renameClassesInThing(renames, entry.getValue()) )); @@ -66,7 +66,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entries()) { - entriesToAdd.add(new AbstractMap.SimpleEntry( + entriesToAdd.add(new AbstractMap.SimpleEntry<>( renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue()) )); @@ -81,7 +81,7 @@ public class EntryRenamer { // for each key/value pair... Set> entriesToAdd = Sets.newHashSet(); for (Map.Entry entry : map.entrySet()) { - entriesToAdd.add(new AbstractMap.SimpleEntry( + entriesToAdd.add(new AbstractMap.SimpleEntry<>( renameMethodsInThing(renames, entry.getKey()), renameMethodsInThing(renames, entry.getValue()) )); @@ -164,19 +164,9 @@ public class EntryRenamer { reference.context = renameClassesInThing(renames, reference.context); return thing; } else if (thing instanceof Signature) { - return (T) new Signature((Signature) thing, new ClassNameReplacer() { - @Override - public String replace(String className) { - return renameClassesInThing(renames, className); - } - }); + return (T) new Signature((Signature) thing, className -> renameClassesInThing(renames, className)); } else if (thing instanceof Type) { - return (T) new Type((Type) thing, new ClassNameReplacer() { - @Override - public String replace(String className) { - return renameClassesInThing(renames, className); - } - }); + return (T) new Type((Type) thing, className -> renameClassesInThing(renames, className)); } return thing; -- cgit v1.2.3