From 8df0382bf9cfc1650b7764c422a54ad9ff932443 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 17 Feb 2015 14:38:34 +0300 Subject: [PATCH 1/3] incomplete javadoc removed --- .../src/com/intellij/openapi/fileEditor/FileEditorProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java index 140de948a336..3279c9fc6a39 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java +++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/FileEditorProvider.java @@ -36,7 +36,6 @@ public interface FileEditorProvider { Key KEY = Key.create("com.intellij.fileEditorProvider"); /** - * If provider is not dumb-aware, and it is the only * @param file file to be tested for acceptance. This * parameter is never null. * From 2d8cd1fb459ee53de56aa567a2615ec28bef4316 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 18 Feb 2015 11:55:05 +0300 Subject: [PATCH 2/3] adding editor fixes --- .../intellij/openapi/fileEditor/impl/EditorComposite.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java index ce5b90c91285..790160ba9a5a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorComposite.java @@ -463,8 +463,11 @@ public abstract class EditorComposite implements Disposable { myComponent.setComponent(myTabbedPaneWrapper.getComponent()); } else { - myTabbedPaneWrapper.addTab(editor.getName(), editor.getComponent()); + JComponent component = createEditorComponent(editor); + myTabbedPaneWrapper.addTab(editor.getName(), component); } + myFocusWatcher.deinstall(myFocusWatcher.getTopComponent()); + myFocusWatcher.install(myComponent); myEditors = editors; } From fffddd2420528020318a6a092ab8b99320759314 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 18 Feb 2015 12:16:56 +0300 Subject: [PATCH 3/3] icon size optimized --- .../impl/resources/icons/CollapseMerges.png | Bin 229 -> 120 bytes .../impl/resources/icons/CollapseMerges@2x.png | Bin 371 -> 178 bytes .../resources/icons/CollapseMerges@2x_dark.png | Bin 314 -> 178 bytes .../resources/icons/CollapseMerges_dark.png | Bin 231 -> 120 bytes .../impl/resources/icons/ExpandMerges.png | Bin 230 -> 121 bytes .../impl/resources/icons/ExpandMerges@2x.png | Bin 377 -> 193 bytes .../resources/icons/ExpandMerges@2x_dark.png | Bin 339 -> 194 bytes .../impl/resources/icons/ExpandMerges_dark.png | Bin 232 -> 122 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges.png b/platform/vcs-log/impl/resources/icons/CollapseMerges.png index 8f7aa5c6fb8c02b05ef4966074e53c1ef9e67e86..6db6ed9056577c905513fa1e50fd7e4da0bfc60b 100644 GIT binary patch delta 90 zcmaFLSTR8*#NN}zF{I*Fa)JbFGtZN!PjeX_RoQ&vb=V^}pK+7JAIaH@0cRB~B}+R0 uTNKz%npG9^%A@q4I*)jODUTatB?H5sT<3k$Ur*f100f?{elF{r5}E*k=_649 delta 200 zcmb<;$~Zx#o-N7S-G$*l2rk&Wd@=(A180FpWHAE+w=f7ZGR&GI0Tg5}@$_|Nzt6b>mZ5AyagoRKU({h(05qF4Qc+$5bTTenI` z3S4;Tv;XITlLsf5cuUoNalZ5=cDKkm(H&RYJe;@|oImF_>C4SXiEZyKZ5RS42W?!+ z7lr*<{an^LB{Ts55<^X< diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png b/platform/vcs-log/impl/resources/icons/CollapseMerges@2x.png index 75be03ec2788fd6c79aa3719a06667cfef687ca4..53daece20cd1bf9a5584dff0c2a5ab522642c474 100644 GIT binary patch delta 150 zcmV;H0BQg80RB!fL;IqW7y#10uPk&=>Px#07*qoM6N<$ Ef)jo^mjD0& delta 344 zcmV-e0jK`50rLWoB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra0tgHwC|!@w?EnA)07*naR9M69lr2&NK@f$%4Ta$f7(DS$5)-f-As7r* zbA@cK&{gQb2?CNrKxBKWxIqMk#zcS_u_8Y+Yl7&{PIteaH-9}1K@bGNfjQcCkW!jU zdXj{@FZ&cvDYcT`B%QhY^QM@=j{G~|6KGRP(>~(B6!^%s>Kt(QwWK950md~>bi{vv zD>GYFH;|k7lC%P@fl)~l9dUqLGke_?-{hp<3U^yGn-z%f#mt()p?^VB@SYQ3zVG&1 zT(~i_hhE<>7f~Am3*fj!JkQO$qy`uPmy#Cl{@rH}oB%JtX{q>zCdR;pq(^sO*Y1IP q;JjA6Ghi(+1BSU)5ClQ+KluZi*JvPE(v|=K0000z>Ef{8S}}} z%mu{P$aMsg<(ENbk?R8;ApT0KBakcy>D8t*DiWZE5#J!MqERpkM!_f;1@r;{kgiV-><}*&-F~2jt)%1R0Jayv1*pfE4=mwQ(!F>IZP&o5)I7g!0-8K~&RWI4-~h}^ l&0mCAWUU|wf*9aGc>+(&UZgofNdy1@002ovPDHLkV1l($cbWhI diff --git a/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png b/platform/vcs-log/impl/resources/icons/CollapseMerges_dark.png index e5af04bfcd721ace92204d1a5ee528edc63b0aea..6fc4b35f523ae237b834a47c85d6c49dd3d135e0 100644 GIT binary patch delta 90 zcmV-g0Hy!u0eFxkR6j{XK~#9!V_+BsgA5!!dUOL2*W;0I0OIxd43Gul&)5usY6i*4 wpiBJ6f$Ndf)Z602FFwXo}+SiU0rr07*qoM6N<$g7E1kwg3PC delta 202 zcmb<;&NxA(o-N7S-G$*l2rk&Wd@=(A180FpWHAE+w=f7ZGR&GI0Tg5}@$_|Nzt6@Ep4|P{Y2WLKWdH(CS3j3^P6E7-Dhy?WEnj%?<)C_b;|fFECeQC_1;()gYWByGpp^H@jY-{S2P2elF{r5}E+<_(%%? diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x.png index 27c572c6919b7a8fb5aaeb2e09908a0ed0f67737..f82a66e9743b8784793610b20a0e543c19e480e4 100644 GIT binary patch delta 165 zcmey#bdYg^N_~f?i(^Q|t>gp=*2M`TJxzfI5{_|kam)h$*&lrkG00}VvZg9X_dm}O zqmY6Iohv$r`W!aNw0vGEv53{<*)`$hpOOk`%N8+5EJ#bTVmiUe`slI8B$q^;X@ArO z^VyShC%EY<+%sh0W2m&sc(Ay^uhU@uf~OHOA3NXOEC>*BSu6*!lj{X9LmbO5|Ia}# QHVi=E>FVdQ&MBb@0FgLA*Z=?k delta 350 zcmV-k0ipiE0r>)uB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra0tgH#8&~nrwg3PD21!IgR9M69l(9+!K@f(&J;h4F7qGWaF@jA>JF)O7 zG*c+p=6r=o-oRQ&DWr*=Q&{>S2Ej_S$$@Mxfp81g%vbKh{C_+D>^~3$K@jvzYCBZb z8W;mJGrQ^{psF+A5~$7WF~6_2h<^d20!@xqwQ5xz=a+jM!~q`6Y~EGf-IpTr4O{?2 z5y9PG*Br>i-+^htQBPMj$(=~5dJWtGXS-B1vy{2_yW^u?fcpyg06u#Nz%g)|wv0f` z?5Bj1s_p}Cz*nFdLz9T=pQSa>#AE>67VP$>O?)i{?!FL_1Pp<55qWa=WykJMfM?*K wZ5LE6pQ~}=2$&S;egYhBT0}t*1VQio0o;XFilPocrvLx|07*qoM6N<$f~w7yH~;_u diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges@2x_dark.png index 22ff8c99a712108ef1ac45bac9663be0d6060eb7..26c98cbdedc4f23f8ca7253b0cf9b49f400101db 100644 GIT binary patch delta 166 zcmcc2bck_+N`0rNi(^Q|t>gp=*2M`TJxzfI5(h6Xc9(AWVK1LNic6D6EC5-r@MK{_ubzIhG7`SKYyaCnX2AYbs0cw<+M`Y zd+aj@Qs4q40qRMdR_040E-?p~ipcR>cM&-NGZz+;h)c}3z#`yO7f!Q~M5L+%U<~vt zRu;W=?^ZFXH86>R9dP==t~Y^p^kD=&5xEAssv58Xx{oo4NdB?|B9Z~Q3%kH5V6{V^ zIY9K`49`I4+c8T})fTV^>hI>>f8ePT4PYLi`gxhTVHk$-7u*4#LRoug!D=-C0000< KMNUMnLSTY%YktiD diff --git a/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png b/platform/vcs-log/impl/resources/icons/ExpandMerges_dark.png index 6d5d8f1c562ea481239c388cc7bf29ad96dc598b..4089cbeb437f4d8f0b4d3e16e2f083927db27b66 100644 GIT binary patch delta 92 zcmaFCST#W<%+b@uF{I*Fa)JbFGlz_A)fUE%>%t53m<6sUU;ZQ6k=kM4Ahv3ooLT_? wk^dVLReb*!KB!6&uTeV98p7Ee=pf0!AmWymAz9(HkpT!iUHx3vIVCg!08aNH>i_@% delta 203 zcmb<=!8k#so-N7S-G$*l2rk&Wd@=(A180FpWHAE+w=f7ZGR&GI0Tg5}@$_|Nzt6wjB33Hy4&touHPi_!nI+U!fM7}IYO5N`e#gX;`%Xf#?cMC z7qG@n+Ga1BmB4B@sZC4OHGySW6IZa9{rqCVI)=5H1!uIEoCCUm!PC{xWt~$(697uD BO6ULp