From c17afde4cfab9f278763a27af4b1517ab88f6558 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sat, 6 Dec 2014 16:39:39 +0100 Subject: [PATCH] Text highlighting fixed --- lib/jsyntaxpane-0.9.5.jar | Bin 558366 -> 558397 bytes .../jsyntaxpane/kitsfortypes.properties | 62 +++++++++--------- .../jpexs/decompiler/flash/gui/TextPanel.java | 2 +- .../flash/gui/abc/UndoFixedEditorPane.java | 4 +- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/lib/jsyntaxpane-0.9.5.jar b/lib/jsyntaxpane-0.9.5.jar index a1c100c87deaa00eea9a7ce89046ef0d802fa571..eef12b11bc1c50e53b3de22ac093afa5bd08b312 100644 GIT binary patch delta 2088 zcmZ{kdpJ~S9LLW&F6Yf{hOJz>pm-{m(i4p+hS(L=ZmE_fQb07O?trspJa-ORltL2xt)!XZzhX$}{;(8l5w(XDnm znZ0U*rs@i((5#|_a84-CcCwA;J?jwPbF2MV+gR-y9S+yfwVPvq_P|iT3(K-u9=)cy z;JCcv_z%4xHz#}BnrV?<`L9>Rm4s^Xp+(Lw#q*Ox!{DLPqn*IeT8Fs5oCJ@6%e)%CBc zqFrBwwD}TQm z_UzhyP8Rl~$J4E~8~F;k9gkO#)qSePLiEyQ?XcG5+{G5LekQ+;E~urK`FANUFEG0k z7*;rVdvIyz)%gkM|11tPX_WOxy`LvEDA?b_OW1yIU{ztwU6m)3=SJYYrHa~Wz4)42337_%L)Vd@58 zLhW@^;=EpUJ$O3>m_r3a1@2hvyb&y?oR?xrp@spLT#E!c>;PumPfv+tst2R-gkHhG zowSAQ5a0#32x$XYCO|7ydeUs|ad8Qgmrz14Sg{E#hkG`IX>ce6ExXPKlSY3;B%z47 ztiC7de-qkY<2nqcB_L&kKh1^(e4s^E!n2!@To#D4 zqk+hepTdwnnTLr@JtCX^(UjrAG+SqU%C*5*VEPN{RTz#+7Vt4S#Ali$p_2I#XvRh1 z7+troZ*{>07ia;|=kHWgXZD>N|p$P@H!oxAZnQ?74bQK`N5;A1TXYZ`2nehy9 zgMEHr3WSL&BT5sQoIB$nhZ;%7fzrGjv5GKJjC07w>9AxAFs6FbF^S@%VWvl+rTLkd zFpfgI0JOXP41TZ^W2LVXqY(+*g-P`;Bos#@W9s%WWNH3-T8A;04YgvB?wfrK^?-Bh zX>IKA4ur`o@K6j$p%xb4F5_mVZbd~;4`4iQ=6eSF7Gr!m2#p&jM1(ws$(Wlu@S_mu zQMo6eTM}?$EVYM8v53gZ7_u1lmW>_9u2@t*qQqS6Yfu~_W~UjU8$OSM3KawWDsWC| zZmC=)w@;39$XpIpQ;7qmuV0JMe*54?5lEseuHpppkwdMo!NHh?Y$#7a6Xf2&cptD4Tv|koVgJ7Gz6+GxaY9unz!T zIP{v<$M@yOewDxa2&|ESI4WoWw<;T;&9F|Ej#lVa;HE6?FI&(VC}sN=SFFqc-ed>d zp8*zA2Jc{#6di3v1~SY?8O(vpq$t><3~XVs6xfpIVWSjyXjNqqMC34y?yCO)9&qul delta 2113 zcmY+Ec~nzJ6vmSW@&<$?S_+CJ5EW0sV#KO3B9MqExMHc)4UiyJcEYA?hDb!ErNBYC zb*WbBkws3$Y6YbrRKOz?YwLn7ErEkTDTen$;<@oGwjT6|kQo6OebIjL0PQW12wc2;;BSH2T6*!`$V_nAxLv*Mzy zT?an0@`y0gEb#aKv_N63@JTwHVQ9vy;@q7bFI&<3RN>*5KKO(D;PA~`A?BL8%3rpY zdK+eE&p-BZ@nPWC}m=FpQjW%nh8v863nf3M1LjDGpHsB5^T?YF*~DN-+&2RB-(Vix{t zFEe@YA3v!1x=-c$*gLU>vE{n5r(NfwE8CVn@e(H=udm%$X7JrmqJ>xUbSh!beRWrm zlcZR6lNTP+5~I+44Rq_DHOA!Da`?DB@>bIv_Ei63Tv zAQ3j)S=8w1oaJVx^Ls9ITxi^5c<*ef<+19O^YVIL_4nzznkshqyxQaM@j5M)bFjmW zF7I$dt8Kt`HZrxE&^_GK(cf7OYz#m$aEwF($W|g#XbeC+s@n||!AJ}uIc*O79ms)_ z$r&;i!YO0{8+7y(kZW+tmphOZm9Jo9dHsewNJ&RCKwyWAAaOY@Fdg3~dO0cJYJjFd zSRityXE4qC?aI4<@z>ay;m%a4QV&WFCZfDrWH-7)ZstbKAWxE72|sPDJ1IDb2)GF*Uy?L;?!??_21Er5^`hPdy>nypGgs+72l^=y3bCI&AF zCOA!nh29~Uxb7yTW-dPQA9Jv9P8cniJZ_i}214+0XGIbnKN)B0LUE>-*lBXNRPh)eyG$@{fRt(|Ckt%55P}o%kiUSm1e8eGSCas1b6D+!Z&%i` zF?Ozx*G&lJ){!*qx0L$nCRt#YrPOdES+I_#1mZjFe4FO$-EXJcM8HmXbs|1#=FfzT zo4F(j<#&r!IlpR#&a&Ed|Mf3=fb*4c(6wu6~OsqEOcwri{Xbv46{-& ze%%HaQ_*~o>u6gt;-?v0*3MvAe#huFu};Obw3DIEFx)x%yd1@t`w+@fQ9RZD7ulh4 zAL8pt()Zy^^WL$TCuPt_7H(>^nzDUL7VBwb&OC5p=vCu{4ubRe#sWfv(lB)&AYxmD zcmzkOk*UCI^!nrfvl^#oBO(nh-#4<5{7s9P?{nZ5LAwUUQ9=K(s=TWve8}04-_`!- z1n?)Df$NLWm)d!7!t1gC6zM2|`xq+H(K5>N6%1(c2nmO2Q?St@5#`Midxn@mj278a cM_J+swOZuJy$1bSw8G@rK@KPCUmBnGf6oHz>Hq)$ diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/kitsfortypes.properties b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/kitsfortypes.properties index 5269a3218..d1b2d413c 100644 --- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/kitsfortypes.properties +++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/kitsfortypes.properties @@ -1,31 +1,31 @@ -# This file contains the default content types and the SyntaxKit class names -# that will be used for them. -# The keys are content types, and the values are the fully qualified class -# names -text/c=jsyntaxpane.syntaxkits.CSyntaxKit -text/cpp=jsyntaxpane.syntaxkits.CppSyntaxKit -text/java=jsyntaxpane.syntaxkits.JavaSyntaxKit -text/groovy=jsyntaxpane.syntaxkits.GroovySyntaxKit -text/javascript=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit -text/js=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit -text/json=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit -text/xml=jsyntaxpane.syntaxkits.XmlSyntaxKit -text/sql=jsyntaxpane.syntaxkits.SqlSyntaxKit -text/properties=jsyntaxpane.syntaxkits.PropertiesSyntaxKit -text/python=jsyntaxpane.syntaxkits.PythonSyntaxKit -text/tal=jsyntaxpane.syntaxkits.TALSyntaxKit -text/jflex=jsyntaxpane.syntaxkits.JFlexSyntaxKit -text/ruby=jsyntaxpane.syntaxkits.RubySyntaxKit -text/scala=jsyntaxpane.syntaxkits.ScalaSyntaxKit -text/clojure=jsyntaxpane.syntaxkits.ClojureSyntaxKit -text/dosbatch=jsyntaxpane.syntaxkits.DOSBatchSyntaxKit -text/bash=jsyntaxpane.syntaxkits.BashSyntaxKit -text/xpath=jsyntaxpane.syntaxkits.XPathSyntaxKit -text/xhtml=jsyntaxpane.syntaxkits.XHTMLSyntaxKit -text/lua=jsyntaxpane.syntaxkits.LuaSyntaxKit -text/plain=jsyntaxpane.syntaxkits.PlainSyntaxKit -text/flasm3=jsyntaxpane.syntaxkits.Flasm3SyntaxKit -text/flasm3_methodinfo=jsyntaxpane.syntaxkits.Flasm3MethodInfoSyntaxKit -text/flasm=jsyntaxpane.syntaxkits.FlasmSyntaxKit -text/actionscript=jsyntaxpane.syntaxkits.ActionScriptSyntaxKit -text/swf_text=jsyntaxpane.syntaxkits.SWFTextSyntaxKit \ No newline at end of file +# This file contains the default content types and the SyntaxKit class names +# that will be used for them. +# The keys are content types, and the values are the fully qualified class +# names +text/c=jsyntaxpane.syntaxkits.CSyntaxKit +text/cpp=jsyntaxpane.syntaxkits.CppSyntaxKit +text/java=jsyntaxpane.syntaxkits.JavaSyntaxKit +text/groovy=jsyntaxpane.syntaxkits.GroovySyntaxKit +text/javascript=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit +text/js=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit +text/json=jsyntaxpane.syntaxkits.JavaScriptSyntaxKit +text/xml=jsyntaxpane.syntaxkits.XmlSyntaxKit +text/sql=jsyntaxpane.syntaxkits.SqlSyntaxKit +text/properties=jsyntaxpane.syntaxkits.PropertiesSyntaxKit +text/python=jsyntaxpane.syntaxkits.PythonSyntaxKit +text/tal=jsyntaxpane.syntaxkits.TALSyntaxKit +text/jflex=jsyntaxpane.syntaxkits.JFlexSyntaxKit +text/ruby=jsyntaxpane.syntaxkits.RubySyntaxKit +text/scala=jsyntaxpane.syntaxkits.ScalaSyntaxKit +text/clojure=jsyntaxpane.syntaxkits.ClojureSyntaxKit +text/dosbatch=jsyntaxpane.syntaxkits.DOSBatchSyntaxKit +text/bash=jsyntaxpane.syntaxkits.BashSyntaxKit +text/xpath=jsyntaxpane.syntaxkits.XPathSyntaxKit +text/xhtml=jsyntaxpane.syntaxkits.XHTMLSyntaxKit +text/lua=jsyntaxpane.syntaxkits.LuaSyntaxKit +text/plain=jsyntaxpane.syntaxkits.PlainSyntaxKit +text/flasm3=jsyntaxpane.syntaxkits.Flasm3SyntaxKit +text/flasm3methodinfo=jsyntaxpane.syntaxkits.Flasm3MethodInfoSyntaxKit +text/flasm=jsyntaxpane.syntaxkits.FlasmSyntaxKit +text/actionscript=jsyntaxpane.syntaxkits.ActionScriptSyntaxKit +text/swftext=jsyntaxpane.syntaxkits.SWFTextSyntaxKit \ No newline at end of file diff --git a/src/com/jpexs/decompiler/flash/gui/TextPanel.java b/src/com/jpexs/decompiler/flash/gui/TextPanel.java index 4b77383c9..aa2cce00e 100644 --- a/src/com/jpexs/decompiler/flash/gui/TextPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/TextPanel.java @@ -88,7 +88,7 @@ public class TextPanel extends JPanel implements ActionListener { } public void setText(String text) { - textValue.setContentType("text/swf_text"); + textValue.setContentType("text/swftext"); // textValue.setFont(new Font("Monospaced", Font.PLAIN, 13)); textValue.setText(text); textValue.setCaretPosition(0); diff --git a/src/com/jpexs/decompiler/flash/gui/abc/UndoFixedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/abc/UndoFixedEditorPane.java index 06fbc4a71..618a133cd 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/UndoFixedEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/UndoFixedEditorPane.java @@ -52,7 +52,9 @@ public class UndoFixedEditorPane extends JEditorPane { } try { - setContentType(contentType); + if (!getContentType().equals(contentType)) { + setContentType(contentType); + } Document doc = getDocument(); setDocument(new SyntaxDocument(null)); doc.remove(0, doc.getLength());