From f6250b92caa688e26e689bc0c579fe18fe9fbb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Thu, 20 Dec 2012 10:46:17 +0100 Subject: [PATCH] AD3: A bit faster exporting due turning off Highlighting --- trunk/src/com/jpexs/asdec/abc/ABC.java | 6 ++++- .../com/jpexs/asdec/abc/avm2/AVM2Code.java | 2 +- .../com/jpexs/asdec/helpers/Highlighting.java | 25 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/asdec/abc/ABC.java index a5f129145..f75ef91a8 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABC.java +++ b/trunk/src/com/jpexs/asdec/abc/ABC.java @@ -589,6 +589,10 @@ public class ABC { } public String classToString(int i, boolean highlight, boolean pcode) { + if(!highlight) + { + Highlighting.doHighlight=false; + } String ret = ""; ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream out = new PrintStream(baos); @@ -740,7 +744,7 @@ public class ABC { out.println(IDENT_STRING + "}");//class out.println("}");//package out.flush(); - + Highlighting.doHighlight=true; return baos.toString(); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java index 5959da8f3..031c5b98c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java @@ -821,7 +821,7 @@ public class AVM2Code { } return ret; } - + public int pos2adr(int pos) { if(!cacheActual){ buildCache(); diff --git a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java b/trunk/src/com/jpexs/asdec/helpers/Highlighting.java index 832d4ffb6..400182053 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java +++ b/trunk/src/com/jpexs/asdec/helpers/Highlighting.java @@ -40,6 +40,11 @@ public class Highlighting { */ public long offset; + /** + * Turn hignlighting on/off + */ + public static boolean doHighlight=true; + /** * Returns a string representation of the object * @@ -49,6 +54,8 @@ public class Highlighting { public String toString() { return "" + startPos + "-" + (startPos + len) + " ofs" + offset; } + + /** * Constructor @@ -85,6 +92,9 @@ public class Highlighting { * @return Highlighted text */ public static String hilighOffset(String text, long offset) { + if(!doHighlight){ + return text; + } return OFSOPEN + offset + OFSCLOSE + text + OFSEND; } @@ -96,6 +106,9 @@ public class Highlighting { * @return Highlighted text */ public static String hilighMethod(String text, long index) { + if(!doHighlight){ + return text; + } return hilighMethodBegin(index) + text + hilighMethodEnd(); } @@ -105,6 +118,9 @@ public class Highlighting { * @return */ public static String hilighMethodBegin(long index) { + if(!doHighlight){ + return ""; + } return METHODOPEN + index + METHODCLOSE; } @@ -113,6 +129,9 @@ public class Highlighting { * @return */ public static String hilighMethodEnd() { + if(!doHighlight){ + return ""; + } return METHODEND; } /** @@ -123,6 +142,9 @@ public class Highlighting { * @return Highlighted text */ public static String hilighTrait(String text, long offset) { + if(!doHighlight){ + return text; + } return TRAITOPEN + offset + TRAITCLOSE + text + TRAITEND; } @@ -133,6 +155,9 @@ public class Highlighting { * @return Text with no highlights */ public static String stripHilights(String text) { + if(!doHighlight){ + return text; + } text = stripInstrHilights(text); text = stripTraitHilights(text); text = stripMethodHilights(text);