From e05cddc378442f60b709bb6fb5e33995f7b971ca Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Tue, 10 Jun 2014 12:28:25 +0400 Subject: [PATCH] JavaFx SceneBuilder b-14 fix --- .../javaFX/FxBuilderEmbedder/lib/embedder.jar | Bin 12111 -> 11698 bytes .../sceneBuilder/SceneBuilderKitWrapper.java | 6 ------ 2 files changed, 6 deletions(-) diff --git a/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar b/plugins/javaFX/FxBuilderEmbedder/lib/embedder.jar index e853e975c5320b039fdfd94bc2997975e52a9dca..b18abec35c9b73b15810752001039780ea3938fe 100644 GIT binary patch delta 767 zcmX>fw<(%8z?+$ci-CcIfuS+!)I?roW)Nkp38vx=!PI06Fm=wA`C-DT$$G3lo0Axi zF~T|J%v->m&3dej%y7|v9C={Q=6s%C5Yc=dpUpc2I9WhSHXjk0CkQfia;jQHeemtP z%MJpzvuCd?oIL50Lv-HLSuC91HbN}{&dQFw9wJVacPwUaNKAHrZFY}vsHO*v4NK?#o-=c+KGG39ZJSBa2J!2>;T2uUWq-q}k%hs?%Gy{3=gAxMvFI;WB~O3+;uL zE#KKARKMub!l%mrW|e>Yt0FS-hTqax+;89iUGm23bIj+HE-%DPg|ZIvHtt)=Zg#Q1 z<>P!?&Zv6EeV3=JUCUh;(%-&5s+aZmqP$Nl!+4(l^gE&OOv~U-)E;ZL@^q=L&WVLn zEOvPOimRXVDxhS^+_%r(tCt>DscCq(+&{yo0u(bAUq^+ZWU@~w@^+0h?czOAqkQ4?;SA*^w@YOmlQA=BcEAF{3) z&iK{*GUDglzwHP6muz*JQJr)k*pz=;;D6?6cYojgzr7?jr(V(Be(v9*gl{W5b}jjN zMDkHlFfCARUkg{5#wj&>henkJQD^tM|6}HwA5e2~PhG>M z+s-QH-4V+sP32i@cKQIP)rlpcbCz&rtB7}8e=+COCjWZo0B?29pkCV;abMv)X=MC38qhKIf7|kZ4WRVp&bfNSsS!-!L))7gq{GQC+R}C f1-cbr>DN#?O)r}dn8;iZc2B;qm&LYPg8>Kt#jRc8 delta 1192 zcmdlKeLjviz?+$ci-CcIfq`dU(nMZmW)Nkp38vx=!PI06Fm=uqL`~LX^_iTj#lAU{ zaX%wm;4V<0j(IIuV6z@;BQs29^FNL}FlTc<&o78*K9A4l9Ri#zASIiRh|CjY=G|sL zIaMv9J~TI6+Et`(ndeP`>D#w#xpb>sn|o=`wO?)l(oBLWjH*+b>R!yuX)Ae=W}aU5 z=-~Q)EcKng7%jftkbltssUn?OHRQvbMV9Kt>F@6BJa7Cx_1pRVb@iMN7|lNIXb5DF zG93l68L8LVPpzq3Ce$Wr ze~ovauCFh*sOlckZPHlL3h?B8a)=!$8`Fg^_{}#eQCz3gMg45HFPY5rS zl-#;>Nt(pVgjS`j0^RLSk`i%&Mr)!E@0{zft*2}8k%QB>tUHz~d!lQT=Z>l(5B0Uy z;^Ky93eKL}US?IYqbn-+aC)oY)Clv|!Vf20IgR;F>7^MyU-0OWcKsP+o~2W6xwY2B zshnSR$$&@h;u@*7i`Wk5GVz2e=p5ubma^74J;>GVl}8JoSWHc?tM`fW4NsCJwe|KL z+|JYgFZ=6`2-m9zXLTQ6AT`fw_Wss1?JZyC$?SgYl{?$$V8KI=uUe8<)ZK3tX$ZY) zJ=kWl*@&Zc+EwNWP{`a}Lw|*+*eTwK- zn6k(EGP~!4^HU$rJ@m9xSIWk7b^G+J&V|lt(@N$xCGFU;VUOANT``~LpPP2g%U@f2 zwf9ofHtB!+!va1Uq-3s~vPH~3NTbT-(dw3@^6S6v)!Qy=7xeItF#crtsPyHj!i@Fx zeu;Xwtoi0|aaLe{yF&8%%Jw(iQ^a1J&C_3E*_Lws%H2*=nXms&zG9ija?jt>_w(!H zi{_cFzCQQBI^CkWmkJ@#)@LV#n@#(3*!gg$Zm;e|zJBZ7kLEr)?WF&&e*HtMyoK}k z$$u;7J7dRd61PZH{iMe{`TNYjP4DjWN%mhQbL4it$u3#uo(Ehf<6@3lr=;@#?~yT5 zSZ;6`5g=arj zS8M$F#P!*#c87yXvCH~?jyUz6z)6o={xk&WPM3&QTnPP$oa9$E}Q F008dW3jF{8 diff --git a/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java b/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java index 592401c7b96f..96f6c1bc4554 100644 --- a/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java +++ b/plugins/javaFX/FxBuilderEmbedder/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderKitWrapper.java @@ -15,12 +15,6 @@ import java.util.HashSet; */ public class SceneBuilderKitWrapper { public static SceneBuilder create(URL url, EditorCallback editorCallback) throws Exception { - // JavaFX -> Swing drag&drop fix - Field identifier = DataFormat.class.getDeclaredField("identifier"); - identifier.setAccessible(true); - identifier.set(AbstractDragSource.INTERNAL_DATA_FORMAT, Collections - .unmodifiableSet(new HashSet(Arrays.asList("application/scene.builder.internal")))); - // JavaFX class loading fix FXMLLoader.setDefaultClassLoader(SceneBuilderKitWrapper.class.getClassLoader());