From d891df9538d99d07fb3dc88ad649e7453d1746b3 Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Tue, 9 Oct 2018 10:14:54 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-11692=20alphafine=E5=88=86=E8=AF=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E4=BA=86=E8=BF=9E=E8=AF=8D=E7=BB=93=E6=9E=9C=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alphafine/AlphaFineConstants.java         |  6 ++---
 .../manager/impl/SegmentationManager.java     | 22 ++-----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
index 250116542..1166efad8 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
@@ -141,9 +141,9 @@ public class AlphaFineConstants {
 	public static final String BACK_ICON_NAME = "back@1x.png";
 
     public static final ArrayList<String> CONJUNCTION = new ArrayList<String>() {{
-        add("和");
-        add("与");
-        add("的");
+        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"));
     }};
 
 }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java
index 7ca123a35..49075769b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java
@@ -6,7 +6,6 @@ import com.fr.stable.StringUtils;
 import com.fr.third.ibm.icu.text.BreakIterator;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -73,30 +72,13 @@ 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.isEmpty(temp) & !AlphaFineConstants.CONJUNCTION.contains(temp)) {
                 result.add(temp);
             }
         }
-		result = removeConjunction(result);
         String[] strings = new String[result.size()];
         result.toArray(strings);
         return strings;
     }
-	
-	/**
-     * 去除连词
-     *
-     * @param result
-     * @return
-     */
-    public static List<String> removeConjunction(List<String> result) {
-        Iterator<String> it = result.iterator();
-        while (it.hasNext()) {
-            String s = it.next();
-            if (AlphaFineConstants.CONJUNCTION.contains(s)) {
-                it.remove();
-            }
-        }
-        return result;
-    }
 }