REPORT-23978 代码合并出错

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -47,10 +47,36 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.vcs.VcsOperator;
 import com.fr.workspace.server.vcs.git.config.GcConfig;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import javax.swing.event.*;
+import javax.swing.BoxLayout;
-import java.awt.*;
+import javax.swing.JDialog;
-import java.awt.event.*;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import javax.swing.Timer;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.text.DecimalFormat;
 import java.util.Locale;
@@ -208,7 +234,7 @@ public class PreferencePane extends BasicPane {
         joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve"));
         improvePane.add(joinProductImproveCheckBox);
 
-        if(SupportOSImpl.AUTOPUSHUPDATE.support()){
+        if (SupportOSImpl.AUTOPUSHUPDATE.support()) {
             autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update"));
             improvePane.add(autoPushUpdateCheckBox);
         }
@@ -486,23 +512,8 @@ public class PreferencePane extends BasicPane {
         JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + i18nText("Fine-Design_Basic_Level_Setting"));
         logPane.add(logLevelPane);
         logLevelComboBox = new UIComboBox(LOG);
+        logLevelComboBox.setEnabled(WorkContext.getCurrent().isLocal());
         logLevelPane.add(logLevelComboBox);
-        logLevelComboBox.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Configurations.update(new Worker() {
-                    @Override
-                    public void run() {
-                        Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem());
-                    }
-
-                    @Override
-                    public Class<? extends Configuration>[] targets() {
-                        return new Class[]{Log4jConfig.class};
-                    }
-                });
-            }
-        });
     }
 
     private void createLanPane(JPanel generalPane) {
@@ -530,8 +541,8 @@ public class PreferencePane extends BasicPane {
         });
         UILabel noticeLabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
+        double[] rowSize = {p};
-        double columnSize[] = {p, p, p};
+        double[] columnSize = {p, p, p};
         Component[][] components = {
                 {languageLabel, languageComboBox, noticeLabel},
         };
@@ -571,7 +582,7 @@ public class PreferencePane extends BasicPane {
 
     private void createLengthPane(JPanel advancePane) {
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
+        double[] rowSize = {p};
 
         // 长度单位选择
         JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
@@ -593,8 +604,8 @@ public class PreferencePane extends BasicPane {
 
     private void createServerPane(JPanel advancePane) {
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
+        double[] rowSize = {p};
-        double columnSize[] = {p, p, p};
+        double[] columnSize = {p, p, p};
 
         JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Web_Preview_Port_Setting"));
         advancePane.add(serverPortPane);
@@ -633,7 +644,7 @@ public class PreferencePane extends BasicPane {
     /**
      * The method  of populate.
      *
-     * @param designerEnvManager
+     * @param designerEnvManager 设计器环境管理器
      */
     public void populate(DesignerEnvManager designerEnvManager) {
         if (designerEnvManager == null) {
@@ -662,7 +673,7 @@ public class PreferencePane extends BasicPane {
             defaultStringToFormulaBox.setSelected(false);
         }
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
-        if (FineClusterConfig.getInstance().isCluster()) {
+        if (ClusterBridge.isClusterMode()) {
             vcsEnableCheckBox.setEnabled(false);
             gcEnableCheckBox.setEnabled(false);
         }
@@ -801,17 +812,24 @@ public class PreferencePane extends BasicPane {
             designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
         }
 
-        Configurations.update(new Worker() {
+        if (WorkContext.getCurrent().isLocal()) {
-            @Override
+            Configurations.update(new Worker() {
-            public void run() {
+                @Override
-                Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem()));
+                public void run() {
-            }
+                    Level level = (Level) logLevelComboBox.getSelectedItem();
+                    if (level != null) {
+                        Log4jConfig.getInstance().setRootLevel(level);
+                    }
+                }
 
-            @Override
+                @Override
-            public Class<? extends Configuration>[] targets() {
+                public Class<? extends Configuration>[] targets() {
-                return new Class[]{Log4jConfig.class};
+                    @SuppressWarnings("unchecked")
-            }
+                    Class<? extends Configuration>[] classes = new Class[]{Log4jConfig.class};
-        });
+                    return classes;
+                }
+            });
+        }
 
         Configurations.update(new Worker() {
             @Override