冲突

designer-base/src/main/java/com/fr/design/fun/JavaScriptActionProvider.java

@@ -19,5 +19,4 @@ public interface JavaScriptActionProvider extends Mutable{
     FurtherBasicBeanPane<? extends JavaScript> getJavaScriptActionPane(JavaScriptActionPane pane);
 
 	boolean isSupportType();
-
 }

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.frpane.UIComboBoxPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.form.ui.WebContentUtils;
+
 import com.fr.js.JavaScript;
 
 import javax.swing.BorderFactory;

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

@@ -2,13 +2,11 @@ package com.fr.design.mainframe.alphafine;
 
 import com.fr.base.extension.FileExtension;
 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.
  */

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

@@ -32,7 +32,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.SegmentationManager;
-import com.fr.design.mainframe.alphafine.search.manager.impl.SimilarSearchManager;
+import com.fr.design.mainframe.alphafine.search.manager.impl.SimilarSearchManeger;
 import com.fr.design.mainframe.errorinfo.ErrorInfoUploader;
 import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.form.main.Form;
@@ -573,7 +573,7 @@ public class AlphaFineDialog extends UIDialog {
     }
 
     private void buildSimilarList(final String[] searchText) {
-        addSearchResult(SimilarSearchManager.getInstance().getLessSearchResult(searchText));
+        addSearchResult(SimilarSearchManeger.getInstance().getLessSearchResult(searchText));
     }
 
     private synchronized void addSearchResult(SearchResult searchResult) {
@@ -1052,7 +1052,7 @@ public class AlphaFineDialog extends UIDialog {
                 break;
             case ROBOT:
             case RECOMMEND_ROBOT:
-                moreResult = SimilarSearchManager.getInstance().getMoreSearchResult(searchTextField.getText());
+                moreResult = SimilarSearchManeger.getInstance().getMoreSearchResult(searchTextField.getText());
                 break;
             case RECOMMEND:
                 moreResult = RecommendSearchManager.getInstance().getMoreSearchResult(searchTextField.getText());