From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- src/cuchaz/enigma/mapping/MappingsWriter.java | 110 +++++++++----------------- 1 file changed, 38 insertions(+), 72 deletions(-) (limited to 'src/cuchaz/enigma/mapping/MappingsWriter.java') diff --git a/src/cuchaz/enigma/mapping/MappingsWriter.java b/src/cuchaz/enigma/mapping/MappingsWriter.java index 3c86dfc..5ac409f 100644 --- a/src/cuchaz/enigma/mapping/MappingsWriter.java +++ b/src/cuchaz/enigma/mapping/MappingsWriter.java @@ -17,105 +17,71 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class MappingsWriter -{ - public void write( Writer out, Mappings mappings ) - throws IOException - { - write( new PrintWriter( out ), mappings ); +public class MappingsWriter { + + public void write(Writer out, Mappings mappings) throws IOException { + write(new PrintWriter(out), mappings); } - public void write( PrintWriter out, Mappings mappings ) - throws IOException - { - for( ClassMapping classMapping : sorted( mappings.classes() ) ) - { - write( out, classMapping, 0 ); + public void write(PrintWriter out, Mappings mappings) throws IOException { + for (ClassMapping classMapping : sorted(mappings.classes())) { + write(out, classMapping, 0); } } - private void write( PrintWriter out, ClassMapping classMapping, int depth ) - throws IOException - { - if( classMapping.getDeobfName() == null ) - { - out.format( "%sCLASS %s\n", getIndent( depth ), classMapping.getObfName() ); - } - else - { - out.format( "%sCLASS %s %s\n", getIndent( depth ), classMapping.getObfName(), classMapping.getDeobfName() ); + private void write(PrintWriter out, ClassMapping classMapping, int depth) throws IOException { + if (classMapping.getDeobfName() == null) { + out.format("%sCLASS %s\n", getIndent(depth), classMapping.getObfName()); + } else { + out.format("%sCLASS %s %s\n", getIndent(depth), classMapping.getObfName(), classMapping.getDeobfName()); } - for( ClassMapping innerClassMapping : sorted( classMapping.innerClasses() ) ) - { - write( out, innerClassMapping, depth + 1 ); + for (ClassMapping innerClassMapping : sorted(classMapping.innerClasses())) { + write(out, innerClassMapping, depth + 1); } - for( FieldMapping fieldMapping : sorted( classMapping.fields() ) ) - { - write( out, fieldMapping, depth + 1 ); + for (FieldMapping fieldMapping : sorted(classMapping.fields())) { + write(out, fieldMapping, depth + 1); } - for( MethodMapping methodMapping : sorted( classMapping.methods() ) ) - { - write( out, methodMapping, depth + 1 ); + for (MethodMapping methodMapping : sorted(classMapping.methods())) { + write(out, methodMapping, depth + 1); } } - - private void write( PrintWriter out, FieldMapping fieldMapping, int depth ) - throws IOException - { - out.format( "%sFIELD %s %s\n", getIndent( depth ), fieldMapping.getObfName(), fieldMapping.getDeobfName() ); + + private void write(PrintWriter out, FieldMapping fieldMapping, int depth) throws IOException { + out.format("%sFIELD %s %s\n", getIndent(depth), fieldMapping.getObfName(), fieldMapping.getDeobfName()); } - private void write( PrintWriter out, MethodMapping methodMapping, int depth ) - throws IOException - { - if( methodMapping.getDeobfName() == null ) - { - out.format( "%sMETHOD %s %s\n", - getIndent( depth ), - methodMapping.getObfName(), methodMapping.getObfSignature() - ); - } - else - { - out.format( "%sMETHOD %s %s %s\n", - getIndent( depth ), - methodMapping.getObfName(), methodMapping.getDeobfName(), - methodMapping.getObfSignature() - ); + private void write(PrintWriter out, MethodMapping methodMapping, int depth) throws IOException { + if (methodMapping.getDeobfName() == null) { + out.format("%sMETHOD %s %s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getObfSignature()); + } else { + out.format("%sMETHOD %s %s %s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getDeobfName(), methodMapping.getObfSignature()); } - for( ArgumentMapping argumentMapping : sorted( methodMapping.arguments() ) ) - { - write( out, argumentMapping, depth + 1 ); + for (ArgumentMapping argumentMapping : sorted(methodMapping.arguments())) { + write(out, argumentMapping, depth + 1); } } - - private void write( PrintWriter out, ArgumentMapping argumentMapping, int depth ) - throws IOException - { - out.format( "%sARG %d %s\n", getIndent( depth ), argumentMapping.getIndex(), argumentMapping.getName() ); + + private void write(PrintWriter out, ArgumentMapping argumentMapping, int depth) throws IOException { + out.format("%sARG %d %s\n", getIndent(depth), argumentMapping.getIndex(), argumentMapping.getName()); } - private > List sorted( Iterable classes ) - { + private > List sorted(Iterable classes) { List out = new ArrayList(); - for( T t : classes ) - { - out.add( t ); + for (T t : classes) { + out.add(t); } - Collections.sort( out ); + Collections.sort(out); return out; } - private String getIndent( int depth ) - { + private String getIndent(int depth) { StringBuilder buf = new StringBuilder(); - for( int i=0; i