From dee05d46aff7ad9c091d0e92044cdc21e70113d9 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Fri, 29 Sep 2017 17:38:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=8D=A2?= =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/images/bigsearch.png | Bin 503 -> 461 bytes .../alphafine/images/bigsearch@2x.png | Bin 871 -> 761 bytes .../alphafine/images/smallsearch.png | Bin 15320 -> 299 bytes .../alphafine/images/smallsearch@2x.png | Bin 15732 -> 539 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/bigsearch.png b/designer/src/com/fr/design/mainframe/alphafine/images/bigsearch.png index 192a8131dd0842ac8230341edb4ef54c29708b7e..83576a2161e2f2123c262ce8d7b6347ae1c6a4d8 100644 GIT binary patch delta 414 zcmV;P0b&041I+`FIe&jiL_t(Y$Gw%$ae_b;hd*p!>A-YgGUMItKs&%Yhma2FAmrd3 zJHQU~z6Vl*9Y_V_@?(Zs7ZhXiyEwr5zW3g~KT+GZ_*(873v2-k%)QSipaM#lnhQ4+ z^#RLW69Xl%)~g1nd*@?d(fhV_sj2P)EO*VTJevb&Aa|)L1Ao!I06CE8)t5_6HVTmE zwT$n9>{j?nV+9!C!= zAOgMt>rVrJA7sF%9?$a1-v^uCsBSdqI$c2`f1@cyg}fV5my$x2vlxOzp_SQ7gAKI* zv0p9PC4-Pbz{FA=gggZ>0y#Vl5P&p*ed@5&#aiH?I~S;b0PA|Y#^#9w2><{907*qo IM6N<$f@1;0h5!Hn delta 456 zcmV;(0XP251NQ@vIe)21L_t(Y$E}siZNfkhhCkfE(gAb;QGCZ8;10rl4 zAT9kIsDLfQ^1#knQ;!0qrC*C@+T*J{Yk;Nva=@r}zMM7tUVngieo@BH;$0K_C@uXS zI4IDEv!>_+)G94UXU%RXKN9gtL0+6Sm+-wr3fdY!k1-A)#&Y#28bKo6(rT1(1vvpn z`MXI=zl;I0wxG_MCM|uPmi{z>qq``J0ouaW;=y)e6dDkXpjD$@m=XcNt?M8O==Uy9 z2DBIjkj}Wpa(~&=uD#AAGE}IRD}ureNw@01)XrYN?|a~LXd*kj*Bih)Yv!>CDp_0r z2bs{ZDpdY^S49r|s4bbx5cPRp0B>rB)IOe}Vk~0000kP9VH6&Q?>pahn{ z1Tn!1%o4yH0W_lq*a1-i9eC+Ep8@GU#K$w*83ocn*nRuC+g&Vfw;Qe!7i|P=fCPvD z)$v#hG(ZKM>P$5ZAPZZ7xM-h&97utchpr1y0{c2s*HHoDqJPbSU5}?-r3H3%ruKsa zNUD^;y2p@{q)AtLMDnxg0e=J1(A4S$h>Lb3#+%B|k_IP-n%PMDy>vJsb$OQ+KwPvb zaOlY4w9ZuJt1K?sM4V#Q(6-K0>GRHIkGD+Yk3bY+Jb?UvB=6JZAbP_hAUR(dY2)pk zPoiN)xdjr}ntw1OP>x}|M56?@+Mkr@_e&u;D)rOmIF#`Qgq}`ovBM2OE~%YSusP#M zF8c1W6MLK@kQ=F!KJvEwBnnr#-St$;T>rZR}^iVYu1AjC|GiU{%W(uHe0sd?G0{8-W z06^-_8U-i{go|%e)}ok(e42gnz_BO>I#-J!d;C1dKrru5mLrnR7;2n4ZzJ)+c`h`a7q3Usv6~yG<$U-3& zbNEUb0^tQPU`yc)F`JQ6j7r4FK3M~me%Z}xCPwywm`w`#rqe6|93Wn2yH>GCr){07 z)2#PGA3*$R^Jl-<>VWubMwx95^wdORHj%#o&%}1|%{X;700000NkvXXu0mjfC}dY; delta 828 zcmV-C1H=6J1?L8kIDZ2fNklN<5QaZEGmhuLW61cN`wGchRLP%V@w^;wa zuhf!Ak~ex|2`3GtzM*>XKy6W83xmXzQtmNBsSXVxo1*oUC4V3%Y6mdC5PJXpDFc3) zJl|I;R9p{68Idyku+F7eMFg z3NGgKlrnF02YeU^xfh-o1t4N?Q0K~&=0r-MQn6dce#H;~$fOwca00YD~DUe!Tm%jlqn~~_x#f}L800003(7$a{PQ#F7Ec67P}E`+vW zKt+rZW2!CSff8`QIq}qj-he|0?IQ)Ow0f5wSzX0xfs&7=w-vc?Ozbo1Dh1m1ALOM(u2$b3_vck0SV*?)GuMoW04xNR!{%{ O002ovPDHLkU;%=dpKG}Q literal 15320 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 Bp9%l~ From 8e3cfd5fb73f4104f027c9820c7e2abdf9dbd112 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Fri, 29 Sep 2017 18:11:12 +0800 Subject: [PATCH 2/2] rt --- .../src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java | 3 +++ designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java index 012f5e872..d09a5749a 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java +++ b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java @@ -26,6 +26,9 @@ public class AlphaFineHelper { * 弹出alphafine搜索面板 */ public static void showAlphaFineDialog(boolean forceOpen) { + if (!AlphaFineConfigManager.isALPHALicAvailable()) { + return; + } if (alphaFineDialog == null) { alphaFineDialog = new AlphaFineDialog(DesignerContext.getDesignerFrame(), forceOpen); alphaFineDialog.setVisible(true); diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index c85763a89..5135cf299 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -339,7 +339,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta processor = new DefaultTitlePlace(); } processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); - if (AlphaFineConfigManager.isALPHALicAvailable() && DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { + if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { northEastPane.add(ad.createAlphaFinePane(), BorderLayout.CENTER); } }