Merge pull request #1004 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit '47540321b5829aa21eb03177b32625842a00b626':
  补充单元测试
  REPORT-19857 英文版alphafine显示问题 1. 把判断国际化的过程和 点击配置页面才能更新 的逻辑解耦。放到启动的时候做。 2. 配置不依赖于 searchOnline 而是判断中英文。

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java

@@ -1,6 +1,5 @@
 package com.fr.design.actions.help.alphafine;
 
-import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
@@ -11,7 +10,7 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.IOUtils;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 
 /**
@@ -51,9 +50,6 @@ public class AlphaFineAction extends UpdateAction {
 
         final AlphaFineConfigPane alphaFineConfigPane = new AlphaFineConfigPane();
         final AlphaFineConfigManager manager = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager();
-        if (!FRContext.isChineseEnv()) {
-            manager.setSearchOnLine(false);
-        }
         alphaFineConfigPane.populate(manager);
         DialogActionListener dialogActionListener = new DialogActionAdapter() {
             public void doOk() {

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -189,23 +189,34 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     public void populate(AlphaFineConfigManager alphaFineConfigManager) {
+        
         this.enabledCheckbox.setSelected(alphaFineConfigManager.isEnabled());
-        this.searchOnlineCheckbox.setEnabled(FRContext.isChineseEnv());
+        
+        boolean enabled4Locale = FRContext.isChineseEnv();
+        
+        this.searchOnlineCheckbox.setEnabled(enabled4Locale);
         this.searchOnlineCheckbox.setSelected(alphaFineConfigManager.isSearchOnLine());
+        
         this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction());
         this.containTemplateCheckbox.setSelected(alphaFineConfigManager.isContainTemplate());
         this.containFileContentCheckbox.setSelected(alphaFineConfigManager.isContainFileContent());
+        
         this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && alphaFineConfigManager.isSearchOnLine());
-        this.containDocumentCheckbox.setEnabled(alphaFineConfigManager.isSearchOnLine());
+        this.containDocumentCheckbox.setEnabled(enabled4Locale);
+        
         this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && alphaFineConfigManager.isSearchOnLine());
-        this.containPluginCheckbox.setEnabled(alphaFineConfigManager.isSearchOnLine());
+        this.containPluginCheckbox.setEnabled(enabled4Locale);
+        
         this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && alphaFineConfigManager.isSearchOnLine());
-        this.containRecommendCheckbox.setEnabled(alphaFineConfigManager.isSearchOnLine());
+        this.containRecommendCheckbox.setEnabled(enabled4Locale);
+        
         this.shortcutsField.setText(getDisplayShortCut(alphaFineConfigManager.getShortcuts()));
 
         this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox());
+        
         this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && alphaFineConfigManager.isSearchOnLine());
-        this.needIntelligentCustomerService.setEnabled(alphaFineConfigManager.isSearchOnLine());
+        this.needIntelligentCustomerService.setEnabled(enabled4Locale);
+        
         shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts());
     }
 

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

@@ -15,6 +15,7 @@ import com.fr.design.mainframe.alphafine.search.manager.impl.PluginSearchManager
 import com.fr.design.mainframe.alphafine.search.manager.impl.RecentSearchManager;
 import com.fr.design.mainframe.alphafine.search.manager.impl.RecommendSearchManager;
 import com.fr.design.mainframe.alphafine.search.manager.impl.SimilarSearchManager;
+import com.fr.general.GeneralContext;
 import com.fr.general.ProcessCanceledException;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSON;
@@ -33,6 +34,25 @@ public class AlphaFineHelper {
     public static final NoResultModel NO_CONNECTION_MODEL = new NoResultModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed"));
     private static AlphaFineDialog alphaFineDialog;
     private static final String URL_FOR_TEST_NETWORK = "https://www.baidu.com";
+    
+    private AlphaFineHelper() {
+    
+    }
+    
+    /**
+     * 根据国际化调整配置
+     */
+    public static void switchConfig4Locale() {
+    
+        AlphaFineConfigManager manager = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager();
+        if (!GeneralContext.isChineseEnv()) {
+            manager.setSearchOnLine(false);
+            manager.setContainDocument(false);
+            manager.setContainPlugin(false);
+            manager.setContainRecommend(false);
+            manager.setNeedIntelligentCustomerService(false);
+        }
+    }
 
     /**
      * 弹出alphafine搜索面板

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -47,6 +47,7 @@ import com.fr.design.mainframe.InformationCollector;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.WidgetToolBarPane;
+import com.fr.design.mainframe.alphafine.AlphaFineHelper;
 import com.fr.design.mainframe.bbs.BBSGuestPane;
 import com.fr.design.mainframe.bbs.UserInfoPane;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
@@ -134,8 +135,9 @@ public class DesignerActivator extends Activator {
         DesignerSocketIO.update();
         UserInfoPane.getInstance().updateBBSUserInfo();
         storePassport();
+        AlphaFineHelper.switchConfig4Locale();
     }
-
+    
     private void loadLogAppender() {
         logHandler = new LogHandler<DesignerLogAppender>() {
             final DesignerLogAppender logAppender = new DesignerLogAppender();

designer-realize/src/test/java/com.fr/design/mainframe/alphafine/AlphaFineHelperTest.java

@@ -0,0 +1,46 @@
+package com.fr.design.mainframe.alphafine;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
+import com.fr.general.GeneralContext;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(PowerMockRunner.class)
+public class AlphaFineHelperTest {
+    
+    @Test
+    @PrepareForTest({GeneralContext.class, DesignerEnvManager.class})
+    @SuppressStaticInitializationFor("com.fr.design.mainframe.alphafine.AlphaFineHelper")
+    public void testSwitchConfig4Locale() throws Exception {
+    
+        PowerMock.mockStatic(GeneralContext.class);
+        EasyMock.expect(GeneralContext.isChineseEnv()).andReturn(true).times(1).andReturn(false).times(1);
+    
+        DesignerEnvManager manager = EasyMock.mock(DesignerEnvManager.class);
+        EasyMock.expect(manager.getAlphaFineConfigManager()).andReturn(new AlphaFineConfigManager()).anyTimes();
+        EasyMock.replay(manager);
+    
+        PowerMock.mockStatic(DesignerEnvManager.class);
+        EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(manager).anyTimes();
+        
+        PowerMock.replayAll();
+    
+        AlphaFineHelper.switchConfig4Locale();
+        AlphaFineConfigManager config = manager.getAlphaFineConfigManager();
+        Assert.assertEquals(true, config.isSearchOnLine());
+    
+        AlphaFineHelper.switchConfig4Locale();
+        Assert.assertEquals(false, config.isSearchOnLine());
+        
+    
+    }
+}