REPORT-111995 代码质量

designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java

@@ -1,9 +1,11 @@
 package com.fr.design.actions.server;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.DesignUtils;
 
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 
 public class PlatformManagerAction extends UpdateAction {

designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java

@@ -113,7 +113,25 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
         }
         DSColumn dSColumn = (DSColumn) cellElement.getValue();
         recordGrouper = dSColumn.getGrouper();
-        if (recordGrouper instanceof FunctionGrouper && !((FunctionGrouper) recordGrouper).isCustom()) {
+        if (recordGrouper instanceof FunctionGrouper) {
+            populateFunctionGrouper();
+        } else if (recordGrouper instanceof SummaryGrouper) {
+            cardPane.select("summaryPane").populate();
+            this.goBox.setSelectedIndex(BIND_SUMMARY);
+            this.functionComboBox.setFunction(((SummaryGrouper) recordGrouper).getFunction());
+        } else if (recordGrouper instanceof CustomGrouper) {
+            // 自定义分组 or 高级分组
+            cardPane.select("groupPane").populate();
+            this.goBox.setSelectedIndex(BIND_GROUP);
+            this.groupComboBox.setSelectedIndex(ADVANCED);
+        }
+        checkButtonEnabled();
+        //加上面板组件的交互事件监听
+        this.addListener();
+    }
+
+    private void populateFunctionGrouper() {
+        if (!((FunctionGrouper) recordGrouper).isCustom()) {
             int mode = recordGrouper.getDivideMode();
             if (mode == FunctionGrouper.GROUPING_MODE) {
                 cardPane.select("groupPane").populate();
@@ -127,24 +145,12 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
                 cardPane.setVisible(false);
                 this.goBox.setSelectedIndex(BIND_SELECTED);
             }
-        } else if (recordGrouper instanceof FunctionGrouper && ((FunctionGrouper) recordGrouper).isCustom()) {
+        } else {
             // 这种情况也放到自定义分组里面
             cardPane.select("groupPane").populate();
             this.goBox.setSelectedIndex(BIND_GROUP);
             this.groupComboBox.setSelectedIndex(ADVANCED);
-        } else if (recordGrouper instanceof SummaryGrouper) {
-            cardPane.select("summaryPane").populate();
-            this.goBox.setSelectedIndex(BIND_SUMMARY);
-            this.functionComboBox.setFunction(((SummaryGrouper) recordGrouper).getFunction());
-        } else if (recordGrouper instanceof CustomGrouper) {
-            // 自定义分组 or 高级分组
-            cardPane.select("groupPane").populate();
-            this.goBox.setSelectedIndex(BIND_GROUP);
-            this.groupComboBox.setSelectedIndex(ADVANCED);
         }
-        checkButtonEnabled();
-        //加上面板组件的交互事件监听
-        this.addListener();
     }
 
     @Override