diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/asdec/abc/ABC.java index 5536be45b..19076a332 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABC.java +++ b/trunk/src/com/jpexs/asdec/abc/ABC.java @@ -64,7 +64,9 @@ import com.jpexs.asdec.abc.usages.MethodParamsMultinameUsage; import com.jpexs.asdec.abc.usages.MethodReturnTypeMultinameUsage; import com.jpexs.asdec.abc.usages.MultinameUsage; import com.jpexs.asdec.abc.usages.TypeNameMultinameUsage; +import com.jpexs.asdec.helpers.Helper; import com.jpexs.asdec.helpers.Highlighting; +import java.util.LinkedList; public class ABC { @@ -609,14 +611,15 @@ public class ABC { //class header String classHeader = instance_info[i].getClassHeaderStr(constants); - if (classHeader.startsWith("private ")) { + /*if (classHeader.startsWith("private ")) { classHeader = "public " + classHeader.substring("private ".length()); - } + }*/ out.println(IDENT_STRING + classHeader); out.println(IDENT_STRING + "{"); String toPrint = ""; - + List outTraits=new LinkedList(); + //if (class_info[i].cinit_index != 0) { if (AUTOINIT_STATIC_VARIABLES) { int bodyIndex = findBodyIndex(class_info[i].cinit_index); @@ -656,7 +659,7 @@ public class ABC { if (highlight) { toPrint = Highlighting.hilighTrait(toPrint, class_info[i].static_traits.traits.length + instance_info[i].instance_traits.traits.length + 1); } - out.println(toPrint); + outTraits.add(toPrint); //} //} @@ -687,7 +690,7 @@ public class ABC { if (highlight) { toPrint = Highlighting.hilighTrait(toPrint, class_info[i].static_traits.traits.length + instance_info[i].instance_traits.traits.length); } - out.println(toPrint); + outTraits.add(toPrint); //} //static variables,constants & methods @@ -713,7 +716,7 @@ public class ABC { } else { toPrint = Highlighting.stripHilights(toPrint); } - out.println(toPrint); + outTraits.add(toPrint); } for (int ti = 0; ti < instance_info[i].instance_traits.traits.length; ti++) { Trait t = instance_info[i].instance_traits.traits[ti]; @@ -737,10 +740,10 @@ public class ABC { } else { toPrint = Highlighting.stripHilights(toPrint); } - out.println(toPrint); + outTraits.add(toPrint); } - + out.println(Helper.joinStrings(outTraits, "\r\n\r\n")); out.println(IDENT_STRING + "}");//class out.println("}");//package out.flush(); diff --git a/trunk/src/com/jpexs/asdec/helpers/Helper.java b/trunk/src/com/jpexs/asdec/helpers/Helper.java index e453d56b8..7bd6df539 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Helper.java +++ b/trunk/src/com/jpexs/asdec/helpers/Helper.java @@ -17,6 +17,8 @@ package com.jpexs.asdec.helpers; +import java.util.List; + /** * Class with helper method * @@ -195,4 +197,34 @@ public class Helper { } return sb.toString(); } + + public static String joinStrings(List arr,String glue) + { + String ret=""; + boolean first=true; + for(String s:arr){ + if(!first){ + ret += glue; + }else{ + first=false; + } + ret+=s; + } + return ret; + } + + public static String joinStrings(String arr[],String glue) + { + String ret=""; + boolean first=true; + for(String s:arr){ + if(!first){ + ret += glue; + }else{ + first=false; + } + ret+=s; + } + return ret; + } }