冲突

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

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

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

@@ -27,7 +27,7 @@ public abstract class AbstractJavaScriptActionProvider extends AbstractProvider
         return getJavaScriptActionPane();
     }
 	
-    /**
+	/**
      * 判断是否是支持的类型（cpt,frm），默认是
      * @return
      */

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;
@@ -45,7 +46,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         Set<JavaScriptActionProvider> javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG);
         if (javaScriptActionProviders != null) {
             for (JavaScriptActionProvider jsp : javaScriptActionProviders) {
-                if(jsp.isSupportType()){
+               if(jsp.isSupportType()){
                     paneList.add(jsp.getJavaScriptActionPane(this));
                 }
             }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -155,7 +155,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
 					//vanChart 和 chart 之间切换
 					//不同chart之间切换
-                    editingCollection.removeNameObject(editingCollection.getSelectedIndex());
+					editingCollection.removeNameObject(editingCollection.getSelectedIndex());
                     editingCollection.addChart(newDefaultChart);
                     chart = newDefaultChart;
                 }

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.
  */
@@ -51,7 +49,7 @@ public class AlphaFineConstants {
 
     public static final Dimension HOT_ICON_LABEL_SIZE = new Dimension(36, 36);
 
-    public static final Dimension HOT_ISSUES_JAPNEL_SIZE = new Dimension(213, 182);
+    public static final Dimension HOT_ISSUES_JAPNEL_SIZE = new Dimension(213,182);
 
     public static final Dimension CLOSE_BUTTON_SIZE = new Dimension(40, 40);
 
@@ -85,7 +83,7 @@ public class AlphaFineConstants {
 
     public static final String IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/";
 
-    public static final String ALPHA_HOT_IMAGE_NAME = "alphafine_hot";
+    public static final String ALPHA_HOT_IMAGE_NAME  = "alphafine_hot";
 
     public static final String PLUGIN_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
 
@@ -136,11 +134,11 @@ public class AlphaFineConstants {
 
     public static final String FIRST_PAGE = "-1";
 
-    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
+    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 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"));

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;
@@ -239,21 +239,21 @@ 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.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         uiLabel.setFont(AlphaFineConstants.SMALL_FONT);
         uiLabel.setForeground(AlphaFineConstants.DARK_GRAY);
 
         GridLayout gridLayout = new GridLayout(2, 3, 3, 3);
         JPanel panel = new JPanel();
         panel.setLayout(gridLayout);
-        if (AlphaFineHelper.isNetworkOk()) {
+        if(AlphaFineHelper.isNetworkOk()) {
             if (hotData == null) {
                 hotData = HotIssuesManager.getInstance().getHotIssues();
             }
             for (int i = 0; i < hotData.length; i++) {
                 panel.add(new HotIssueJpanel(hotData[i], i + 1));
             }
-        } else {
+        }else {
             hotData = null;
             for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
                 panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
@@ -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) {
@@ -948,7 +948,7 @@ public class AlphaFineDialog extends UIDialog {
         Thread sendThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                if (StringUtils.isNotEmpty(storeText)) {
+                if(StringUtils.isNotEmpty(storeText)){
                     RecentSearchManager searchManager = RecentSearchManager.getInstance();
                     searchManager.addModel(storeText, cellModel);
                     sendDataToServer(storeText, cellModel);
@@ -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());
@@ -1379,7 +1379,7 @@ 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.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);