LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 20:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3: Empty line between traits

Browse Source
This commit is contained in:
Jindra Petk
2012-12-21 09:46:49 +01:00
parent 1d32372060
commit 6a0263a78f
2 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/src/com/jpexs/asdec/abc/ABC.java
View File

@@ -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<String> outTraits=new LinkedList<String>();
//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();

32
trunk/src/com/jpexs/asdec/helpers/Helper.java
View File

@@ -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<String> 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;
}
}