Merge pull request #540 in DESIGN/design from ~ALEX.SUNG/design:10.0 to 10.0

REPORT-11709 & REPORT-11692

* commit '01065e0accadc6759708de326f567b528120bb4e':
  傻逼了
  REPORT-11692 alphafine分词查询结果中包含了连词结果 代码质量
  REPORT-11709 AlphaFine整合小帆视觉验收 REPORT-11692 alphafine分词查询结果中包含了连词结果

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java

@@ -5,7 +5,7 @@ import com.fr.general.CloudCenter;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
-
+import java.util.ArrayList;
 
 /**
  * Created by XiaXiang on 2017/5/10.
@@ -137,5 +137,13 @@ public class AlphaFineConstants {
     public static final FileExtension[] FILE_EXTENSIONS= new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
 
     public static final int RECOMMEND_MAX_ITEM_NUM = 3;
+	
+	public static final String BACK_ICON_NAME = "back@1x.png";
+
+    public static final ArrayList<String> CONJUNCTION = new ArrayList<String>() {{
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_HE"));
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_YU"));
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_DE"));
+    }};
 
 }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/BottomCellRender.java

@@ -24,7 +24,7 @@ public class BottomCellRender implements ListCellRenderer<Object> {
 
         JPanel line = new JPanel();
         line.setPreferredSize(new Dimension(200, 1));
-        line.setBackground(AlphaFineConstants.GRAY);
+        line.setBackground(AlphaFineConstants.WHITE);
         panel.add(line, BorderLayout.NORTH);
 
         goToWebLabel.setFont(AlphaFineConstants.MEDIUM_FONT);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -239,6 +239,7 @@ public class AlphaFineDialog extends UIDialog {
         hotPane.setLayout(new BorderLayout());
 
         UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot"));
+		uiLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         uiLabel.setFont(AlphaFineConstants.SMALL_FONT);
         uiLabel.setForeground(AlphaFineConstants.DARK_GRAY);
 
@@ -1378,6 +1379,8 @@ public class AlphaFineDialog extends UIDialog {
     private void initBackPane() {
         backPane = new JPanel(new BorderLayout());
         JLabel jLabel = new JLabel("  <  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Back"));
+		jLabel.setIcon(IconLoader.getIcon(AlphaFineConstants.IMAGE_URL + AlphaFineConstants.BACK_ICON_NAME));
+        jLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
         jLabel.setPreferredSize(new Dimension(80, 20));
         jLabel.setFont(AlphaFineConstants.SMALL_FONT);
         jLabel.setForeground(AlphaFineConstants.DARK_GRAY);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java

@@ -72,7 +72,8 @@ public class SegmentationManager {
         int start = itor.first();
         for (int end = itor.next(); end != BreakIterator.DONE; start = end, end = itor.next()) {
             String temp = searchText.substring(start, end);
-            if (!StringUtils.isEmpty(temp)) {
+            //去掉空和连词
+            if (StringUtils.isNotEmpty(temp) && !AlphaFineConstants.CONJUNCTION.contains(temp)) {
                 result.add(temp);
             }
         }