Merge pull request #1322 in DESIGN/design from feature/10.0 to research/10.0

* commit '5ced907f129ac7739841948bea56c54b5e4ebf16': (380 commits)
  无jira任务, sonar问题
  CHART-11446 未选择数据集灰化了combox
  CHART-11446 未选择数据集灰化了combox
  CHART-11242 标题界面
  CHART-11513 数据集配置面板布局优化
  sonar问题
  CHART-11424 fix 补充几种图表单元格数据面板 数据筛选组件
  fix 雷达图轴面板NPE
  CHART-11424 fix 数据集面板-数据筛选
  CHART-11093 fix 数据面板切换
  代码质量
  有些层级可能没配数据
  REPORT-23978 代码合并出错
  REPORT-20330 sonar问题修复 常量放最上面
  REPORT-20330 sonar问题修复 修复 sonar 问题
  CHART-10227 地图 钻取地图 热力地图 数据配置界面
  CHART-11093 不实例化，类型不同就不populate 验证了没问题
  CHART-11093 反射获取相应数据面板对应的数据类型
  CHART-11321 fix 坐标轴显示策略面板checkUse
  CHART-11093 refactor 数据面板切换
  ...

designer-base/src/main/java/com/fr/design/DesignModelAdapter.java

@@ -7,8 +7,11 @@ import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.JTemplateProvider;
+import com.fr.form.ui.DataControl;
+import com.fr.form.ui.MultiFileEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
 import com.fr.stable.js.WidgetName;
 
 import java.util.Iterator;
@@ -214,6 +217,17 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
 
     public abstract List<WidgetName> getWidgetsName();
 
+    /**
+     * 判断是否是值编辑器可以设置的控件类型
+     * @param widget 控件
+     * @return 可以设置返回true，否则返回false
+     */
+    public boolean widgetAccepted(Widget widget) {
+        return widget != null
+                && StringUtils.isNotEmpty(widget.getWidgetName())
+                && (widget instanceof DataControl || widget instanceof MultiFileEditor);
+    }
+
     /**
      * 更新缓存的参数
      */

designer-base/src/main/java/com/fr/design/DesignState.java

@@ -1,9 +1,7 @@
 package com.fr.design;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.workspace.WorkContext;
 
 /**
  * Created by IntelliJ IDEA.

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -24,6 +24,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.general.SupportLocale;
 import com.fr.general.locale.LocaleCenter;
 import com.fr.general.locale.LocaleMark;
 import com.fr.general.xml.GeneralXMLTools;
@@ -116,7 +117,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private Color paginationLineColor = Color.black; // line color of paper
     private boolean supportCellEditorDef = false;
     private boolean isDragPermited = false;
-    private Locale language = Locale.getDefault();
+    private Locale language = checkLocale(Locale.getDefault());
     //2014-8-26默认显示全部, 因为以前的版本, 虽然是false, 实际上是显示所有表, 因此这边要兼容
     private boolean useOracleSystemSpace = true;
     private int cachingTemplateLimit = CACHINGTEMPLATE_LIMIT;
@@ -144,6 +145,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     //记录当前激活码的在线激活状态.
     private int activeKeyStatus = -1;
     private boolean joinProductImprove = true;
+
+    private boolean embedServerLazyStartup = false;
     //最近使用的颜色
     private ColorSelectConfigManager configManager = new ColorSelectConfigManager();
     /**
@@ -263,6 +266,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error("Map Save Error");
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -658,9 +662,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      */
     public void saveXMLFile() {
         File xmlFile = this.getDesignerEnvFile();
-        if (xmlFile == null) {
-            return;
-        }
         if (!xmlFile.getParentFile().exists()) {//建立目录.
             StableUtils.mkdirs(xmlFile.getParentFile());
         }
@@ -719,6 +720,24 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         designerPushUpdateConfigManager.setAutoPushUpdateEnabled(autoPushUpdateEnabled);
     }
 
+    /**
+     * 内置服务器是否使用时启动
+     *
+     * @return 结果
+     */
+    public boolean isEmbedServerLazyStartup() {
+        return embedServerLazyStartup;
+    }
+
+    /**
+     * 设置内置服务器使用时启动
+     *
+     * @param embedServerLazyStartup 使用时启动
+     */
+    public void setEmbedServerLazyStartup(boolean embedServerLazyStartup) {
+        this.embedServerLazyStartup = embedServerLazyStartup;
+    }
+
     /**
      * 是否磁盘空间参数
      *
@@ -1325,7 +1344,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         String tmpVal;
         if ((tmpVal = reader.getElementValue()) != null) {
             if (!CommonUtils.isNumber(tmpVal)) {
-                setLanguage(CommonUtils.stringToLocale(tmpVal));
+                setLanguage(checkLocale(CommonUtils.stringToLocale(tmpVal)));
             } else {
                 // 用于兼容10.0之前的版本
                 int value = Integer.parseInt(tmpVal);
@@ -1374,6 +1393,16 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    /**
+     * 对国际化进行校验
+     * 非简繁英日韩的默认环境 设计器全部默认为英文版本
+     * @param locale
+     * @return
+     */
+    private Locale checkLocale(Locale locale) {
+        return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US;
+    }
+
     private void readReportLengthUnit(XMLableReader reader) {
         String tmpVal;
         if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {
@@ -1606,6 +1635,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if ((tmpVal = reader.getAttrAsString("recentSelectedConnection", null)) != null) {
             this.setRecentSelectedConnection(tmpVal);
         }
+        this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
     }
 
     private void readReportPaneAttributions(XMLableReader reader) {
@@ -1850,6 +1880,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (this.isTemplateTreePaneExpanded()) {
             writer.attr("templateTreePaneExpanded", this.isTemplateTreePaneExpanded());
         }
+        if (this.isEmbedServerLazyStartup()) {
+            writer.attr("embedServerLazyStartup", this.isEmbedServerLazyStartup());
+        }
         writer.end();
     }
 

designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@@ -5,6 +5,7 @@
 package com.fr.design;
 
 import com.fr.base.BaseUtils;
+import com.fr.common.annotations.Open;
 import com.fr.design.data.datapane.TableDataNameObjectCreator;
 import com.fr.design.fun.*;
 import com.fr.design.gui.core.WidgetOption;
@@ -19,6 +20,7 @@ import com.fr.plugin.AbstractExtraClassManager;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
 import com.fr.plugin.solution.closeable.CloseableContainedSet;
+import com.fr.stable.Filter;
 import com.fr.stable.plugin.ExtraDesignClassManagerProvider;
 
 import java.util.ArrayList;
@@ -34,12 +36,13 @@ import java.util.Set;
  * @since : 8.0
  * 用于设计器扩展的管理类
  */
+@Open
 public class ExtraDesignClassManager extends AbstractExtraClassManager implements ExtraDesignClassManagerProvider {
 
     private static ExtraDesignClassManager classManager = new ExtraDesignClassManager();
 
     private Set<ShortCut> shortCuts = new CloseableContainedSet<>(HashSet.class);
-    
+
     public static ExtraDesignClassManager getInstance() {
         return classManager;
     }
@@ -109,26 +112,39 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         return result.toArray(new WidgetOption[result.size()]);
     }
 
-
     public WidgetOption[] getWebWidgetOptions() {
+        return getWebWidgetOptions(new Filter<ToolbarItemProvider>() {
+            @Override
+            public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                return true;
+            }
+        });
+    }
+
+    public WidgetOption[] getWebWidgetOptions(Filter<ToolbarItemProvider> filter) {
         Set<ToolbarItemProvider> set = getArray(ToolbarItemProvider.XML_TAG);
-        if (set.isEmpty()) {
+        return getWebWidgetOptions(set, filter);
+    }
+
+    public WidgetOption[] getWebWidgetOptions(Set<ToolbarItemProvider> set, Filter<ToolbarItemProvider> filter) {
+        if (set == null || set.isEmpty()) {
             return new WidgetOption[0];
         }
         List<WidgetOption> list = new ArrayList<>();
         for (ToolbarItemProvider provider : set) {
-            WidgetOption option = WidgetOptionFactory.createByWidgetClass(
-                    provider.nameForWidget(),
-                    IOUtils.readIcon(provider.iconPathForWidget()),
-                    provider.classForWidget()
-            );
-            list.add(option);
+            if (filter != null && filter.accept(provider)) {
+                WidgetOption option = WidgetOptionFactory.createByWidgetClass(
+                        provider.nameForWidget(),
+                        IOUtils.readIcon(provider.iconPathForWidget()),
+                        provider.classForWidget()
+                );
+                list.add(option);
+            }
         }
         return list.toArray(new WidgetOption[list.size()]);
     }
 
 
-
     public Map<Class<? extends Widget>, Class<?>> getFormWidgetOptionsMap() {
         Set<FormWidgetOptionProvider> set = getArray(FormWidgetOptionProvider.XML_TAG);
         Map<Class<? extends Widget>, Class<?>> map = new HashMap<>();
@@ -166,7 +182,6 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
     }
 
 
-
     public WidgetOption[] getCellWidgetOptions() {
         Set<CellWidgetOptionProvider> set = getArray(CellWidgetOptionProvider.XML_TAG);
         if (set.isEmpty()) {

designer-base/src/main/java/com/fr/design/RestartHelper.java

@@ -1,14 +1,17 @@
 package com.fr.design;
 
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.os.impl.RestartAction;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.OperatingSystem;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.support.OSBasedAction;
+import com.fr.workspace.WorkContext;
 
+import javax.swing.*;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -16,8 +19,6 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -30,7 +31,7 @@ public class RestartHelper {
 
     public static final String RECORD_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "delete.properties");
     public static final String MOVE_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "move.properties");
-
+    private static final OSBasedAction restartAction = new RestartAction();
 
     /**
      * 把要删除的文件都记录到delete.properties中
@@ -143,6 +144,20 @@ public class RestartHelper {
         restart(ArrayUtils.EMPTY_STRING_ARRAY);
     }
 
+    public static void restartForUpdate(JFrame frame) {
+        try {
+            restartAction.execute(ArrayUtils.EMPTY_STRING_ARRAY);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage());
+        } finally {
+            WorkContext.getCurrent().close();
+            frame.dispose();
+            System.exit(0);
+        }
+    }
+
+
+
     /**
      * 重启设计器并删除某些特定的文件
      *
@@ -168,11 +183,7 @@ public class RestartHelper {
             }catch (Exception e){
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
-            if (OperatingSystem.isMacOS()) {
-                restartInMacOS(installHome, filesToBeDelete);
-            } else {
-                restartInWindows(installHome, filesToBeDelete);
-            }
+            restartAction.execute(filesToBeDelete);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } finally {
@@ -186,28 +197,4 @@ public class RestartHelper {
             DesignerContext.getDesignerFrame().exit();
         }
     }
-
-    private static void restartInMacOS(String installHome, String[] filesToBeDelete) throws Exception {
-        ProcessBuilder builder = new ProcessBuilder();
-        List<String> commands = new ArrayList<String>();
-        commands.add("open");
-        commands.add(installHome + File.separator + "bin" + File.separator + "restart.app");
-        if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
-            commands.add("--args");
-            commands.add(StableUtils.join(filesToBeDelete, "+"));
-        }
-        builder.command(commands);
-        builder.start();
-    }
-
-    private static void restartInWindows(String installHome, String[] filesToBeDelete) throws Exception {
-        ProcessBuilder builder = new ProcessBuilder();
-        List<String> commands = new ArrayList<String>();
-        commands.add(installHome + File.separator + "bin" + File.separator + "restart.exe");
-        if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
-            commands.add(StableUtils.join(filesToBeDelete, "+"));
-        }
-        builder.command(commands);
-        builder.start();
-    }
 }

designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

@@ -10,38 +10,37 @@ import javax.swing.*;
 
 import java.awt.event.ActionEvent;
 
-public class QuestionAction extends UpdateAction
-{
-
-	public QuestionAction()
-	{ this.setMenuKeySet(QUESTIONS);
-    this.setName(getMenuKeySet().getMenuName());
-    this.setMnemonic(getMenuKeySet().getMnemonic());
-    this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/question.png"));
-	
-}
-
-@Override
-public void actionPerformed(ActionEvent arg0)
-{
-	 String url = CloudCenter.getInstance().acquireUrlByKind("bbs.questions");
-     BrowseUtils.browser(url);
-}
- public static final MenuKeySet QUESTIONS = new MenuKeySet() {
-       @Override
-       public char getMnemonic() {
-           return 'Q';
-       }
-
-       @Override
-       public String getMenuName() {
-           return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Questions");
-       }
-
-       @Override
-       public KeyStroke getKeyStroke() {
-           return null;
-       }
-   };
+public class QuestionAction extends UpdateAction {
+
+    public QuestionAction() {
+        this.setMenuKeySet(QUESTIONS);
+        this.setName(getMenuKeySet().getMenuName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/question.png"));
+
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent arg0) {
+        String url = CloudCenter.getInstance().acquireUrlByKind("bbs.questions");
+        BrowseUtils.browser(url);
+    }
+
+    public static final MenuKeySet QUESTIONS = new MenuKeySet() {
+        @Override
+        public char getMnemonic() {
+            return 'Q';
+        }
+
+        @Override
+        public String getMenuName() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Questions");
+        }
+
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+    };
 
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.actions.file;
 
-import com.fr.base.BaseUtils;
+import com.fr.cluster.ClusterBridge;
+import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.config.Configuration;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.DesignerEnvManager;
@@ -18,16 +19,17 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIDictionaryComboBox;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.iprogressbar.UIProgressBarUI;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
-import com.fr.design.update.push.DesignerPushUpdateManager;
+import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
@@ -36,21 +38,35 @@ import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
 import com.fr.locale.InterProviderFactory;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.Constants;
 import com.fr.third.apache.log4j.Level;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.vcs.VcsOperator;
+import com.fr.workspace.server.vcs.git.config.GcConfig;
 
 import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JDialog;
 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;
@@ -59,9 +75,15 @@ 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;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static com.fr.design.i18n.Toolkit.i18nText;
 
 /**
  * 选项对话框
@@ -138,19 +160,27 @@ public class PreferencePane extends BasicPane {
     private IntegerEditor portEditor;
     private UICheckBox oracleSpace;
     private UISpinner cachingTemplateSpinner;
-    private UICheckBox openDebugComboBox;
     private UICheckBox useOptimizedUPMCheckbox;
     private UICheckBox useUniverseDBMCheckbox;
     private UICheckBox joinProductImproveCheckBox;
     private UICheckBox autoPushUpdateCheckBox;
+    private UICheckBox embedServerLazyStartupCheckBox;
 
     private UICheckBox vcsEnableCheckBox;
     private UICheckBox saveCommitCheckBox;
     private UICheckBox useIntervalCheckBox;
     private IntegerEditor saveIntervalEditor;
+    private UICheckBox gcEnableCheckBox;
+    private UIButton gcButton;
     private UILabel remindVcsLabel;
 
-
+    private JDialog gcDialog;
+    private UILabel gcMessage = new UILabel();
+    private JPanel gcDialogDownPane = new JPanel();
+    private JPanel gcProgressBarPanel = new JPanel();
+    private JProgressBar gcProgressBar;
+    private Timer gcProgressTimer;
+    private UIButton gcOkButton = new UIButton(i18nText("Fine-Design_Report_OK"));
 
     public PreferencePane() {
         this.initComponents();
@@ -163,9 +193,9 @@ public class PreferencePane extends BasicPane {
 
         UITabbedPane jtabPane = new UITabbedPane();
         JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_General"), generalPane);
+        jtabPane.addTab(i18nText("Fine-Design_Basic_General"), generalPane);
         JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), advancePane);
+        jtabPane.addTab(i18nText("Fine-Design_Basic_Advanced"), advancePane);
         contentPane.add(jtabPane, BorderLayout.NORTH);
 
         createFunctionPane(generalPane);
@@ -186,56 +216,66 @@ public class PreferencePane extends BasicPane {
 
         createServerPane(advancePane);
 
-        JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Oracle_All_Tables"));
-        oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
+        JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + i18nText("Fine-Design_Basic_Oracle_All_Tables"));
+        oracleSpace = new UICheckBox(i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
         oraclePane.add(oracleSpace);
 
-        JPanel debuggerPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Develop_Tools"));
-        openDebugComboBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Open_Debug_Window"));
-        debuggerPane.add(openDebugComboBox, BorderLayout.CENTER);
-        advancePane.add(debuggerPane);
-
-        JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
-        useOptimizedUPMCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
+        JPanel upmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Update_Plugin_Manager"));
+        useOptimizedUPMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Update_Plugin_Manager"));
         upmSelectorPane.add(useOptimizedUPMCheckbox);
         advancePane.add(upmSelectorPane);
 
-        JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Manager"));
-        useUniverseDBMCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
+        JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
+        useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
         dbmSelectorPane.add(useUniverseDBMCheckbox);
         advancePane.add(dbmSelectorPane);
 
-        JPanel improvePane = FRGUIPaneFactory.createVerticalTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Product_Improve"));
-        joinProductImproveCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Join_Product_Improve"));
+        JPanel improvePane = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Product_Improve"));
+        joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve"));
         improvePane.add(joinProductImproveCheckBox);
 
-        if (DesignerPushUpdateManager.getInstance().isAutoPushUpdateSupported()) {
-            autoPushUpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Automatic_Push_Update"));
+        if (SupportOSImpl.AUTOPUSHUPDATE.support()) {
+            autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update"));
             improvePane.add(autoPushUpdateCheckBox);
         }
+      /*
+        if (DesignerPushUpdateManager.getInstance().isAutoPushUpdateSupported()) {
+            autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update"));
+            improvePane.add(autoPushUpdateCheckBox);
+        }*/
 
         JPanel spaceUpPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         spaceUpPane.add(oraclePane, BorderLayout.NORTH);
         spaceUpPane.add(createMemoryPane(), BorderLayout.CENTER);
         spaceUpPane.add(improvePane, BorderLayout.SOUTH);
         advancePane.add(spaceUpPane);
+
+        JPanel embedServerPanel = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Embed_Server"));
+        embedServerLazyStartupCheckBox = new UICheckBox(i18nText("Fine-Design_Startup_When_Needed"));
+        embedServerPanel.add(embedServerLazyStartupCheckBox);
+        advancePane.add(embedServerPanel);
+
     }
 
     private void createVcsSettingPane(JPanel generalPane) {
-        JPanel vcsPane = FRGUIPaneFactory.createVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Vcs_Title"));
+        JPanel vcsPane = FRGUIPaneFactory.createVerticalTitledBorderPane(i18nText("Fine-Design_Vcs_Title"));
         generalPane.add(vcsPane);
-        remindVcsLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Remind"));
+        remindVcsLabel = new UILabel(i18nText("Fine-Design_Vcs_Remind"));
         remindVcsLabel.setVisible(!VcsHelper.getInstance().needInit());
-        vcsEnableCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Vcs_SaveAuto"));
-        saveCommitCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Vcs_No_Delete"));
+        vcsEnableCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_SaveAuto"));
+        saveCommitCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_No_Delete"));
         saveIntervalEditor = new IntegerEditor(60);
         useIntervalCheckBox = new UICheckBox();
+
+        //gc面板
+        JPanel gcControlPane = createGcControlPane();
+
         JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
         enableVcsPanel.add(vcsEnableCheckBox);
         enableVcsPanel.add(remindVcsLabel);
         JPanel intervalPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
-        final UILabel everyLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Every"));
-        final UILabel delayLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Delay"));
+        final UILabel everyLabel = new UILabel(i18nText("Fine-Design_Vcs_Every"));
+        final UILabel delayLabel = new UILabel(i18nText("Fine-Design_Vcs_Delay"));
         intervalPanel.add(useIntervalCheckBox);
         intervalPanel.add(everyLabel);
         intervalPanel.add(saveIntervalEditor);
@@ -244,7 +284,7 @@ public class PreferencePane extends BasicPane {
             @Override
             public void stateChanged(ChangeEvent e) {
                 boolean selected = vcsEnableCheckBox.isSelected();
-                if (selected) {
+                if (selected && vcsEnableCheckBox.isEnabled()) {
                     saveCommitCheckBox.setEnabled(true);
                     saveIntervalEditor.setEnabled(true);
                     useIntervalCheckBox.setEnabled(true);
@@ -262,24 +302,55 @@ public class PreferencePane extends BasicPane {
         vcsPane.add(enableVcsPanel);
         vcsPane.add(intervalPanel);
         vcsPane.add(saveCommitCheckBox);
+        vcsPane.add(gcControlPane);
+    }
+
+    /**
+     * 模创建板版本gc 配置操作面板
+     *
+     * @return 面板
+     */
+    private JPanel createGcControlPane() {
+        //gc面板
+        JPanel gcControlPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        JPanel gcButtonPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 40, 0));
+        gcEnableCheckBox = new UICheckBox(i18nText("Fine-Design_Vcs_Storage_Optimization"));
+        gcButton = initGcButton();
+        gcButtonPane.add(gcButton);
+        gcControlPane.add(gcEnableCheckBox);
+        gcControlPane.add(gcButtonPane);
+        gcButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                tryGc();
+            }
+        });
+        gcEnableCheckBox.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                gcButton.setEnabled(gcEnableCheckBox.isSelected() && gcEnableCheckBox.isEnabled());
+            }
+        });
+        return gcControlPane;
     }
 
     private void createFunctionPane(JPanel generalPane) {
-        JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Function"));
+        JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Function"));
         generalPane.add(functionPane);
 
         //添加supportUndo选择项
-        supportUndoCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Undo"));
+        supportUndoCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Support_Undo"));
         functionPane.add(supportUndoCheckBox);
         //添加maxUndoLimit
         //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"};
-        String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_10 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)")
-                , MAX_UNDO_LIMIT_15 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_20 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_50 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)")};
+        String[] undoTimes = {i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_10 + i18nText("Fine-Design_Basic_Time(s)")
+                , MAX_UNDO_LIMIT_15 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_20 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_50 + i18nText("Fine-Design_Basic_Time(s)")};
         maxUndoLimit = new UIComboBox(undoTimes);
         functionPane.add(maxUndoLimit);
 
         //不支持撤销则不能选择撤销可缓存，也不能设置最大撤销次数
         supportUndoCheckBox.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 maxUndoLimit.setEnabled(supportUndoCheckBox.isSelected());
             }
@@ -288,31 +359,32 @@ public class PreferencePane extends BasicPane {
 
         //添加supportDefaultParentCalculate选择项
         supportDefaultParentCalculateCheckBox = new UICheckBox(
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Default_Parent_Calculate"));
+                i18nText("Fine-Design_Basic_Preference_Support_Default_Parent_Calculate"));
         functionPane.add(supportDefaultParentCalculateCheckBox);
     }
 
     private void createEditPane(JPanel generalPane) {
         //samuel:编辑器设置
-        JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference"));
+        JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Editor_Preference"));
         generalPane.add(editPane);
 
         //设置是否支持将字符串编辑为公式
-        supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Support_String_To_Formula"));
+        supportStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Report_Support_String_To_Formula"));
         editPane.add(supportStringToFormulaBox);
 
         //是否默认转化
-        defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Always"));
+        defaultStringToFormulaBox = new UICheckBox(i18nText("Fine-Design_Basic_Always"));
 
         editPane.add(defaultStringToFormulaBox);
         //不支持转化则不能默认执行
         supportStringToFormulaBox.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 defaultStringToFormulaBox.setEnabled(supportStringToFormulaBox.isSelected());
             }
         });
         JPanel keyStrokePane = new JPanel(new BorderLayout());
-        keyStrokePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST);
+        keyStrokePane.add(new UILabel(i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST);
         shortCutLabel = new UILabel();
         keyStrokePane.add(shortCutLabel, BorderLayout.CENTER);
         editPane.add(keyStrokePane);
@@ -342,7 +414,7 @@ public class PreferencePane extends BasicPane {
             requestFocusInWindow();
             label = new UILabel(text);
             add(GUICoreUtils.createBorderLayoutPane(
-                    new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Current_Auto_Complete_Shortcut") + ":"),
+                    new UILabel(i18nText("Fine-Design_Basic_Support_Current_Auto_Complete_Shortcut") + ":"),
                     BorderLayout.WEST,
                     label,
                     BorderLayout.CENTER),
@@ -376,24 +448,24 @@ public class PreferencePane extends BasicPane {
 
     private void createGuiOfGridPane(JPanel generalPane) {
         // GridPane
-        JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Setting_Grid"));
+        JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Setting_Grid"));
         generalPane.add(guiOfGridPane);
 
-        supportCellEditorDefCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Cell_Editor_Definition"));
+        supportCellEditorDefCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Support_Cell_Editor_Definition"));
         guiOfGridPane.add(supportCellEditorDefCheckBox);
 
-        isDragPermitedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Is_Drag_Permited"));
+        isDragPermitedCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Is_Drag_Permited"));
         guiOfGridPane.add(isDragPermitedCheckBox);
     }
 
     private void createColorSettingPane(JPanel generalPane) {
         // Color Setting Pane
-        JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Setting_Colors"));
+        JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Setting_Colors"));
         generalPane.add(colorSettingPane);
 
-        new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Grid_Line_Color"));
+        new UILabel(i18nText("Fine-Design_Basic_Preference_Grid_Line_Color"));
 
-        new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color"));
+        new UILabel(i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color"));
 
         gridLineColorTBButton = new UIColorButton(IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
         gridLineColorTBButton.setEnabled(this.isEnabled());
@@ -402,10 +474,10 @@ public class PreferencePane extends BasicPane {
         paginationLineColorTBButton.setEnabled(this.isEnabled());
 
         JPanel leftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Grid_Line_Color") + ":"));
+        leftPane.add(new UILabel(i18nText("Fine-Design_Basic_Preference_Grid_Line_Color") + ":"));
         leftPane.add(gridLineColorTBButton);
         JPanel rightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color") + ":"));
+        rightPane.add(new UILabel(i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color") + ":"));
         rightPane.add(paginationLineColorTBButton);
         colorSettingPane.add(leftPane);
         colorSettingPane.add(rightPane);
@@ -415,9 +487,9 @@ public class PreferencePane extends BasicPane {
         //richer:选择导出log文件的目录.
         JPanel logPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
         advancePane.add(logPane);
-        JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export_Setting"));
+        JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + i18nText("Fine-Design_Basic_Export_Setting"));
         logPane.add(logExportPane);
-        UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":");
+        UILabel logLabel = new UILabel(i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":");
         logExportPane.add(logLabel, BorderLayout.WEST);
         logExportDirectoryField = new UITextField(24);
         logExportPane.add(logExportDirectoryField, BorderLayout.CENTER);
@@ -425,6 +497,7 @@ public class PreferencePane extends BasicPane {
         logExportPane.add(chooseDirBtn, BorderLayout.EAST);
         chooseDirBtn.setPreferredSize(new Dimension(25, 25));
         chooseDirBtn.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent evt) {
                 JFileChooser fileChooser = new JFileChooser();
                 fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
@@ -436,37 +509,23 @@ public class PreferencePane extends BasicPane {
             }
         });
 
-        JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Level_Setting"));
+        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() {
-            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) {
         // ben:选择版本语言;
         JPanel languageAndDashBoard_pane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
-        JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_Language"));
+        JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Choose_Language"));
         generalPane.add(languageAndDashBoard_pane);
         languageAndDashBoard_pane.add(LanguagePane);
 
         languageComboBox = createLanguageComboBox();
 
-        ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Language"));
+        ActionLabel languageLabel = new ActionLabel(i18nText("Fine-Design_Basic_Designer_Language"));
         languageLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -480,10 +539,10 @@ public class PreferencePane extends BasicPane {
                 dlg.setVisible(true);
             }
         });
-        UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
+        UILabel noticeLabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
-        double columnSize[] = {p, p, p};
+        double[] rowSize = {p};
+        double[] columnSize = {p, p, p};
         Component[][] components = {
                 {languageLabel, languageComboBox, noticeLabel},
         };
@@ -523,19 +582,19 @@ public class PreferencePane extends BasicPane {
 
     private void createLengthPane(JPanel advancePane) {
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
+        double[] rowSize = {p};
 
         // 长度单位选择
-        JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
+        JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
         advancePane.add(lengthPane);
-        pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")});
+        pageLengthComboBox = new UIComboBox(new String[]{i18nText("Fine-Design_Basic_Page_Setup_MM"), i18nText("Fine-Design_Report_Unit_CM"), i18nText("Fine-Design_Report_Unit_INCH")});
         pageLengthComboBox.setPreferredSize(new Dimension(80, 20));
         pageLengthComboBox.setMinimumSize(new Dimension(80, 20));
-        reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate")});
+        reportLengthComboBox = new UIComboBox(new String[]{i18nText("Fine-Design_Basic_Page_Setup_MM"), i18nText("Fine-Design_Report_Unit_CM"), i18nText("Fine-Design_Report_Unit_INCH"), i18nText("Fine-Design_Report_Unit_PT_Duplicate")});
         reportLengthComboBox.setPreferredSize(new Dimension(80, 20));
         reportLengthComboBox.setMinimumSize(new Dimension(80, 20));
-        UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":");
-        UILabel reportLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Design_Ruler_Units") + ":");
+        UILabel pagelengthLabel = new UILabel(i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":");
+        UILabel reportLengthLabel = new UILabel(i18nText("Fine-Design_Basic_Report_Design_Ruler_Units") + ":");
         Component[][] lengthComponents = {
                 {pagelengthLabel, pageLengthComboBox, reportLengthLabel, reportLengthComboBox},
         };
@@ -545,16 +604,16 @@ public class PreferencePane extends BasicPane {
 
     private void createServerPane(JPanel advancePane) {
         double p = TableLayout.PREFERRED;
-        double rowSize[] = {p};
-        double columnSize[] = {p, p, p};
+        double[] rowSize = {p};
+        double[] columnSize = {p, p, p};
 
-        JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port_Setting"));
+        JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Web_Preview_Port_Setting"));
         advancePane.add(serverPortPane);
         portEditor = new IntegerEditor();
         portEditor.setPreferredSize(new Dimension(80, 20));
         portEditor.setMinimumSize(new Dimension(80, 20));
-        UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
-        UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port") + ":");
+        UILabel notiJlabel = new UILabel(i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
+        UILabel serverPortLabel = new UILabel(i18nText("Fine-Design_Basic_Web_Preview_Port") + ":");
         Component[][] portComponents = {
                 {serverPortLabel, portEditor, notiJlabel},
         };
@@ -563,10 +622,10 @@ public class PreferencePane extends BasicPane {
     }
 
     private JPanel createMemoryPane() {
-        JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template"));
-        UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Max_Caching_Template"));
+        JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Caching_Template"));
+        UILabel memoryLabel = new UILabel(i18nText("Fine-Design_Basic_Preference_Max_Caching_Template"));
         UILabel memoryTipLabel = FRWidgetFactory.createLineWrapLabel(
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip"), MEMORY_TIP_LABEL_MAX_WIDTH);
+                i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip"), MEMORY_TIP_LABEL_MAX_WIDTH);
         memoryTipLabel.setBorder(BorderFactory.createEmptyBorder(0, CACHING_GAP, 0, 0));
         cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT);
         JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
@@ -579,13 +638,13 @@ public class PreferencePane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Window_Preference");
+        return i18nText("Fine-Design_Basic_M_Window_Preference");
     }
 
     /**
      * The method  of populate.
      *
-     * @param designerEnvManager
+     * @param designerEnvManager 设计器环境管理器
      */
     public void populate(DesignerEnvManager designerEnvManager) {
         if (designerEnvManager == null) {
@@ -614,6 +673,11 @@ public class PreferencePane extends BasicPane {
             defaultStringToFormulaBox.setSelected(false);
         }
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
+        if (ClusterBridge.isClusterMode()) {
+            vcsEnableCheckBox.setEnabled(false);
+            gcEnableCheckBox.setEnabled(false);
+        }
+
         if (VcsHelper.getInstance().needInit()) {
             vcsEnableCheckBox.setSelected(vcsConfigManager.isVcsEnable());
         } else {
@@ -629,7 +693,8 @@ public class PreferencePane extends BasicPane {
         saveIntervalEditor.setValue(vcsConfigManager.getSaveInterval());
         saveCommitCheckBox.setSelected(vcsConfigManager.isSaveCommit());
         useIntervalCheckBox.setSelected(vcsConfigManager.isUseInterval());
-
+        gcEnableCheckBox.setSelected(GcConfig.getInstance().isGcEnable());
+        gcButton.setEnabled(gcEnableCheckBox.isSelected());
         supportCellEditorDefCheckBox.setSelected(designerEnvManager.isSupportCellEditorDef());
 
         isDragPermitedCheckBox.setSelected(designerEnvManager.isDragPermited());
@@ -648,7 +713,6 @@ public class PreferencePane extends BasicPane {
 
         this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
 
-        openDebugComboBox.setSelected(designerEnvManager.isOpenDebug());
         useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
 
         useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
@@ -660,6 +724,8 @@ public class PreferencePane extends BasicPane {
         if (this.autoPushUpdateCheckBox != null) {
             this.autoPushUpdateCheckBox.setSelected(designerEnvManager.isAutoPushUpdateEnabled());
         }
+
+        this.embedServerLazyStartupCheckBox.setSelected(designerEnvManager.isEmbedServerLazyStartup());
     }
 
     private int chooseCase(int sign) {
@@ -716,16 +782,27 @@ public class PreferencePane extends BasicPane {
 
         designerEnvManager.setJettyServerPort(portEditor.getValue().intValue());
 
-        designerEnvManager.setOpenDebug(openDebugComboBox.isSelected());
-
         designerEnvManager.setOracleSystemSpace(this.oracleSpace.isSelected());
         designerEnvManager.setCachingTemplateLimit((int) this.cachingTemplateSpinner.getValue());
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
+        designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());
         vcsConfigManager.setSaveCommit(this.saveCommitCheckBox.isSelected());
         vcsConfigManager.setUseInterval(this.useIntervalCheckBox.isSelected());
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                GcConfig.getInstance().setGcEnable(gcEnableCheckBox.isSelected());
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{GcConfig.class};
+            }
+        });
+
         if (this.autoPushUpdateCheckBox != null) {
             designerEnvManager.setAutoPushUpdateEnabled(this.autoPushUpdateCheckBox.isSelected());
         }
@@ -735,17 +812,24 @@ public class PreferencePane extends BasicPane {
             designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
         }
 
-        Configurations.update(new Worker() {
-            @Override
-            public void run() {
-                Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem()));
-            }
+        if (WorkContext.getCurrent().isLocal()) {
+            Configurations.update(new Worker() {
+                @Override
+                public void run() {
+                    Level level = (Level) logLevelComboBox.getSelectedItem();
+                    if (level != null) {
+                        Log4jConfig.getInstance().setRootLevel(level);
+                    }
+                }
 
-            @Override
-            public Class<? extends Configuration>[] targets() {
-                return new Class[]{Log4jConfig.class};
-            }
-        });
+                @Override
+                public Class<? extends Configuration>[] targets() {
+                    @SuppressWarnings("unchecked")
+                    Class<? extends Configuration>[] classes = new Class[]{Log4jConfig.class};
+                    return classes;
+                }
+            });
+        }
 
         Configurations.update(new Worker() {
             @Override
@@ -756,13 +840,12 @@ public class PreferencePane extends BasicPane {
 
             @Override
             public Class<? extends Configuration>[] targets() {
-                return new Class[] {ServerPreferenceConfig.class};
+                return new Class[]{ServerPreferenceConfig.class};
             }
         });
 
     }
 
-
     // 如果语言设置改变了，则显示重启对话框
     public void showRestartDialog() {
         if (!languageChanged) {
@@ -770,12 +853,12 @@ public class PreferencePane extends BasicPane {
         }
         int rv = JOptionPane.showOptionDialog(
                 null,
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
+                i18nText("Fine-Design_Basic_Language_Change_Successful"),
+                i18nText("Fine-Design_Basic_Plugin_Warning"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
-                new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer_Later")},
+                new String[]{i18nText("Fine-Design_Basic_Restart_Designer"), i18nText("Fine-Design_Basic_Restart_Designer_Later")},
                 null
         );
         if (rv == JOptionPane.OK_OPTION) {
@@ -797,4 +880,204 @@ public class PreferencePane extends BasicPane {
     public BasicDialog showWindow(Window window, DialogActionListener l) {
         return showWindowWithCustomSize(window, l, new Dimension(BasicDialog.DEFAULT.width, this.getPreferredSize().height + OFFSET_HEIGHT));
     }
+
+    private void tryGc() {
+        final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+            private long size = 0;
+
+            @Override
+            protected Boolean doInBackground() {
+                size = WorkContext.getCurrent().get(VcsOperator.class).immediatelyGc();
+                return true;
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    get();
+                } catch (ExecutionException e) {
+                    updateGcDialogPanelInfo(i18nText("Fine-Design_Vcs_Need_Update_Remote_Server_Jar"));
+                    return;
+                } catch (InterruptedException e) {
+                    FineLoggerFactory.getLogger().error(e, e.getMessage());
+                }
+                updateGcDialogPanelInfo(size <= 0 ? i18nText("Fine-Design_Vcs_No_Optimizable_File") : i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
+                gcDialogDownPane.revalidate();
+                gcDialogDownPane.repaint();
+                gcDialogDownPane.add(gcOkButton);
+            }
+        };
+        worker.execute();
+        initGcDialog();
+        gcOkButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                gcDialog.dispose();
+            }
+        });
+        gcDialog.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosed(WindowEvent e) {
+                stopGcProgressTimer();
+                worker.cancel(true);
+            }
+        });
+        gcDialog.setVisible(true);
+        gcDialog.dispose();
+    }
+
+    /**
+     * gc 后更新进度条面板信息
+     *
+     * @param message
+     */
+    private void updateGcDialogPanelInfo(String message) {
+        stopGcProgressTimer();
+        gcMessage.setText(message);
+        if (null != gcProgressBar) {
+            gcProgressBarPanel.remove(gcProgressBar);
+        }
+        if (null != gcDialog) {
+            gcDialog.setTitle(i18nText("Fine-Design_Form_Joption_News"));
+        }
+    }
+
+    /**
+     * 初始化 gc 对话框
+     */
+    private void initGcDialog() {
+        gcDialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(PreferencePane.this), i18nText("Fine-Design_Vcs_Clean_Progress") + "...", true);
+        gcDialog.setSize(new Dimension(340, 140));
+
+        JPanel jp = new JPanel();
+        //中上
+        JPanel gcUpPane = new JPanel();
+        gcUpPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10));
+        gcUpPane.add(new UILabel(UIManager.getIcon("OptionPane.informationIcon")));
+        gcProgressBarPanel = createProgressBarPane();
+        gcUpPane.add(gcProgressBarPanel);
+
+        //中下
+        gcDialogDownPane = new JPanel();
+        gcDialogDownPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
+
+        jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));
+        jp.add(gcUpPane);
+        jp.add(gcDialogDownPane);
+        gcDialog.add(jp);
+        gcDialog.setResizable(false);
+        gcDialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(PreferencePane.this));
+    }
+
+    /**
+     * gc 进度条面板
+     *
+     * @return
+     */
+    private JPanel createProgressBarPane() {
+        JPanel jp = new JPanel();
+        VerticalFlowLayout layout = new VerticalFlowLayout();
+        layout.setAlignLeft(true);
+        jp.setLayout(layout);
+
+        //提示
+        gcMessage = new UILabel(i18nText("Fine-Design_Vcs_Cleaning"));
+        // 创建一个进度条
+        gcProgressBar = createGcProgressBar(0, 30, 240, 15, Color.GREEN);
+        gcProgressTimer = createGcProgressTimer(500, gcProgressBar);
+        gcProgressTimer.start();
+        jp.add(gcMessage);
+        jp.add(gcProgressBar);
+        return jp;
+    }
+
+    /**
+     * 创建 gc 进度条
+     *
+     * @param min    最小值
+     * @param max    最大值
+     * @param width  宽度
+     * @param height 高度
+     * @param color  填充的图片颜色
+     * @return
+     */
+    private JProgressBar createGcProgressBar(int min, int max, int width, int height, Color color) {
+        // 创建一个进度条
+        JProgressBar progressBar = new JProgressBar(min, max);
+        UIProgressBarUI progressBarUI = new UIProgressBarUI();
+        progressBar.setUI(progressBarUI);
+
+        //颜色（进度条里的小方块）
+        progressBar.setForeground(color);
+
+        progressBar.setOpaque(false);
+        progressBar.setPreferredSize(new Dimension(width, height));
+        return progressBar;
+    }
+
+    /**
+     * @param delay       每隔 delay 毫秒更新进度
+     * @param progressBar 要更新的进度条
+     * @return
+     */
+    private Timer createGcProgressTimer(int delay, final JProgressBar progressBar) {
+        if (null == progressBar) {
+            return null;
+        }
+        // 模拟延时操作进度, 每隔 delay / 1000 秒更新进度
+        Timer timer = new Timer(delay, new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                int currentProgress = progressBar.getValue() + 1;
+                if (currentProgress > progressBar.getMaximum()) {
+                    currentProgress = progressBar.getMinimum();
+                }
+                progressBar.setValue(currentProgress);
+            }
+        });
+
+        return timer;
+    }
+
+    /**
+     * 停止进度条模拟计时器
+     */
+    private void stopGcProgressTimer() {
+        if (null == gcProgressTimer) {
+            return;
+        }
+        gcProgressTimer.stop();
+    }
+
+    /**
+     * 将字节转换成 KB or MB or GB 保留两位小数
+     *
+     * @param size
+     * @return
+     */
+    private String fileSizeConvert(long size) {
+        DecimalFormat df = new DecimalFormat("0.00");
+        double n = 1024d;
+        if (size > Math.pow(n, 3)) {
+            return df.format(size / Math.pow(n, 3)) + "GB";
+        }
+        if (size > Math.pow(n, 2)) {
+            return df.format(size / Math.pow(n, 2)) + "MB";
+        }
+        return df.format(size / n) + "KB";
+    }
+
+    /**
+     * 立即清理的Button
+     *
+     * @return
+     */
+    private UIButton initGcButton() {
+        UIButton gcButton = new UIButton(i18nText("Fine-Design_Vcs_Clean"));
+        gcButton.setPreferredSize(new Dimension(100, 15));
+        gcButton.setRoundBorder(true, Constants.LEFT);
+        return gcButton;
+    }
+
 }
+

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

@@ -21,7 +21,7 @@ public class SwitchExistEnv extends MenuDef {
         initMenuDef();
     }
 
-    private void initMenuDef() {
+    private void initMenuDef() { 
         Iterator<String> nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator();
         while (nameIt.hasNext()) {
             String name = nameIt.next();

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

@@ -51,7 +51,7 @@ public class FineUIAction extends UpdateAction {
        BasicDialog dialog = pane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
             @Override
             public void doOk() {
-
+                // Do nothing
             }
         });
        dialog.setVisible(true);

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

@@ -31,7 +31,7 @@ public class RemindDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
-
+        // Do nothing
     }
 
     public RemindPane getRemindPane() {

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

@@ -114,6 +114,7 @@ public class RemindPane extends JPanel {
 
             @Override
             public void removeLayoutComponent(Component comp) {
+                // Do nothing
             }
 
             @Override
@@ -139,6 +140,7 @@ public class RemindPane extends JPanel {
 
             @Override
             public void addLayoutComponent(String name, Component comp) {
+                // Do nothing
             }
         };
     }

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

@@ -1,24 +1,17 @@
 package com.fr.design.actions.server;
 
-
-import com.fr.config.ServerPreferenceConfig;
 import com.fr.data.impl.Connection;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.data.datapane.connect.ConnectionManagerPane;
 import com.fr.design.data.datapane.connect.ConnectionShowPane;
 import com.fr.design.data.datapane.connect.DatabaseConnectionPane;
 import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.NameInspector;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.design.dcm.UniversalDatabaseOpener;
+import com.fr.stable.os.support.OSBasedAction;
+import com.fr.stable.os.support.OSSupportCenter;
+import com.fr.design.os.impl.DatabaseDialogAction;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.IOUtils;
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -60,56 +53,10 @@ public class ConnectionListAction extends UpdateAction {
      * @param evt 事件
      */
     public void actionPerformed(ActionEvent evt) {
-        if (ServerPreferenceConfig.getInstance().isUseUniverseDBM()) {
-            UniversalDatabaseOpener.showUniverseDatabaseDialog();
-        } else {
-            openDesignDatabaseManager();
-        }
+        OSBasedAction osBasedAction =  OSSupportCenter.getAction(DatabaseDialogAction.class);
+        osBasedAction.execute();
     }
 
-    private void openDesignDatabaseManager() {
-        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-        final ConnectionConfig datasourceManager = ConnectionConfig.getInstance();
-        final ConnectionManagerPane databaseManagerPane = new ConnectionManagerPane() {
-            public void complete() {
-                ConnectionConfig connectionConfig = datasourceManager.mirror();
-                populate(connectionConfig);
-            }
-
-            protected void renameConnection(String oldName, String newName) {
-                datasourceManager.renameConnection(oldName, newName);
-            }
-        };
-        final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);
-        databaseListDialog.addDialogActionListener(new DialogActionAdapter() {
-            public void doOk() {
-                if (!databaseManagerPane.isNamePermitted()) {
-                    databaseListDialog.setDoOKSucceed(false);
-                    return;
-                }
-                Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
-                    @Override
-                    public void run() {
-                        databaseManagerPane.update(datasourceManager);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return doWithDatasourceManager(datasourceManager, databaseManagerPane, databaseListDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
-                        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
-                    }
-                }));
-            }
-        });
-        databaseListDialog.setVisible(true);
-    }
-
-
     /**
      * 更新datasourceManager
      *

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

@@ -1,11 +1,11 @@
 package com.fr.design.actions.server;
 
-import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
-import com.fr.design.extra.WebViewDlgHelper;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.design.upm.UpmFinder;
+import com.fr.design.os.impl.PMDialogAction;
 import com.fr.general.IOUtils;
+import com.fr.stable.os.support.OSBasedAction;
+import com.fr.stable.os.support.OSSupportCenter;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -16,22 +16,17 @@ import java.awt.event.ActionEvent;
  * @since 8.0
  */
 public class PluginManagerAction extends UpdateAction {
-
     public PluginManagerAction() {
         this.setMenuKeySet(PLUGIN_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/server/plugin.png"));
     }
-
     @Override
     public void actionPerformed(ActionEvent e) {
         // 可以启用新版本的插件商店（使用JxBrowser作为容器）
-        if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM()) {
-            UpmFinder.showUPMDialog();
-        } else {
-            WebViewDlgHelper.createPluginDialog();
-        }
+         OSBasedAction osBasedAction = OSSupportCenter.getAction(PMDialogAction.class);
+         osBasedAction.execute();
     }
 
     public static final MenuKeySet PLUGIN_MANAGER = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java

@@ -1,41 +1,35 @@
 package com.fr.design.beans;
 
+import com.fr.common.annotations.Open;
 import com.fr.design.dialog.BasicPane;
 
-/**
- * Update Pane
- */
+@Open
 public abstract class BasicBeanPane<T> extends BasicPane {
-    
 
+    /**
+     * 展示数据
+     * @param ob 待展示的对象
+     */
+    public abstract void populateBean(T ob);
 
-	/**
-	 * Populate.
-	 */
-	public abstract void populateBean(T ob);
+    /**
+     * 保存数据
+     * @return 待保存的对象
+     */
+    public abstract T updateBean();
 
-	/**
-	 * Update.
-	 */
-	public abstract T updateBean();
+    /**
+     * 保存数据
+     * @param ob 待保存的对象
+     */
+    public void updateBean(T ob) {
 
-	public void updateBean(T ob) {
+    }
 
-	}
-
-	/**
-	 * 更新权限工具栏面板
-	 */
-	public void populateAuthority() {
-
-	}
-
-	/**
-	 * 仅用来处理图表设计器的地图面板
-	 * @param mapType 地图类型
-	 */
-	public void dealWidthMap(String mapType){
-
-	}
+    /**
+     * 更新权限工具栏面板
+     */
+    public void populateAuthority() {
 
+    }
 }

designer-base/src/main/java/com/fr/design/beans/BasicStorePane.java

@@ -0,0 +1,23 @@
+package com.fr.design.beans;
+
+import com.fr.common.annotations.Open;
+
+/**
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019/9/24
+ * 数据存取视图界面
+ */
+@Open
+public abstract class BasicStorePane<T> extends BasicBeanPane<T> {
+
+    @Override
+    public T updateBean() {
+        return null;
+    }
+
+    public abstract void populateBean(T t);
+
+    @Override
+    public abstract void updateBean(T t);
+}

designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java

@@ -1,11 +1,9 @@
 package com.fr.design.beans;
 
+import com.fr.common.annotations.Open;
 import com.fr.stable.StringUtils;
 
-/**
- * @author zhou
- * @since 2012-5-30下午12:12:42
- */
+@Open
 public abstract class FurtherBasicBeanPane<T> extends BasicBeanPane<T> {
     /**
      * 是否是指定类型

designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java

@@ -13,23 +13,23 @@ import java.awt.geom.RoundRectangle2D;
 public class UIRoundedBorder extends LineBorder {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	private int roundedCorner;
 	private int lineStyle;
-	
+
 	public UIRoundedBorder(Color color) {
 		super(color);
 	}
-	
+
 	public UIRoundedBorder(Color color, int thickness){
 		super(color, thickness);
 	}
-	
+
 	public UIRoundedBorder(Color color, int thickness, int roundedCorners){
 		super(color, thickness, true);
 		this.roundedCorner = roundedCorners;
 	}
-	
+
 	public UIRoundedBorder(int lineStyle, Color color, int roundedCorners){
 		super(color, GraphHelper.getLineStyleSize(lineStyle), true);
 		this.lineStyle = lineStyle;
@@ -44,14 +44,15 @@ public class UIRoundedBorder extends LineBorder {
 		return lineStyle;
 	}
 
+	@Override
 	public void paintBorder(Component c, Graphics g, int x, int y, int width, int height){
 		Color oldColor = g.getColor();
 
         Graphics2D g2d = (Graphics2D)g;
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g2d.setColor(lineColor);
-        GraphHelper.draw(g2d, new RoundRectangle2D.Double(x, y, width - 1, height-1, roundedCorner, roundedCorner),lineStyle);
+		GraphHelper.draw(g2d, new RoundRectangle2D.Double(x, y, width - 1.0D, height - 1.0D, roundedCorner, roundedCorner), lineStyle);
         g2d.setColor(oldColor);
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 	}
-}
+}

designer-base/src/main/java/com/fr/design/condition/ConditionAttrSingleConditionPane.java

@@ -1,10 +1,13 @@
 package com.fr.design.condition;
 
+import com.fr.common.annotations.Open;
+
 /**
 * @author richie
 * @date 2015-03-26
 * @since 8.0
 */
+@Open
 public abstract class ConditionAttrSingleConditionPane<T> extends SingleConditionPane<T> {
     protected HighLightConditionAction hightLighAttrUpdateAction = null;
     private ConditionAttributesPane conditionAttributesPane;

designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.condition;
 
 
+import com.fr.common.annotations.Open;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.itoolbar.UIToolbar;
@@ -17,6 +18,7 @@ import java.awt.Dimension;
 import java.util.HashMap;
 import java.util.Iterator;
 
+@Open
 public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
     private static final int MIN_HEIGHT = 60;
     protected CellHighlightAddMenuDef menuDef;

designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java

@@ -16,8 +16,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
  * 一个层次连续节点.
  */
 public class ContinuousTreeSelectionModel extends DefaultTreeSelectionModel {
-    public ContinuousTreeSelectionModel() {
-    }
 
     public void addSelectionPaths(TreePath[] paths) {
         if (paths == null || paths.length == 0) {

designer-base/src/main/java/com/fr/design/constants/DesignerLaunchStatus.java

@@ -21,10 +21,15 @@ public enum DesignerLaunchStatus implements Event<Null> {
      */
     DESIGNER_INIT_COMPLETE,
 
+    /**
+     * 打开模板完成
+     */
+    OPEN_LAST_FILE_COMPLETE,
+
     /**
      * 启动完成
      */
-    OPEN_LAST_FILE_COMPLETE;
+    STARTUP_COMPLETE;
 
     private static DesignerLaunchStatus status;
 
@@ -34,6 +39,6 @@ public enum DesignerLaunchStatus implements Event<Null> {
 
     public static void setStatus(DesignerLaunchStatus state) {
         status = state;
-        EventDispatcher.asyncFire(DesignerLaunchStatus.getStatus());
+        EventDispatcher.fire(DesignerLaunchStatus.getStatus());
     }
 }

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -46,6 +46,7 @@ import java.awt.event.KeyEvent;
 import java.util.EventObject;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Coder: zack
@@ -70,6 +71,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
      *
      * @return 返回位置
      */
+    @Override
     public Location preferredLocation() {
         return Location.WEST_ABOVE;
     }
@@ -97,6 +99,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     /**
      * 响应数据集改变
      */
+    @Override
     public void fireDSChanged() {
         fireDSChanged(new HashMap<String, String>());
     }
@@ -107,6 +110,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
      *
      * @param map 数据集变化Map
      */
+    @Override
     public void fireDSChanged(Map<String, String> map) {
         DesignTableDataManager.fireDSChanged(map);
     }
@@ -151,6 +155,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
 
     public abstract TableDataTree getDataTree();
 
+    @Override
     public abstract void refreshDockingView();
 
     protected void checkButtonEnabled(UpdateAction editAction, UpdateAction previewTableDataAction, UpdateAction removeAction, TableDataSourceOP op, TableDataTree dataTree) {
@@ -267,10 +272,12 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
          */
         @Override
         public void editingCanceled(ChangeEvent e) {
+            // Do nothing
         }
 
         @Override
         public void editingStopped(ChangeEvent e) {
+            // Do nothing
         }
     }
 
@@ -320,6 +327,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
             this.setSmallIcon(this.getTDIcon());
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             dgEdit(getTableDataInstance().creatTableDataPane(), createDsName(getNamePrefix()), false);
         }
@@ -400,7 +408,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
                 data = selectedNO.getObject();
             }
             try {
-                if (((TableDataWrapper) data).getTableData() instanceof StoreProcedure) {
+                if (((TableDataWrapper) Objects.requireNonNull(data)).getTableData() instanceof StoreProcedure) {
                     ((StoreProcedure) (((TableDataWrapper) data).getTableData())).resetDataModelList();
                     if (data instanceof StoreProcedureDataWrapper) {
                         StoreProcedureDataWrapper oldSdw = ((StoreProcedureDataWrapper) data);

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -2,6 +2,7 @@ package com.fr.design.data;
 
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
+import com.fr.concurrent.NamedThreadFactory;
 import com.fr.data.TableDataSource;
 import com.fr.data.TableDataSourceTailor;
 import com.fr.data.core.DataCoreXmlUtils;
@@ -30,12 +31,14 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.data.DataModel;
 import com.fr.general.data.TableDataException;
 import com.fr.log.FineLoggerFactory;
+import com.fr.module.ModuleContext;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLPrintWriter;
 
+import javax.swing.JFrame;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.io.ByteArrayOutputStream;
@@ -48,8 +51,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 设计器管理操作数据集的类:
@@ -420,7 +423,7 @@ public abstract class DesignTableDataManager {
         final Map<String, Object> parameterMap = new HashMap<>();
         if (needInputParams(isMustInputParameters, parameters)) {
             final ParameterInputPane pPane = new ParameterInputPane(parameters);
-            pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+            pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
                 @Override
                 public void doOk() {
                     parameterMap.putAll(pPane.update());
@@ -444,11 +447,18 @@ public abstract class DesignTableDataManager {
         } catch (Exception e) {
             throw new TableDataException(e.getMessage(), e);
         } finally {
-            new Timer().schedule(new TimerTask() {
+            ScheduledExecutorService scheduledExecutorService = ModuleContext
+                    .getExecutor()
+                    .newSingleThreadScheduledExecutor(new NamedThreadFactory(""));
+            scheduledExecutorService.schedule(new Runnable() {
+                @Override
                 public void run() {
-                    loadingBar.close();
+                    if (loadingBar != null) {
+                        loadingBar.close();
+                    }
                 }
-            }, 100);
+            }, 100, TimeUnit.MILLISECONDS);
+            scheduledExecutorService.shutdown();
         }
     }
 
@@ -513,6 +523,7 @@ public abstract class DesignTableDataManager {
         if (inParameters.length > 0 && !ComparatorUtils.equals(threadLocal.get(), NO_PARAMETER)) {// 检查Parameter.
             final ParameterInputPane pPane = new ParameterInputPane(inParameters);
             pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+                @Override
                 public void doOk() {
                     parameterMap.putAll(pPane.update());
                 }

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -103,10 +103,12 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
 
         @Override
         public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            // Do nothing
         }
 
         @Override
         public void popupMenuCanceled(PopupMenuEvent e) {
+            // Do nothing
         }
     };
 
@@ -114,10 +116,12 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     private PopupMenuListener listener = new PopupMenuListener() {
         @Override
         public void popupMenuCanceled(PopupMenuEvent e) {
+            // Do nothing
         }
 
         @Override
         public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+            // Do nothing
         }
 
         @Override
@@ -199,6 +203,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     }
 
     protected void addFocusListener() {
+        // Do nothing
     }
 
     @SuppressWarnings("unchecked")
@@ -438,6 +443,8 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -461,7 +468,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         if (!connect) {
             DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
             JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.INFORMATION_MESSAGE);
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
             failedToFindTable();
             return null;
         }
@@ -490,6 +497,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     }
 
     protected void failedToFindTable() {
+        // Do nothing
     }
 
     protected String getTableName() {

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java

@@ -75,6 +75,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
     }
 
     protected void addFocusListener() {
+        // Do nothing
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -255,6 +255,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
     }
 
     protected void checkRepeatedDSName(List<String> exsitTableDataNameList) {
+        // Do nothing
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java

@@ -56,14 +56,18 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
             return DesignTableDataManager.getEditingDataSet(tc.getBook());
         }
         List<Map<String, TableDataWrapper>> empty = new ArrayList<Map<String, TableDataWrapper>>();
-        empty.add(Collections.<String, TableDataWrapper>emptyMap());//数据集
-        empty.add(Collections.<String, TableDataWrapper>emptyMap());//服务器数据集
-        empty.add(Collections.<String, TableDataWrapper>emptyMap());//存储过程
+        //数据集
+        empty.add(Collections.<String, TableDataWrapper>emptyMap());
+        //服务器数据集
+        empty.add(Collections.<String, TableDataWrapper>emptyMap());
+        //存储过程
+        empty.add(Collections.<String, TableDataWrapper>emptyMap());
         return empty;
     }
 
     /**
      * ButtonEnabled intercept
+     *
      * @return interceptbuttonEnabled
      */
     @Override
@@ -73,8 +77,10 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
 
     /**
      * 移除名字是name的TableData
+     *
      * @param name tabledata name
      */
+    @Override
     public void removeAction(String name) {
         if (tc != null) {
             TableDataSource tds = tc.getBook();
@@ -85,7 +91,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map<String, TableDataWrapper> map) {
-        List<ExpandMutableTreeNode> dataList = new ArrayList<ExpandMutableTreeNode>();
+        List<ExpandMutableTreeNode> dataList = new ArrayList<>();
         Iterator<Entry<String, TableDataWrapper>> entryIt = map.entrySet().iterator();
         while (entryIt.hasNext()) {
             Entry<String, TableDataWrapper> entry = entryIt.next();
@@ -96,7 +102,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
             dataList.add(newChildTreeNode);
             newChildTreeNode.add(new ExpandMutableTreeNode());
         }
-        return dataList.toArray(new ExpandMutableTreeNode[dataList.size()]);
+        return dataList.toArray(new ExpandMutableTreeNode[0]);
     }
 
     private ExpandMutableTreeNode initTemplateDataNode(Map<String, TableDataWrapper> templateDataMap) {
@@ -124,22 +130,20 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
      */
     @Override
     public ExpandMutableTreeNode[] load() {
-        Map<String, TableDataWrapper> templateDataMap = null;
-        Map<String, TableDataWrapper> serverDataMap = null;
-        Map<String, TableDataWrapper> storeProcedureMap = null;
-
-        if (this != null) {
-            templateDataMap = this.init().get(0);
-            serverDataMap = this.init().get(1);
-            storeProcedureMap = this.init().get(2);
-        } else {
-            templateDataMap = Collections.emptyMap();
-            serverDataMap = Collections.emptyMap();
-            storeProcedureMap = Collections.emptyMap();
-        }
-        List<ExpandMutableTreeNode> list = new ArrayList<ExpandMutableTreeNode>(); //所有的数据集
-        List<ExpandMutableTreeNode> templist = new ArrayList<ExpandMutableTreeNode>(); //模板数据集
-        List<ExpandMutableTreeNode> serverlist = new ArrayList<ExpandMutableTreeNode>();   //服务器数据集
+        Map<String, TableDataWrapper> templateDataMap;
+        Map<String, TableDataWrapper> serverDataMap;
+        Map<String, TableDataWrapper> storeProcedureMap;
+
+        templateDataMap = this.init().get(0);
+        serverDataMap = this.init().get(1);
+        storeProcedureMap = this.init().get(2);
+
+        //所有的数据集
+        List<ExpandMutableTreeNode> list = new ArrayList<>();
+        //模板数据集
+        List<ExpandMutableTreeNode> templist = new ArrayList<>();
+        //服务器数据集
+        List<ExpandMutableTreeNode> serverlist = new ArrayList<>();
 
         list.add(initTemplateDataNode(templateDataMap));
         addNodeToList(templateDataMap, templist);
@@ -160,11 +164,11 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
         }
         switch (dataMode) {
             case TEMPLATE_TABLE_DATA:
-                return templist.toArray(new ExpandMutableTreeNode[templist.size()]);
+                return templist.toArray(new ExpandMutableTreeNode[0]);
             case SERVER_TABLE_DATA:
-                return serverlist.toArray(new ExpandMutableTreeNode[serverlist.size()]);
+                return serverlist.toArray(new ExpandMutableTreeNode[0]);
             default:
-                return list.toArray(new ExpandMutableTreeNode[list.size()]);
+                return list.toArray(new ExpandMutableTreeNode[0]);
         }
     }
 
@@ -182,7 +186,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     protected void setStoreProcedureTree(TableData tableData, ExpandMutableTreeNode tmpNode) {
-        ArrayList<String> nodeName = new ArrayList<String>();
+        ArrayList<String> nodeName = new ArrayList<>();
         StoreProcedure storeProcedure = (StoreProcedure) tableData;
         String name = ((NameObject) tmpNode.getUserObject()).getName();
         StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters());
@@ -208,13 +212,13 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
         }
 
         if (!resultNames.isEmpty()) {
-            for (int i = 0; i < resultNames.size(); i++) {
-                if (!nodeName.contains(resultNames.get(i))) {
-                    nodeName.add(resultNames.get(i));
+            for (String resultName : resultNames) {
+                if (!nodeName.contains(resultName)) {
+                    nodeName.add(resultName);
                     hasChild = true;
-                    String parameterName = name + "_" + resultNames.get(i);
+                    String parameterName = name + "_" + resultName;
                     TableDataWrapper newTwd = new StoreProcedureDataWrapper(storeProcedure, name, parameterName, false);
-                    ExpandMutableTreeNode newChildNode = new ExpandMutableTreeNode(new NameObject(resultNames.get(i), newTwd));
+                    ExpandMutableTreeNode newChildNode = new ExpandMutableTreeNode(new NameObject(resultName, newTwd));
                     newChildNode.add(new ExpandMutableTreeNode());
                     tmpNode.add(newChildNode);
                 }
@@ -230,7 +234,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
 
 
     public void setDataMode(int i) {
-        this.dataMode = i;
+        dataMode = i;
     }
 
     public int getDataMode() {

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java

@@ -35,7 +35,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	private ConnectionComboBoxPanel connectionComboBox;
 	private UICheckBox tableCheckBox;
 	private UICheckBox viewCheckBox;
-	private UITextField searchField;
+	protected UITextField searchField;
 	private TableViewList tableViewList;
 	private java.util.List<DoubleClickSelectedNodeOnTreeListener> listeners = new java.util.ArrayList<DoubleClickSelectedNodeOnTreeListener>();
 
@@ -90,12 +90,17 @@ public class ConnectionTableProcedurePane extends BasicPane {
 		this.add(tableViewListPane, BorderLayout.CENTER);
 		this.add(filterPane, BorderLayout.SOUTH);
 		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+		addKeyMonitor();
 	}
 
 	protected void filter(Connection connection, String conName, List<String> nameList) {
 		connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
 	}
 
+	protected void addKeyMonitor() {
+		//do nothing
+	}
+
 	protected JPanel createCheckBoxgroupPane() {
 		JPanel checkBoxgroupPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
 		JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@@ -132,7 +137,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
 
 	/**
 	 * 给 itemComboBox 加上 itemListener
-	 * 
+	 *
 	 * @param itemListener
 	 */
 	public void addItemListener(ItemListener itemListener) {
@@ -209,7 +214,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	public static interface DoubleClickSelectedNodeOnTreeListener {
 		/**
 		 * 处理双击事件
-		 * 
+		 *
 		 * @param target
 		 */
 		public void actionPerformed(TableProcedure target);

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -43,7 +43,8 @@ public class JDBCDefPane extends JPanel {
 		jdbcMap.put(OTHER_DB, new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:"),
 				new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"),
 				new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"),
-				new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/")});
+				new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/"),
+				new DriverURLName("com.fr.swift.jdbc.Driver", "jdbc:swift:emb://default")});
         jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"),
 				new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver","jdbc:inceptor://localhost:10000/default")});
 		jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")});

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java

@@ -140,8 +140,6 @@ public class PreviewTableModel extends AbstractTableModel {
      * 就是由于预览的JTable在不停的getRowCount来显示数据.
      */
     private static class ErrorResultSet extends AbstractDataModel {
-        public ErrorResultSet() {
-        }
 
         public int getRowCount() {
             return 0;
@@ -160,6 +158,7 @@ public class PreviewTableModel extends AbstractTableModel {
         }
 
         public void release() throws Exception {
+            // Do nothing
         }
     }
 

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -27,15 +27,7 @@ import com.fr.function.TIME;
 import com.fr.general.FRFont;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.SwingWorker;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
@@ -163,7 +155,7 @@ public class PreviewTablePane extends BasicPane {
 
         this.add(new JScrollPane(preveiwTable), BorderLayout.CENTER);
         if (this.dialog == null) {
-            this.dialog = this.showWindow(DesignerContext.getDesignerFrame());
+            this.dialog = this.showWindow(new JFrame());
         }
         progressBar = new AutoProgressBar(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java

@@ -38,6 +38,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
         this.setDefaultEditor(ParameterTableModel.ParameterEditor.class, new ParameterTableModel().new ParameterEditor());
         this.setDefaultRenderer(StoreProcedureParameterValueEditor.class, new ProcedureParameterValueRenderer());
     }
+    @Override
     public boolean isCellEditable(int row, int col) {
         if (ComparatorUtils.equals(getValueAt(row, col -1), "OUT")) {
             return false;
@@ -48,6 +49,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
         return false;
     }
 
+    @Override
     public boolean shouldResponseDoubleClickAction () {
         return false;
     }
@@ -60,7 +62,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
             editor = ValueEditorPaneFactory.createStoreProcedValueEditorPane();
             editor.getMenu().addPopupMenuListener(new PopupMenuListener() {
                 public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-
+                    // Do nothing
                 }
 
                 public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
@@ -77,15 +79,16 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
                     }, 100);
                 }
 
+                @Override
                 public void popupMenuCanceled(PopupMenuEvent e) {
-
+                    //do nothing
                 }
             });
             this.addCellEditorListener(new CellEditorListener() {
 
                 @Override
                 public void editingCanceled(ChangeEvent e) {
-
+                    //do nothing
                 }
 
                 @Override
@@ -147,6 +150,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
             editor = ValueEditorPaneFactory.createStoreProcedValueEditorPane();
         }
 
+        @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
             editor.setCurrentEditor(0);
             editor.populate(value);

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@@ -124,6 +124,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
             this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             java.util.List<ParameterProvider> oldParas = editorPane.update();
             oldParas.add(new Parameter());
@@ -132,6 +133,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
         @Override
         public void checkEnabled() {
+            //do nothing
         }
     }
     private class RemoveParaAction extends UITableEditAction {
@@ -149,6 +151,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
         @Override
         public void checkEnabled() {
+            //do nothing
         }
     }
 

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/CustomDictModel.java

@@ -1,22 +1,21 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
+import com.fr.design.gui.itableeditorpane.ActionStyle;
+import com.fr.design.gui.itableeditorpane.UIArrayTableModel;
+import com.fr.design.gui.itableeditorpane.UITableEditAction;
+import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
+import com.fr.design.gui.itextfield.UITextField;
 
 import javax.swing.AbstractCellEditor;
 import javax.swing.JTable;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.TableCellEditor;
-
-import com.fr.design.gui.itableeditorpane.ActionStyle;
-import com.fr.design.gui.itableeditorpane.UIArrayTableModel;
-import com.fr.design.gui.itableeditorpane.UITableEditAction;
-import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
-import com.fr.design.gui.itextfield.UITextField;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CustomDictModel extends UITableModelAdapter<Object[]> implements ActionStyle {
 	/**
@@ -34,11 +33,13 @@ public class CustomDictModel extends UITableModelAdapter<Object[]> implements Ac
 		this.setDefaultEditor(ParameterEditor.class, new ParameterEditor());
 	}
 
+	@Override
 	public Object getValueAt(int row, int column) {
 		Object[] os = this.getList().get(row);
 		return os[column];
 	}
 
+	@Override
 	public void setValueAt(Object value, int row, int column) {
 		Object[] os = this.getList().get(row);
 		os[column] = value;
@@ -104,7 +105,7 @@ public class CustomDictModel extends UITableModelAdapter<Object[]> implements Ac
 
 				@Override
 				public void editingCanceled(ChangeEvent e) {
-
+					//do nothing
 				}
 
 				@Override

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -57,6 +57,8 @@ import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -95,6 +97,30 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
                 connection.addConnection(nameList, conName, new Class[]{JDBCDatabaseConnection.class, JNDIDatabaseConnection.class});
             }
+
+            @Override
+            protected void addKeyMonitor() {
+                searchField.addKeyListener(new KeyListener() {
+
+                    @Override
+                    public void keyTyped(KeyEvent e) {
+                        //do nothing
+                    }
+
+                    @Override
+                    public void keyPressed(KeyEvent e) {
+                        if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                            e.setKeyCode(KeyEvent.VK_UP);
+                            DBTableDataPane.this.connectionTableProcedurePane.requestFocus();
+                        }
+                    }
+
+                    @Override
+                    public void keyReleased(KeyEvent e) {
+                        //do nothing
+                    }
+                });
+            }
         };
         connectionTableProcedurePane.addDoubleClickListener(new DoubleClickSelectedNodeOnTreeListener() {
 

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -76,6 +76,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     private static final int TEXT = 0;
@@ -126,12 +127,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     private static final int GAP = 23;
 
 
-    public FileTableDataPane(){
-        this(SETPANELWIDTH,WIDTH,HEIGHT,GAP);
+    public FileTableDataPane() {
+        this(SETPANELWIDTH, WIDTH, HEIGHT, GAP);
     }
 
-    public FileTableDataPane(int setPanelWidth,int width,int height,int gap) {
-        this.setLayout(new BorderLayout(gap,0));
+    public FileTableDataPane(int setPanelWidth, int width, int height, int gap) {
+        this.setLayout(new BorderLayout(gap, 0));
         JPanel northPanel = new JPanel(new BorderLayout());
         JPanel type = new JPanel();
         type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"));
@@ -163,16 +164,16 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         southPanel.add(setPanel, BorderLayout.CENTER);
         setPanel.setPreferredSize(new Dimension(setPanelWidth, 460));
         setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
-        JPanel controlPane = textSetPanel(width,height);
+        JPanel controlPane = textSetPanel(width, height);
         setPanel.add(controlPane, BorderLayout.NORTH);
-        fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height));
+        fileTypeComboBox.addActionListener(getFileTypeListener(setPanel, width, height));
 
         this.add(northPanel, BorderLayout.NORTH);
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(southPanel, BorderLayout.EAST);
     }
 
-    private void addToCenterPanel(JPanel centerPanel){
+    private void addToCenterPanel(JPanel centerPanel) {
         localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_File") + ":", true);
         urlFileRadioButton = new UIRadioButton("URL:", false);
         ButtonGroup bg = new ButtonGroup();
@@ -217,8 +218,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private ActionListener testConnectionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent arg0) {
-            String uri = ParameterHelper.analyze4Templatee( urlText.getText(), params);
+            String uri = ParameterHelper.analyze4Templatee(urlText.getText(), params);
             if (!checkURL(uri)) {
                 JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
                 return;
@@ -245,10 +247,11 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
     };
 
-    private void previewPanel(JPanel jPanel){
+    private void previewPanel(JPanel jPanel) {
         JPanel previewPanel = new JPanel(new BorderLayout());
         UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
         preview.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 preview();
             }
@@ -257,48 +260,47 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         jPanel.add(previewPanel, BorderLayout.SOUTH);
     }
 
-    private JPanel xmlSetPanel(int width,int height) {
+    private JPanel xmlSetPanel(int width, int height) {
         // xml设置pane
         JPanel controlPane = new JPanel();
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
-        JPanel northTopPane = new JPanel(new BorderLayout(8,8));
-        JPanel southPane = new JPanel(new BorderLayout(8,8));
-        JPanel southTopPane = new JPanel(new BorderLayout(8,8));
-        JPanel westPane = new JPanel(new BorderLayout());
-        controlPane.setLayout(new BorderLayout(8,8));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
+        JPanel northTopPane = new JPanel(new BorderLayout(8, 8));
+        JPanel southPane = new JPanel(new BorderLayout(8, 8));
+        JPanel southTopPane = new JPanel(new BorderLayout(8, 8));
+        controlPane.setLayout(new BorderLayout(8, 8));
         controlPane.setPreferredSize(new Dimension(width, height));
-        JPanel comboboxPanel = new JPanel(new BorderLayout(8,8));
+        JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8));
         encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         encodingComboBox.setSelectedIndex(4);
         encodingComboBox.setPreferredSize(new Dimension(90, 20));
 
         JPanel treeContainerPane = new JPanel();
-        treeContainerPane.setLayout(new BorderLayout(8,8));
+        treeContainerPane.setLayout(new BorderLayout(8, 8));
         nodeTreePane = new XMLNodeTreePane();
-        treeContainerPane.add(nodeTreePane,BorderLayout.CENTER);
+        treeContainerPane.add(nodeTreePane, BorderLayout.CENTER);
 
 
         comboboxPanel.add(encodeLabel, BorderLayout.WEST);
         comboboxPanel.add(encodingComboBox, BorderLayout.CENTER);
 
-        northPane.add(comboboxPanel,BorderLayout.EAST);
-        northTopPane.add(northPane,BorderLayout.WEST);
-        southTopPane.add(southPane,BorderLayout.WEST);
-        southTopPane.add(treeContainerPane,BorderLayout.CENTER);
+        northPane.add(comboboxPanel, BorderLayout.EAST);
+        northTopPane.add(northPane, BorderLayout.WEST);
+        southTopPane.add(southPane, BorderLayout.WEST);
+        southTopPane.add(treeContainerPane, BorderLayout.CENTER);
         controlPane.add(northTopPane, BorderLayout.NORTH);
-        controlPane.add(southTopPane,BorderLayout.CENTER);
+        controlPane.add(southTopPane, BorderLayout.CENTER);
         previewPanel(controlPane);
         return controlPane;
     }
 
-    private JPanel excelSetPanel(int width,int height) {
+    private JPanel excelSetPanel(int width, int height) {
         // excel设置pane
         int checkBoxWidth = width - EIGHT;
         JPanel controlPane = new JPanel();
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
         controlPane.setLayout(new BorderLayout());
-        controlPane.setPreferredSize(new Dimension(width,height));
+        controlPane.setPreferredSize(new Dimension(width, height));
         needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), false);
         needColumnNameCheckBox.setPreferredSize(new Dimension(checkBoxWidth, 20));
         northPane.add(needColumnNameCheckBox, BorderLayout.EAST);
@@ -321,6 +323,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
      *
      * @throws Exception
      */
+    @Override
     public void checkValid() throws Exception {
         if (urlFileRadioButton.isSelected()) {
             String url = urlText.getText().trim();
@@ -331,33 +334,33 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     }
 
-    private boolean checkURL(String uri){
+    private boolean checkURL(String uri) {
         try {
             new URL(uri);
             return true;
         } catch (MalformedURLException e) {
             return false;
         }
-       // return (uri.matches("https*://.+|\\$\\{.+\\}.*"));
+        // return (uri.matches("https*://.+|\\$\\{.+\\}.*"));
     }
 
-    private JPanel textSetPanel(int width,int height) {
+    private JPanel textSetPanel(int width, int height) {
         // text设置pane
         JPanel controlPane = new JPanel();
         controlPane.setLayout(new BorderLayout());
-        controlPane.setPreferredSize(new Dimension(width,height));
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
+        controlPane.setPreferredSize(new Dimension(width, height));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
         addToNorthPane(northPane);
-        controlPane.add(northPane,BorderLayout.WEST);
+        controlPane.add(northPane, BorderLayout.WEST);
         previewPanel(controlPane);
         return controlPane;
     }
 
-    private void addToNorthPane(JPanel northPane){
+    private void addToNorthPane(JPanel northPane) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double columnSize[] = {f, p, p};
-        double rowSize[] = {B, B, B, B, B, B, B};
+        double[] columnSize = {f, p, p};
+        double[] rowSize = {B, B, B, B, B, B, B};
         needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true);
         dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dismenber") + ":");
         tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember"), false);
@@ -390,18 +393,19 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         Component[][] comps = {
-                {encodeLabel,charsetComboBox,null},
-                {needColumnNameCheckBox,null,null},
-                {dismenberLabel,tableDismemberRadioButton,null},
-                {null,spaceDismenberRadioButton,null},
-                {null,commaDismenberRadioButton,null},
-                {null,otherDismenberRadioButton,otherDismenberTextField},
-                {ignoreOneMoreDelimiterCheckBox,null,null}
+                {encodeLabel, charsetComboBox, null},
+                {needColumnNameCheckBox, null, null},
+                {dismenberLabel, tableDismemberRadioButton, null},
+                {null, spaceDismenberRadioButton, null},
+                {null, commaDismenberRadioButton, null},
+                {null, otherDismenberRadioButton, otherDismenberTextField},
+                {ignoreOneMoreDelimiterCheckBox, null, null}
         };
-        northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize),BorderLayout.EAST);
+        northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize), BorderLayout.EAST);
     }
 
     private ActionListener radioActionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (localFileRadioButton.isSelected()) {
                 localRadioSelectAction();
@@ -438,7 +442,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         @Override
         public void actionPerformed(ActionEvent e) {
             FILEChooserPane fileChooser = FILEChooserPane.getInstance(true, false, new ChooseFileFilter(getFileSuffix()));
-            if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
+            if (fileChooser.showOpenDialog(FileTableDataPane.this) == FILEChooserPane.OK_OPTION) {
                 final FILE file = fileChooser.getSelectedFILE();
                 if (file == null) {// 选择的文件不能是 null
                     return;
@@ -456,8 +460,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private String[] getFileSuffix() {
         List<String> suffixList = new ArrayList<String>();
-        String suffix = fileTypeComboBox.getSelectedItem().toString().toLowerCase();
-        if (suffix.equalsIgnoreCase("excel")) {
+        String suffix = Objects.requireNonNull(fileTypeComboBox.getSelectedItem()).toString().toLowerCase();
+        if ("excel".equalsIgnoreCase(suffix)) {
             suffixList.add("xls");
             suffixList.add("xlsx");
         } else {
@@ -467,8 +471,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private String getFileSuffixToString() {
-        String suffixToString = fileTypeComboBox.getSelectedItem().toString().toLowerCase();
-        if (suffixToString.equalsIgnoreCase("excel")) {
+        String suffixToString = Objects.requireNonNull(fileTypeComboBox.getSelectedItem()).toString().toLowerCase();
+        if ("excel".equalsIgnoreCase(suffixToString)) {
             suffixToString = "xls";
         }
         return suffixToString;
@@ -476,16 +480,17 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) {
         ActionListener fileTypeListener = new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 setPanel.removeAll();
                 localText.setText("");
                 urlText.setText("");
                 if (fileTypeComboBox.getSelectedIndex() == XML) {
-                    setPanel.add(xmlSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(xmlSetPanel(width, height), BorderLayout.NORTH);
                 } else if (fileTypeComboBox.getSelectedIndex() == EXCEL) {
-                    setPanel.add(excelSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(excelSetPanel(width, height), BorderLayout.NORTH);
                 } else {
-                    setPanel.add(textSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(textSetPanel(width, height), BorderLayout.NORTH);
                 }
                 String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "<br>"
                         + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
@@ -503,6 +508,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             String[] paramTexts = new String[1];
             paramTexts[0] = getFilePathFromUrlOrLocal();
@@ -515,6 +521,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
         @Override
         public void checkEnabled() {
+            //do nothing
         }
     }
 
@@ -545,25 +552,25 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         setTextField(xtd);
         editorPane.populate(xtd.getParams());
         encodingComboBox.setSelectedItem(xtd.getCharSet());
-        if (!ComparatorUtils.equals(xtd,new XMLTableData())) {
+        if (!ComparatorUtils.equals(xtd, new XMLTableData())) {
             xmlNodeTree.initData();
             String[] path = xtd.getXPath();
             String[] paths;
             if (path != null && path.length > 0) {
-                DefaultTreeModel treeModel = (DefaultTreeModel)xmlNodeTree.getModel();
+                DefaultTreeModel treeModel = (DefaultTreeModel) xmlNodeTree.getModel();
                 ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
                 if (treeModel != null) {
-                    if(!ComparatorUtils.equals(treeModel.getRoot().toString(),"")){
-                       paths = new String[path.length - 1];
-                       for(int i = 1;i< path.length;i++){
-                           paths[i -1] = path[i];
-                       }
-                    }else{
+                    if (!ComparatorUtils.equals(treeModel.getRoot().toString(), "")) {
+                        paths = new String[path.length - 1];
+                        for (int i = 1; i < path.length; i++) {
+                            paths[i - 1] = path[i];
+                        }
+                    } else {
                         paths = path;
                         root.setUserObject(ROOTTAG);
                     }
                     if (treeModel.getRoot() instanceof ExpandMutableTreeNode) {
-                        selectNode((ExpandMutableTreeNode)treeModel.getRoot(), 0, paths);
+                        selectNode((ExpandMutableTreeNode) treeModel.getRoot(), 0, paths);
                         if (selectedNode != null) {
                             TreePath treepath = new TreePath(treeModel.getPathToRoot(selectedNode));
                             xmlNodeTree.setSelectionPath(treepath);
@@ -571,8 +578,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                         }
                     }
                     //防止某种操作导致添加的tag作为root出现。
-                    if(ComparatorUtils.equals(root.toString(),ROOTTAG)){
-                            root.setUserObject(StringUtils.EMPTY);
+                    if (ComparatorUtils.equals(root.toString(), ROOTTAG)) {
+                        root.setUserObject(StringUtils.EMPTY);
                     }
                 }
             }
@@ -638,7 +645,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         ttd.setDelimiter(this.showDelimiter());
         ttd.setIgnoreOneMoreDelimiter(ignoreOneMoreDelimiterCheckBox.isSelected());
         ttd.setNeedColumnName(needColumnNameCheckBox.isSelected());
-        ttd.setCharset((String)charsetComboBox.getSelectedItem());
+        ttd.setCharset((String) charsetComboBox.getSelectedItem());
         fileTableData = ttd;
         return ttd;
     }
@@ -667,12 +674,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             xmlColumnsList.clear();
             ExpandMutableTreeNode treeNode;
             boolean flag = true;
-            for(int i = 0;i < selectedNode.getChildCount();i++){
+            for (int i = 0; i < selectedNode.getChildCount(); i++) {
                 treeNode = (ExpandMutableTreeNode) selectedNode.getChildAt(i);
-                if(treeNode.isLeaf()){
+                if (treeNode.isLeaf()) {
                     xmlColumnsList.add(treeNode.toString());
-                }else{
-                    if(flag){
+                } else {
+                    if (flag) {
                         flag = false;
                         finalSelectedNode = treeNode;
                         leafNode(treeNode);
@@ -692,34 +699,34 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     //wikky:构建树时为了美观把添加的根节点值赋为空显示，现在还得该回去使得预览时能够顺利取到数据。
-    private String[] getPaths(){
+    private String[] getPaths() {
         TreePath treePath = GUICoreUtils.getTreePath(finalSelectedNode);
         String path = StringUtils.EMPTY;
         if (treePath != null) {
             Object[] paths = treePath.getPath();
             for (int i = 0; i < paths.length; i++) {
-                path+="/" + paths[i];
+                path += "/" + paths[i];
             }
         }
         if (path.startsWith("/")) {
             path = path.substring(1);
         }
         String[] paths = path.split("/");
-        if(ComparatorUtils.equals(paths[0],StringUtils.EMPTY)){
+        if (ComparatorUtils.equals(paths[0], StringUtils.EMPTY)) {
             paths[0] = ROOTTAG;
         }
         return paths;
     }
 
-    private void leafNode(ExpandMutableTreeNode treeNode){
+    private void leafNode(ExpandMutableTreeNode treeNode) {
         boolean flag = true;
         ExpandMutableTreeNode firstNode;
-        for(int i = 0;i < treeNode.getChildCount();i++){
+        for (int i = 0; i < treeNode.getChildCount(); i++) {
             firstNode = (ExpandMutableTreeNode) treeNode.getChildAt(i);
-            if(firstNode.isLeaf()){
+            if (firstNode.isLeaf()) {
                 xmlColumnsList.add(firstNode.toString());
-            }else{
-                if(flag){
+            } else {
+                if (flag) {
                     flag = false;
                     finalSelectedNode = treeNode;
                     leafNode(firstNode);
@@ -729,16 +736,16 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private void selectNode(ExpandMutableTreeNode node, int layer, String[] paths) {
-        if (selectedNode != null || node == null){
+        if (selectedNode != null || node == null) {
             return;
         }
-        if (layer < paths.length && paths[layer] != null && ComparatorUtils.equals(paths[layer],node.getUserObject())) {
-            if (layer == paths.length -1) {
+        if (layer < paths.length && paths[layer] != null && ComparatorUtils.equals(paths[layer], node.getUserObject())) {
+            if (layer == paths.length - 1) {
                 selectedNode = node;
                 return;
             }
             for (int i = 0; i < node.getChildCount(); i++) {
-                selectNode((ExpandMutableTreeNode)node.getChildAt(i), layer + 1, paths);
+                selectNode((ExpandMutableTreeNode) node.getChildAt(i), layer + 1, paths);
             }
         }
     }
@@ -800,8 +807,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             toolbarDef.addShortCut(refreshAction);
             UIToolbar toolBar = ToolBarDef.createJToolBar();
             toolbarDef.updateToolBar(toolBar);
-            toolbarPanel.add(keyPointLaber,BorderLayout.WEST);
-            toolbarPanel.add(toolBar,BorderLayout.EAST);
+            toolbarPanel.add(keyPointLaber, BorderLayout.WEST);
+            toolbarPanel.add(toolBar, BorderLayout.EAST);
             this.add(toolbarPanel, BorderLayout.NORTH);
         }
 
@@ -817,6 +824,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
             }
 
+            @Override
             public void actionPerformed(ActionEvent e) {
                 xmlNodeTree.waitRefresh();
                 xmlNodeTree.refreshData();
@@ -825,7 +833,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private class XMLNodeTree extends JTree {
-        private DefaultTreeModel treeModel;
+        private DefaultTreeModel xmlTreeModel;
 
         private DefaultTreeModel waitTreeModel = null;
 
@@ -845,8 +853,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
 
         private MouseListener treeMouseListener = new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent e) {
-                if (XMLNodeTree.this.getModel() != treeModel){
+                if (XMLNodeTree.this.getModel() != xmlTreeModel) {
                     return;
                 }
                 int selRow = XMLNodeTree.this.getRowForLocation(e.getX(), e.getY());
@@ -858,12 +867,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                     return;//没有选中某个树节点，就直接返回啦
                 }
                 Object selObject = selPath.getLastPathComponent();
-                if (selObject instanceof ExpandMutableTreeNode ) {
+                if (selObject instanceof ExpandMutableTreeNode) {
                     ExpandMutableTreeNode expandMutableTreeNode = (ExpandMutableTreeNode) selObject;
                     if (!expandMutableTreeNode.isLeaf()) {
                         selectedNode = expandMutableTreeNode;
                     } else {
-                        selectedNode = (ExpandMutableTreeNode)expandMutableTreeNode.getParent();
+                        selectedNode = (ExpandMutableTreeNode) expandMutableTreeNode.getParent();
                     }
                 }
             }
@@ -883,7 +892,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
 
         public DefaultTreeModel getTreeModel() {
-            return treeModel;
+            return xmlTreeModel;
         }
 
         //防止界面卡死。
@@ -900,13 +909,13 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         //wikky:为满足706设计时对不合法的xml文件（有多个根节点）的处理，把拿到的InputStream强制在最外层添加<XML></XML>作为唯一根节点而将文件转换为合法的xml。
         private void initData() {
             params = getEditorPaneParameter();  // 生成tree结构放哪儿呢？放这里感觉不对撒
-            treeModel = null;
+            xmlTreeModel = null;
             selectedNode = null;
             xmlColumnsList.clear();
             DataSource dataSource = null;
             if (localFileRadioButton.isSelected()) {
                 String localTextString = StringUtils.trimToNull(localText.getText());
-                if(StringUtils.isEmpty(localTextString)){
+                if (StringUtils.isEmpty(localTextString)) {
                     FineLoggerFactory.getLogger().info("The file path is empty.");
                     loadedTreeModel();
                     return;
@@ -914,7 +923,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 dataSource = new FileDataSource(localTextString, params);
             } else {
                 String urlTextString = StringUtils.trimToNull(urlText.getText());
-                if (StringUtils.isEmpty(urlTextString)){
+                if (StringUtils.isEmpty(urlTextString)) {
                     FineLoggerFactory.getLogger().info("The url path is empty.");
                     loadedTreeModel();
                     return;
@@ -922,7 +931,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 dataSource = new URLDataSource(urlTextString, params);
             }
             try {
-                InputStream in,input;
+                InputStream in, input;
                 if ((in = dataSource.getSourceStream(params)) != null) {
                     String xmlString = Utils.inputStream2String(in, (String) encodingComboBox.getSelectedItem());
                     String stringXml = addTag(xmlString);
@@ -941,16 +950,20 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 loadedTreeModel();
             }
-            if(treeModel.getChildCount(treeModel.getRoot()) == 1){
-                treeModel = new DefaultTreeModel((ExpandMutableTreeNode) treeModel.getChild(treeModel.getRoot(),0));
-            }else{
-                ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
+            if (xmlTreeModel == null) {
+                FineLoggerFactory.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
+                return;
+            }
+            if (xmlTreeModel.getChildCount(xmlTreeModel.getRoot()) == 1) {
+                xmlTreeModel = new DefaultTreeModel((ExpandMutableTreeNode) xmlTreeModel.getChild(xmlTreeModel.getRoot(), 0));
+            } else {
+                ExpandMutableTreeNode root = (ExpandMutableTreeNode) xmlTreeModel.getRoot();
                 root.setUserObject(StringUtils.EMPTY);
             }
-            this.setModel(treeModel);
+            this.setModel(xmlTreeModel);
         }
 
-        private void loadedTreeModel(){
+        private void loadedTreeModel() {
             ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loaded_Tree_Model"));
             rootTreeNode.setExpanded(false);
             rootTreeNode.setAllowsChildren(false);
@@ -958,14 +971,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             XMLNodeTree.this.setModel(loadedTreeModel);
         }
 
-        private String addTag(String string){
+        private String addTag(String string) {
             String stringWithTag;
             int beginIndex = 0;
             int firstIndex = string.indexOf(">");
             int endIndex = string.length();
-            String firstPart = string.substring(beginIndex,firstIndex + 1);
+            String firstPart = string.substring(beginIndex, firstIndex + 1);
             String secondPart = STARTTAG;
-            String thirdPart = string.substring(firstIndex + 1,endIndex);
+            String thirdPart = string.substring(firstIndex + 1, endIndex);
             String lastPart = ENDTAG;
             stringWithTag = firstPart + secondPart + thirdPart + lastPart;
             return stringWithTag;
@@ -986,6 +999,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 this.layer = layer;
             }
 
+            @Override
             public void readXML(XMLableReader reader) {
                 String nodeName;
                 if (this.layer < 0) {
@@ -998,7 +1012,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                     }
                     currentNode = new ExpandMutableTreeNode(nodeName);
                     if (layer == 0) {
-                        treeModel = new DefaultTreeModel(currentNode);
+                        xmlTreeModel = new DefaultTreeModel(currentNode);
                     } else {
                         boolean conflict = false;
                         for (int i = 0; i < parentNode.getChildCount(); i++) {

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -40,7 +40,8 @@ public class MaxMemRowCountPanel extends UIToolbar {
 			}
 		}
 	};
-	
+
+	@Override
 	public Dimension getPreferredSize() {
 		Dimension dim = super.getPreferredSize();
 		dim.width = 340;
@@ -81,7 +82,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	public void setValue(int value) {
 		if (value >= 0) {
 			showMaxPanel();
-			numberSpinner.setValue(Integer.valueOf(value));
+			numberSpinner.setValue(value);
 		} else {
 			showAllPanel();
 		}
@@ -94,4 +95,4 @@ public class MaxMemRowCountPanel extends UIToolbar {
 			return ((Number) numberSpinner.getValue()).intValue();
 		}
 	}
-}
+}

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java

@@ -144,12 +144,14 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             refresh();
         }
 
         @Override
         public void checkEnabled() {
+            //do nothing
         }
     }
 
@@ -259,14 +261,17 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
         private UIButton formulaButton;
         private DocumentListener documentListener = new DocumentListener() {
 
+            @Override
             public void changedUpdate(DocumentEvent e) {
                 updateFormula(formulaContentTextField.getText());
             }
 
+            @Override
             public void insertUpdate(DocumentEvent e) {
                 updateFormula(formulaContentTextField.getText());
             }
 
+            @Override
             public void removeUpdate(DocumentEvent e) {
                 updateFormula(formulaContentTextField.getText());
             }

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@@ -187,6 +187,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
         }
         populateWorker = new SwingWorker<Void, Void>() {
 
+            @Override
             protected Void doInBackground() throws Exception {
                 try {
                     storeProcedureContext.setText(StringUtils.EMPTY);
@@ -204,6 +205,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
                 return null;
             }
 
+            @Override
             public void done() {
                 editorPane.populate(storeprocedure.getParameters());
             }
@@ -218,6 +220,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
      *
      * @param listener 监听器
      */
+    @Override
     public void addStoreProcedureWorkerListener(StoreProcedureWorkerListener listener) {
 
         this.storeProcedureWorkerListener = listener;
@@ -227,6 +230,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
     /**
      * 去除存储过程监听器
      */
+    @Override
     public void removeStoreProcedureWorkerListener() {
         this.storeProcedureWorkerListener = null;
 
@@ -264,6 +268,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             }
             updateWorker = new SwingWorker<Void, Void>() {
     
+                @Override
                 protected Void doInBackground() throws Exception {
                     DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
                     sp.setCalculating(true);
@@ -271,6 +276,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
                     return null;
                 }
     
+                @Override
                 public void done() {
                     DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
                     sp.setCalculating(false);
@@ -328,6 +334,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
     /**
      * 响应数据集改变
      */
+    @Override
     public void fireDSChanged() {
         fireDSChanged(new HashMap<String, String>());
     }
@@ -337,6 +344,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
      *
      * @param map 改变的map
      */
+    @Override
     public void fireDSChanged(Map<String, String> map) {
         DesignTableDataManager.fireDSChanged(map);
     }
@@ -348,6 +356,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent evt) {
         	StoreProcedure sp = updateBeanWithOutExecute();
             StoreProcedureDataWrapper storeProcedureDataWrappe = new StoreProcedureDataWrapper(sp, StringUtils.EMPTY, queryText.getText());
@@ -361,12 +370,14 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             refresh();
         }
 
         @Override
         public void checkEnabled() {
+            //do nothing
         }
     }
 }

designer-base/src/main/java/com/fr/design/dcm/UniversalDatabaseDialog.java

@@ -27,6 +27,6 @@ public class UniversalDatabaseDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
-
+        //do nothing
     }
 }

designer-base/src/main/java/com/fr/design/designer/EditingState.java

@@ -7,6 +7,7 @@ public interface EditingState {
 
 		@Override
 		public void revert() {
+			//do nothing
 		}
 
 	};

designer-base/src/main/java/com/fr/design/designer/creator/CRPropertyDescriptor.java

@@ -4,7 +4,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.stable.StringUtils;
-import com.fr.stable.core.PropertyChangeAdapter;
+import com.fr.stable.core.PropertyChangeListener;
 
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
@@ -17,7 +17,7 @@ public final class CRPropertyDescriptor extends PropertyDescriptor {
     public static final String RENDERER = "renderer";
     private boolean isSubProperty = false;
 
-    private PropertyChangeAdapter l;
+    private PropertyChangeListener l;
 
     public CRPropertyDescriptor(String name, Class<?> beanClass) throws IntrospectionException {
         super(name, beanClass);
@@ -35,7 +35,7 @@ public final class CRPropertyDescriptor extends PropertyDescriptor {
         return this;
     }
 
-    public CRPropertyDescriptor setPropertyChangeListener(PropertyChangeAdapter l) {
+    public CRPropertyDescriptor setPropertyChangeListener(PropertyChangeListener l) {
         this.l = l;
         return this;
     }

designer-base/src/main/java/com/fr/design/dialog/BasicDialog.java

@@ -1,10 +1,10 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
 import java.awt.*;
 
-/*
- * @author _denny
- */
+@Open
 public abstract class BasicDialog extends UIDialog {
 	public static final Dimension SMALL = new Dimension(340, 180);
 	public static final Dimension MEDIUM = new Dimension(600, 400);

designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@@ -1,24 +1,17 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.JPanel;
+import javax.swing.*;
 import javax.swing.event.DocumentEvent;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Window;
-
-/*
- * _denny: 这里的BasicPane通常会有populate & update方法
- * 记得populate 一定要在对应的dialog setVisible之前populate
- */
+import java.awt.*;
+
+@Open
 public abstract class BasicPane extends JPanel {
 
     /**

designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java

@@ -121,12 +121,12 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
 
 		@Override
 		public void addLayoutComponent(String name, Component comp) {
-
+			//do nothing
 		}
 
 		@Override
 		public void removeLayoutComponent(Component comp) {
-
+			//do nothing
 		}
 
 		@Override

designer-base/src/main/java/com/fr/design/dialog/DialogActionAdapter.java

@@ -1,5 +1,8 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
+@Open
 public abstract class DialogActionAdapter implements DialogActionListener {
 	@Override
 	public void doOk() {}

designer-base/src/main/java/com/fr/design/dialog/DialogActionListener.java

@@ -1,8 +1,11 @@
 package com.fr.design.dialog;
 
+import com.fr.common.annotations.Open;
+
+@Open
 public interface DialogActionListener {
-	
-	public void doOk();
-	
-	public void doCancel();
+
+    void doOk();
+
+    void doCancel();
 }

designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java

@@ -363,5 +363,6 @@ public class JWizardDialog extends BasicDialog {
 	
 	@Override
 	public void checkValid() throws Exception {
+		//do nothing
 	}
 }

designer-base/src/main/java/com/fr/design/dialog/JWizardPanel.java

@@ -48,7 +48,7 @@ public class JWizardPanel extends BasicPane {
 
 		// Set the layout for the content area
 		contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		
+
 		contentPane.setBorder(BorderFactory.createEmptyBorder(2, 2, 4, 4));
 
 		// Step title
@@ -60,16 +60,16 @@ public class JWizardPanel extends BasicPane {
 		add(titlePanel, BorderLayout.NORTH);
 		add(contentPane, BorderLayout.CENTER);
 	}
-	
+
 	@Override
 	protected String title4PopupWindow() {
 		return "wizard";
 	}
-	
+
 	/**
 	 * Set the title to use for this step. Normally this title would be unique
 	 * for each wizards step.
-	 * 
+	 *
 	 * @param stepTitle The title to use for this step.
 	 */
 	public void setStepTitle(String stepTitle) {
@@ -82,7 +82,7 @@ public class JWizardPanel extends BasicPane {
 
 	/**
 	 * Get the step title to use for this step.
-	 * 
+	 *
 	 * @return The step title to use for this step.
 	 */
 	public String getStepTitle() {
@@ -93,7 +93,7 @@ public class JWizardPanel extends BasicPane {
 	 * Get a JPanel to use for adding your own components to this WizardPanel.
 	 * Do not add components directly to the JWizardPanel. The JPanel uses the
 	 * layout given in the JWizardPanel constructor.
-	 * 
+	 *
 	 * @return The JPanel to use for adding components for this wizard step.
 	 */
 	public JPanel getContentPane() {
@@ -102,7 +102,7 @@ public class JWizardPanel extends BasicPane {
 
 	/**
 	 * Get the wizard step to go to when the Back button is pressed.
-	 * 
+	 *
 	 * @return The wizard step to go to when the Back button is pressed.
 	 */
 
@@ -114,7 +114,7 @@ public class JWizardPanel extends BasicPane {
 	 * Set the wizard step to go to when the Back button is pressed. This should
 	 * be set in the constructor of the JWizardPanel subclass since it
 	 * determines whether the Back button is enabled or not.
-	 * 
+	 *
 	 * @param backStep
 	 *            The wizard step to go to when the Back button is pressed.
 	 */
@@ -129,7 +129,7 @@ public class JWizardPanel extends BasicPane {
 
 	/**
 	 * Get the wizard step to go to when the Next button is pressed.
-	 * 
+	 *
 	 * @return The wizard step to go to when the Next button is pressed.
 	 */
 	public int getNextStep() {
@@ -140,7 +140,7 @@ public class JWizardPanel extends BasicPane {
 	 * Set the wizard step to go to when the Next button is pressed. This should
 	 * be set in the constructor of the JWizardPanel subclass since it
 	 * determines whether the Next and Finish buttons are enabled or not.
-	 * 
+	 *
 	 * @param nextStep The wizard step to go to when the Next button is pressed.
 	 */
 	public void setNextStep(int nextStep) {
@@ -154,7 +154,7 @@ public class JWizardPanel extends BasicPane {
 	/**
 	 * Returns the JWizardDialog in which this JWizardPanel resides. This is
 	 * valid only after the panel has been added to the dialog.
-	 * 
+	 *
 	 * @return The JWizardDialog in which this JWizardPanel resides.
 	 */
 
@@ -168,7 +168,7 @@ public class JWizardPanel extends BasicPane {
 	public void addNotify() {
 		if (firstNotify) {
 			Font font = stepTitleLabel.getFont();
-			font = font.deriveFont(Font.BOLD, font.getSize() * 14 / 10);
+			font = font.deriveFont(Font.BOLD, (float) (font.getSize() * 14 / 10.0D));
 			stepTitleLabel.setFont(font);
 			firstNotify = false;
 		}
@@ -177,7 +177,7 @@ public class JWizardPanel extends BasicPane {
 
 	/**
 	 * Set the JWizardDialog parent for this JWizardPanel.
-	 * 
+	 *
 	 * @param dialogParent
 	 *            The JWizardPanel parent for this JWizardPanel.
 	 */
@@ -188,7 +188,7 @@ public class JWizardPanel extends BasicPane {
 	/**
 	 * Calls back(). This allows the JWizardDialog to call the protected method
 	 * back().
-	 * 
+	 *
 	 * @see #back()
 	 */
 
@@ -199,7 +199,7 @@ public class JWizardPanel extends BasicPane {
 	/**
 	 * Calls next(). This allows the JWizardDialog to call the protected method
 	 * next().
-	 * 
+	 *
 	 * @see #next()
 	 */
 	void doNext() {
@@ -209,7 +209,7 @@ public class JWizardPanel extends BasicPane {
 	/**
 	 * Called when the Back button is pressed. By default this displays the
 	 * wizard step set by setBackStep().
-	 * 
+	 *
 	 * @see #setBackStep(int)
 	 */
 	protected void back() {
@@ -219,11 +219,11 @@ public class JWizardPanel extends BasicPane {
 	/**
 	 * Called when the Next button is pressed. By default this displays the
 	 * wizard step set by setNextStep().
-	 * 
+	 *
 	 * @see #setNextStep(int)
 	 */
 	protected void next() {
 		dialogParent.goTo(getNextStep());
 	}
 
-}
+}

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -25,13 +25,7 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 
-/**
- * Created with IntelliJ IDEA.
- * User: 小灰灰
- * Date: 13-7-16
- * Time: 下午2:17
- * To change this template use File | Settings | File Templates.
- */
+
 public abstract class UIDialog extends JDialog {
     public static final String OK_BUTTON = "basic_ok";
     public static final String CANCEL_BUTTON = "basic_cancel";

designer-base/src/main/java/com/fr/design/editor/editor/WidgetNameEditor.java

@@ -1,18 +1,17 @@
 package com.fr.design.editor.editor;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-
-import javax.swing.JList;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-
 import com.fr.design.DesignModelAdapter;
-import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.icombobox.FilterComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.stable.js.WidgetName;
 
+import javax.swing.JList;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
 /**
  * the editor to edit WidgetName
  *
@@ -43,12 +42,12 @@ public class WidgetNameEditor extends Editor<WidgetName> {
 
 			@Override
 			public void popupMenuCanceled(PopupMenuEvent e) {
-
+				//do nothing
 			}
 
 			@Override
 			public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-
+				//do nothing
 			}
 
 			@Override

designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

@@ -64,7 +64,9 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
         writer.attr("path", path);
     }
 
+
     @Override
+    @SuppressWarnings("squid:S2975")
     public Object clone() throws CloneNotSupportedException {
         LocalDesignerWorkspaceInfo object = (LocalDesignerWorkspaceInfo)super.clone();
 

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -79,6 +79,7 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     }
 
     @Override
+    @SuppressWarnings("squid:S2975")
     public Object clone() throws CloneNotSupportedException {
 
         RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo) super.clone();

designer-base/src/main/java/com/fr/design/extra/AppStoreBuilder.java

@@ -10,10 +10,10 @@ package com.fr.design.extra;
 public class AppStoreBuilder {
 
     public void checkStoreJavaSciptVersion() {
-
+        //do nothing
     }
 
     public void updateStoreJavaScript() {
-
+        //do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/LoginDialog.java

@@ -4,12 +4,8 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StableUtils;
 
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
+import javax.swing.*;
+import java.awt.*;
 
 /**
  * Created by vito on 2017/5/5.
@@ -41,5 +37,6 @@ public class LoginDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/LoginWebBridge.java

@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.base.passport.FinePassportManager;
+import com.fr.concurrent.NamedThreadFactory;
 import com.fr.config.MarketConfig;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.exe.PluginLoginExecutor;
@@ -8,47 +9,28 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
 import javafx.concurrent.Task;
 import javafx.scene.web.WebEngine;
 import netscape.javascript.JSObject;
-import javax.swing.JDialog;
-import javax.swing.SwingUtilities;
-import java.awt.Color;
-import java.awt.Desktop;
-import java.io.UnsupportedEncodingException;
+
+import javax.swing.*;
+import java.awt.*;
 import java.net.URI;
-import java.net.URLEncoder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author vito
  */
 public class LoginWebBridge {
 
-    //默认查询消息时间, 30s
-    private static final long CHECK_MESSAGE_TIME = 30 * 1000L;
-    //数据查询正常的标志 ok
-    private static final String SUCCESS_MESSAGE_STATUS = "ok";
-    //数据通讯失败
-    private static final String FAILED_MESSAGE_STATUS = "error";
     //最低消息的条数
     private static final int MIN_MESSAGE_COUNT = 0;
-    //登录成功
-    private static final String LOGININ = "0";
-    //用户名不存在
-    private static final String USERNAME_NOT_EXSIT = "-1";
-    //密码错误
-    private static final String PASSWORD_ERROR = "-2";
-    //未知错误
-    private static final String UNKNOWN_ERROR = "-3";
     //网络连接失败
     private static final String NET_FAILED = "-4";
     //用户名，密码为空
     private static final String LOGIN_INFO_EMPTY = "-5";
-    private static final int TIME_OUT = 10000;
-    private static final String LOGIN_SUCCESS = "ok";
-    private static final String LOGIN_FAILED = "failed";
     private static final Color LOGIN_BACKGROUND = new Color(184, 220, 242);
     private static LoginWebBridge helper;
     //消息条数
@@ -131,22 +113,6 @@ public class LoginWebBridge {
         return client.isServerAlive();
     }
 
-    private String encode(String str) {
-        try {
-            return URLEncoder.encode(str, EncodeConstants.ENCODING_UTF_8);
-        } catch (UnsupportedEncodingException e) {
-            return str;
-        }
-    }
-
-    private void sleep(long millis) {
-        try {
-            Thread.sleep(millis);
-        } catch (InterruptedException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-    }
-
     /**
      * 注册页面
      */
@@ -178,7 +144,9 @@ public class LoginWebBridge {
      */
     public void defaultLogin(String username, String password, final JSObject callback) {
         Task<Void> task = new PluginTask<>(webEngine, callback, new PluginLoginExecutor(username, password));
-        new Thread(task).start();
+        ExecutorService es = Executors.newSingleThreadExecutor(new NamedThreadFactory("bbsDefaultLogin"));
+        es.submit(task);
+        es.shutdown();
     }
 
     /**
@@ -250,10 +218,7 @@ public class LoginWebBridge {
         }
     }
 
-
     public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
-        if (url.indexOf("qqLogin.html") > 0) {
-            return;
-        }
+        // do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java

@@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
 
-
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -88,7 +87,7 @@ public abstract class PluginAbstractLoadingViewPane<V, T> extends PluginAbstract
 
             @Override
             public void pressInstallButton() {
-
+                // do nothing
             }
 
             @Override

designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java

@@ -7,7 +7,6 @@ import com.fr.design.gui.ilist.UIList;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.IOUtils;
-
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.license.Licensed;
 import com.fr.plugin.manage.PluginManager;
@@ -15,6 +14,7 @@ import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
@@ -22,7 +22,7 @@ import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -142,6 +142,7 @@ public class PluginControlPane extends BasicPane {
         }
     }
 
+    @Nullable
     public PluginView getSelectedPlugin() {
         return (PluginView) pluginList.getSelectedValue();
     }
@@ -153,7 +154,7 @@ public class PluginControlPane extends BasicPane {
         PluginManager.getController().uninstall(PluginMarker.create(id, version), true, new PluginTaskCallback() {
             @Override
             public void done(PluginTaskResult result) {
-
+                // do nothing
             }
         });
     }

designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@@ -13,11 +13,7 @@ import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;
 import java.util.List;
@@ -28,8 +24,6 @@ import java.util.List;
  * @since 8.0
  */
 public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<PluginView>, Void> {
-    private static final int LISTNUM1 = 1;
-    private static final int LISTNUM100 = 100;
     private UILabel errorMsgLabel;
     private UITabbedPane tabbedPane;
     private PluginControlPane controlPane;
@@ -45,6 +39,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @return 创建的页面对象
      */
+    @Override
     public JPanel createSuccessPane() {
         return new PluginStatusCheckCompletePane() {
 
@@ -99,7 +94,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
 
             @Override
             public void pressInstallButton() {
-
+                // do nothing
             }
 
             @Override
@@ -130,8 +125,8 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @return 插件
      */
+    @Override
     public List<PluginView> loadData() throws Exception {
-        //Thread.sleep(3000);
         return PluginsReaderFromStore.readPlugins();
     }
 
@@ -140,6 +135,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @param plugins 插件
      */
+    @Override
     public void loadOnSuccess(List<PluginView> plugins) {
         controlPane.loadPlugins(plugins);
         tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins") + "(" + plugins.size() + ")");
@@ -150,10 +146,12 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @param e 异常消息
      */
+    @Override
     public void loadOnFailed(Exception e) {
         errorMsgLabel.setText(e.getCause().getMessage());
     }
 
+    @Override
     protected void installFromDiskFile() {
         JFileChooser fileChooser = new JFileChooser();
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -172,7 +170,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
             PluginManager.getController().install(chosenFile, new ProgressCallback() {
                 @Override
                 public void updateProgress(String description, double progress) {
-
+                    // do nothing
                 }
 
                 @Override
@@ -196,10 +194,11 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
         }
         if (StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
             PluginView plugin = controlPane.getSelectedPlugin();
-            String id = null;
-            if (plugin != null) {
-                id = plugin.getID();
+            if (plugin == null) {
+                FineLoggerFactory.getLogger().error("selected plugin is null");
+                return;
             }
+            String id = plugin.getID();
 
             try {
                 PluginMarker pluginMarker = PluginMarker.create(id, plugin.getVersion());
@@ -219,6 +218,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @return 标题字符串
      */
+    @Override
     public String textForLoadingLabel() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Load_Plugins_From_Server");
     }

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -96,7 +96,7 @@ public class PluginOperateUtils {
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Confirmed"),
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
-                        JOptionPane.INFORMATION_MESSAGE
+                        JOptionPane.WARNING_MESSAGE
                 );
                 if (rv == JOptionPane.OK_OPTION) {
                     PluginMarker pluginMarker = PluginUtils.createPluginMarker(pluginInfo);

designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@@ -4,7 +4,6 @@ import com.fr.config.MarketConfig;
 import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
-
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
@@ -192,7 +191,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
         PluginManager.getController().update(chosenFile, new ProgressCallback() {
             @Override
             public void updateProgress(String description, double progress) {
-
+                // do nothing
             }
 
             @Override

designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@@ -55,7 +55,7 @@ public class PluginWebBridge {
     private static PluginWebBridge helper;
 
     private UIDialog uiDialog;
-    private ACTIONS action;
+    private ACTIONS actions;
 
     private Map<String, Object> config;
     private WebEngine webEngine;
@@ -94,10 +94,10 @@ public class PluginWebBridge {
      * @return 配置信息
      */
     public String getRunConfig() {
-        if (action != null) {
+        if (actions != null) {
             JSONObject jsonObject = new JSONObject();
             try {
-                jsonObject.put(ACTION, action.getContext());
+                jsonObject.put(ACTION, actions.getContext());
                 Set<String> keySet = config.keySet();
                 for (String key : keySet) {
                     jsonObject.put(key, config.get(key).toString());
@@ -117,7 +117,7 @@ public class PluginWebBridge {
      * @param config 参数
      */
     public void setRunConfig(ACTIONS action, Map<String, Object> config) {
-        this.action = action;
+        this.actions = action;
         this.config = config;
     }
 
@@ -125,7 +125,7 @@ public class PluginWebBridge {
      * 清楚打开动作
      */
     public void clearRunConfig() {
-        this.action = null;
+        this.actions = null;
         this.config = null;
     }
 

designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java

@@ -3,7 +3,6 @@ package com.fr.design.extra;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 
-
 import javax.swing.*;
 import java.awt.*;
 
@@ -27,6 +26,7 @@ public class QQLoginDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 
 }

designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java

@@ -163,7 +163,7 @@ public class QQLoginWebPane extends JFXPanel {
         final BooleanProperty confirmationResult = new SimpleBooleanProperty();
         // initialize the confirmation dialog
         final Stage dialog = new Stage(StageStyle.UTILITY);
-        dialog.setX(Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - DEFAULT_CONFIRM_WIDTH / 2 + DEFAULT_OFFEST);
+        dialog.setX(Toolkit.getDefaultToolkit().getScreenSize().getWidth() / 2 - DEFAULT_CONFIRM_WIDTH / 2.0D + DEFAULT_OFFEST);
         dialog.setY(Toolkit.getDefaultToolkit().getScreenSize().getHeight() / 2 + DEFAULT_OFFEST);
         dialog.setHeight(DEFAULT_CONFIRM_HEIGHT);
         dialog.setWidth(DEFAULT_CONFIRM_WIDTH);

designer-base/src/main/java/com/fr/design/extra/ShopDialog.java

@@ -29,5 +29,6 @@ public class ShopDialog extends UIDialog {
 
     @Override
     public void checkValid() throws Exception {
+        // do nothing
     }
 }

designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@@ -5,17 +5,16 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.CloudCenter;
 import com.fr.general.CommonIOUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
-
-import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
+import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.PluginStoreConstants;
-import com.fr.plugin.PluginVerifyException;
 import com.fr.stable.CommonUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.ProductConstants;
@@ -280,7 +279,10 @@ public class WebViewDlgHelper {
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
                         JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.INFORMATION_MESSAGE);
                     }
-                } catch (InterruptedException | ExecutionException e) {
+                } catch (InterruptedException e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    Thread.currentThread().interrupt();
+                } catch (ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
 
@@ -292,10 +294,9 @@ public class WebViewDlgHelper {
         new SwingWorker<Void, Void>() {
             @Override
             protected Void doInBackground() throws Exception {
-                HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.plugin.update") + "?" + PluginUtils.FR_VERSION + "=" + ProductConstants.VERSION + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
-                httpClient.asGet();
-                if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    String text = httpClient.getResponseText();
+                String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.update");
+                if (url != null) {
+                    String text = HttpToolbox.get(url + "?" + PluginUtils.FR_VERSION + "=" + ProductConstants.VERSION + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
                     JSONObject resultJSONObject = new JSONObject(text);
                     String isLatest = resultJSONObject.optString("result");
                     if (!ComparatorUtils.equals(isLatest, LATEST)) {

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -53,7 +53,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
                     null,
                     null
             );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
                 return;
             }
             List<PluginTask> pluginTasks = result.getPreTasks();
@@ -73,7 +73,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
                     null,
                     null
             );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
                 return;
             }
             PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback);

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -51,7 +51,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
                     null,
                     null
             );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
                 return;
             }
             List<PluginTask> pluginTasks = result.getPreTasks();
@@ -71,7 +71,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
                     null,
                     null
             );
-            if (rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
+            if (rv == JOptionPane.NO_OPTION || rv == JOptionPane.CANCEL_OPTION || rv == JOptionPane.CLOSED_OPTION) {
                 return;
             }
             PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback);

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

@@ -264,11 +264,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
                 if (size == index + 1 && index > 0) {
                     //如果删除的是后一个Tab，则定位到前一个
                     MutilTempalteTabPane.getInstance().setSelectedIndex(index - 1);
-                    JTemplate selectedFile = MutilTempalteTabPane.getInstance().getSelectedFile();
-                    if (!isCurrentEditingFile(selectedFile.getPath())) {
-                        //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
-                        DesignerContext.getDesignerFrame().activateJTemplate(selectedFile);
-                    }
                 }
             }
         }
@@ -277,6 +272,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
         if (openFileCount == 0) {
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();
         }
+
+        JTemplate selectedFile = MutilTempalteTabPane.getInstance().getSelectedFile();
+        if (!isCurrentEditingFile(selectedFile.getPath())) {
+            //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
+            DesignerContext.getDesignerFrame().activateJTemplate(selectedFile);
+        }
+
         MutilTempalteTabPane.getInstance().repaint();
     }
 

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

@@ -21,26 +21,9 @@ import com.fr.third.javax.annotation.Nonnull;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.TplOperator;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
+import javax.swing.*;
 import javax.swing.plaf.basic.BasicMenuItemUI;
-import java.awt.AWTEvent;
-import java.awt.AlphaComposite;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.awt.event.AWTEventListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -156,6 +139,9 @@ public class MutilTempalteTabPane extends JComponent {
     }
 
     public JTemplate getSelectedFile() {
+        if (openedTemplate.size() == selectedIndex) {
+            selectedIndex = Math.max(--selectedIndex, 0);
+        }
         return openedTemplate.get(selectedIndex);
     }
 
@@ -322,7 +308,7 @@ public class MutilTempalteTabPane extends JComponent {
     @Override
     public void paintComponent(Graphics g) {
         super.paintComponent(g);
-        double maxWidth = getWidth() - LIST_BUTTON_WIDTH; //最大宽度
+        double maxWidth = getWidth() - LIST_BUTTON_WIDTH * 1.0D; //最大宽度
         Graphics2D g2d = (Graphics2D) g;
         paintBackgroundAndLine(g2d, maxWidth);
     }
@@ -395,8 +381,8 @@ public class MutilTempalteTabPane extends JComponent {
         //画下面的那条线
         if (templateStartX < maxWidth) {
             GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, 2);
-            generalPath.moveTo((float) templateStartX, getHeight() - 1);
-            generalPath.lineTo((float) maxWidth, getHeight() - 1);
+            generalPath.moveTo((float) templateStartX, (float) (getHeight() - 1.0D));
+            generalPath.lineTo((float) maxWidth, (float) (getHeight() - 1.0D));
             g2d.fill(generalPath);
             //TODO hzzz delete
 //            g2d.setPaint(UIConstants.LINE_COLOR);
@@ -406,7 +392,7 @@ public class MutilTempalteTabPane extends JComponent {
 
     private void paintDefaultBackground(Graphics2D g2d) {
         //画默认背景
-        g2d.setPaint(new GradientPaint(1, 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND, 1, getHeight() - 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND));
+        g2d.setPaint(new GradientPaint(1, 1, UIConstants.TEMPLATE_TAB_PANE_BACKGROUND, 1, (float) (getHeight() - 1.0D), UIConstants.TEMPLATE_TAB_PANE_BACKGROUND));
         g2d.fillRect(0, 0, getWidth(), getHeight());
     }
 
@@ -532,7 +518,7 @@ public class MutilTempalteTabPane extends JComponent {
         double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX};
         double[] y = {1, getHeight() + 1, getHeight() + 1, 1, 1};
         RoundRectangle2D.Double rect1 = new RoundRectangle2D.Double(templateStartX, 1, this.getWidth(), this.getHeight(), 7, 7);
-        g2d.setPaint(new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, getHeight() - 1, UIConstants.SELECT_TAB));
+        g2d.setPaint(new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, (float) (getHeight() - 1.0D), UIConstants.SELECT_TAB));
         //选了30度和60度的特殊角度的x,y作为经过的两个点的坐标
         double specialLocation1 = 2.5;
         double specialLocation2 = 4.330127;
@@ -587,9 +573,9 @@ public class MutilTempalteTabPane extends JComponent {
         double[] x = {templateStartX, templateStartX, templateStartX + realWidth, templateStartX + realWidth, templateStartX};
         double[] y = {-1, getHeight() - 1, getHeight() - 1, -1, -1};
         if (selfIndex == mouseOveredIndex) {
-            g2d.setPaint(new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, getHeight() - 1, UIConstants.HOVER_BLUE));
+            g2d.setPaint(new GradientPaint(1, 1, UIConstants.HOVER_BLUE, 1, (float) (getHeight() - 1.0D), UIConstants.HOVER_BLUE));
         } else {
-            g2d.setPaint(new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, getHeight() - 1, UIConstants.SHADOW_GREY));
+            g2d.setPaint(new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, (float) (getHeight() - 1.0D), UIConstants.SHADOW_GREY));
         }
 
 
@@ -851,7 +837,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseEntered(MouseEvent e) {
-
+            // do nothing
         }
 
         /**
@@ -874,6 +860,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseReleased(MouseEvent e) {
+            // do nothing
         }
 
         /**
@@ -883,6 +870,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseClicked(MouseEvent e) {
+            // do nothing
         }
 
         /**
@@ -954,6 +942,7 @@ public class MutilTempalteTabPane extends JComponent {
          */
         @Override
         public void mouseDragged(MouseEvent e) {
+            // do nothing
         }
 
         /**

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

@@ -11,7 +11,9 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.AuthorityOperator;
+import com.fr.workspace.server.authority.decision.DecisionOperator;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 
 public class NodeAuthProcessor {
@@ -39,14 +41,21 @@ public class NodeAuthProcessor {
         authPaths.clear();
         if (!WorkContext.getCurrent().isLocal()) {
             try {
-                String username = WorkContext.getCurrent().getConnection().getUserName();
-                // 远程设计获取全部设计成员的权限列表
-                DesignAuthority[] authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities();
+                String userName = WorkContext.getCurrent().getConnection().getUserName();
+                DesignAuthority[] authorities = null;
+                try {
+                    String userId = WorkContext.getCurrent().get(DecisionOperator.class).getUserIdByName(userName);
+                    authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities(userId);
+                } catch(UndeclaredThrowableException e) {
+                    // 兼容旧版本的服务器
+                    authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities();
+                }
+                // 远程设计获取设计成员的权限列表
                 DesignAuthority authority = null;
 
                 if (authorities != null) {
                     for (DesignAuthority designAuthority : authorities) {
-                        if (ComparatorUtils.equals(designAuthority.getUsername(), username)) {
+                        if (ComparatorUtils.equals(designAuthority.getUsername(), userName)) {
                             authority = designAuthority;
                         }
                     }
@@ -126,7 +135,7 @@ public class NodeAuthProcessor {
      * @param fileNode file nodes
      * @return 带权限信息的文件节点
      */
-    public boolean fixFileNodeAuth(FileNode fileNode) {
+    public boolean checkFileNodeAuth(FileNode fileNode) {
 
         boolean isLocal = WorkContext.getCurrent().isLocal();
         boolean isRoot = WorkContext.getCurrent().isRoot();

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -27,17 +27,7 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
 
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TreeSelectionEvent;
@@ -47,10 +37,7 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -148,10 +135,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         keyWordTextField.addKeyListener(new KeyListener() {
             @Override
             public void keyTyped(KeyEvent e) {
+                //do nothing
             }
 
             @Override
             public void keyReleased(KeyEvent e) {
+                //do nothing
             }
 
             @Override
@@ -236,7 +225,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
 
     protected void extendCheckBoxPane(JPanel checkBoxPane) {
-
+        // do nothing
     }
 
     private void configFormulaArea() {
@@ -412,6 +401,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
     @Override
     public void keyTyped(KeyEvent e) {
+        // do nothing
     }
 
     protected void search(String keyWord, boolean findDescription) {

designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@@ -194,6 +194,7 @@ public class JavaEditorPane extends BasicPane {
                         JOptionPane.showMessageDialog(null, message);
                     } catch (InterruptedException e1) {
                         FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
+                        Thread.currentThread().interrupt();
                     } catch (ExecutionException e1) {
                         FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
                     }

designer-base/src/main/java/com/fr/design/formula/VariableResolverAdapter.java

@@ -23,6 +23,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      *
      * @return 内置参数
      */
+    @Override
     public String[] resolveCurReportVariables() {
         String[] variables = new String[]{
                 ScriptConstants.SUMMARY_TAG + "page_number",
@@ -38,10 +39,10 @@ public abstract class VariableResolverAdapter implements VariableResolver {
                 CalculatorProvider.SERVER_PORT, CalculatorProvider.SERVER_URL, CalculatorProvider.CONTEXT_PATH, CalculatorProvider.SESSION_ID
         };
         Set<BuiltInParametersProvider> set = ExtraClassManager.getInstance().getArray(BuiltInParametersProvider.XML_TAG);
-        for (BuiltInParametersProvider provider : set) {
-            return (String[]) ArrayUtils.addAll(variables, new String[]{
-                    ScriptConstants.DETAIL_TAG + provider.getParametersName()
-            });
+            for (BuiltInParametersProvider provider : set) {
+                ArrayUtils.addAll(variables, new String[]{
+                        ScriptConstants.DETAIL_TAG + provider.getParametersName()
+                });
         }
         return variables;
     }
@@ -65,6 +66,8 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      *
      * @return 所有参数
      */
+    @Override
+    @SuppressWarnings("squid:S2259")
     public String[] resolveTableDataParameterVariables() {
         Parameter[] parameters = getCurrentModeParameters(TABLE_DATA_PARA);
         String[] parameterNames = new String[parameters.length];
@@ -79,6 +82,8 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      *
      * @return 所有参数
      */
+    @Override
+    @SuppressWarnings("squid:S2259")
     public String[] resolveReportParameterVariables() {
         Parameter[] parameters = getCurrentModeParameters(REPORT_DATA_PARA);
         String[] parameterNames = new String[parameters.length];
@@ -93,6 +98,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
      *
      * @return 所有参数
      */
+    @Override
     public String[] resolveGlobalParameterVariables() {
         // 加上全局的参数
         Parameter[] globalParameters = ParameterConfig.getInstance().getGlobalParameters();

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

@@ -1,14 +1,8 @@
 package com.fr.design.fun;
 
-import com.fr.design.report.AbstractExportPane;
+import com.fr.design.beans.BasicStorePane;
 import com.fr.stable.fun.mark.Mutable;
 
-import javax.swing.*;
-
-/**
- * Created by vito on 16/5/5.
- */
-
 /**
  * 导出属性Tab页的接口
  */
@@ -18,31 +12,9 @@ public interface ExportAttrTabProvider extends Mutable {
     int CURRENT_LEVEL = 1;
 
     /**
-     * 转换成SwingComponent
-     *
-     * @return JComponent
-     */
-    JComponent toSwingComponent();
-
-    /**
-     * 转换成AbstractExportPane
-     *
-     * @return AbstractExportPane
-     */
-    AbstractExportPane toExportPane();
-
-    /**
-     * tab的标题
-     *
-     * @return
-     */
-    String title();
-
-    /**
-     * tag标签
+     * 转换成业务视图界面
      *
-     * @return tag名称
-     * @deprecated 将来不使用tag作为区分
+     * @return 业务视图界面
      */
-    String tag();
+    BasicStorePane<?> toServiceComponent();
 }

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

@@ -0,0 +1,23 @@
+package com.fr.design.fun;
+
+import com.fr.common.annotations.Open;
+import com.fr.stable.fun.mark.Mutable;
+
+import java.util.List;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@Open
+public interface MultiStyleUIConfigProvider extends Mutable {
+    String XML_TAG = "MultiStyleUIConfigProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 获取配置项list
+     *
+     * @return 配置项list
+     */
+    List<StyleUIConfigProvider> getConfigList();
+}

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

@@ -17,6 +17,7 @@ public interface ParameterWidgetOptionProvider extends Mutable {
 
     /**
      * 自定义参数控件的实际类，该类需要继承自com.fr.form.ui.Widget
+     * 如果有控件值属性，该类需要实现DataControl接口，否则可能有部分功能无法使用，比如：值编辑器选择控件的时候无法找到插件里的控件
      * @return 控件类
      */
     Class<? extends Widget> classForWidget();

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

@@ -0,0 +1,40 @@
+package com.fr.design.fun;
+
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILEChooserPane;
+import com.fr.stable.fun.mark.Mutable;
+
+import javax.swing.Icon;
+
+/**
+ * Created by kerry on 2019-10-11
+ */
+public interface ReportSupportedFileUIProvider extends Mutable {
+
+    int CURRENT_LEVEL = 1;
+
+    String XML_TAG = "ReportSupportedFileUIProvider";
+
+    /**
+     * 向文件选择器中添加指定文件类型过滤器
+     * @param fileChooser 文件选择器
+     * @param suffix 文件后缀
+     */
+    void addChooseFileFilter(FILEChooserPane fileChooser, String suffix);
+
+
+    /**
+     * 获取文件关联的icon
+     * @param path 文件路径
+     * @param isShowLock 是否显示被锁住
+     * @return 对应的图标
+     */
+    Icon getFileIcon(String path,boolean isShowLock);
+
+    /**
+     * 保存为新类型文件
+     * @param targetPath 目标路径
+     * @param jTemplate 模板对象
+     */
+    boolean saveToNewFile(String targetPath, JTemplate jTemplate);
+}

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

@@ -0,0 +1,39 @@
+package com.fr.design.fun;
+
+import com.fr.base.Style;
+import com.fr.common.annotations.Open;
+import com.fr.stable.fun.mark.Mutable;
+
+import javax.swing.JComponent;
+import javax.swing.event.ChangeListener;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@Open
+public interface StyleUIConfigProvider extends Mutable {
+    String XML_TAG = "CustomStyleUIConfigProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * @return 配置名
+     */
+    String configName();
+
+    /**
+     * @param changeListener 需要添加的listener
+     * @return 对应的component
+     */
+    JComponent uiComponent(ChangeListener changeListener);
+
+    /**
+     * @return 更新后的样式
+     */
+    Style updateConfig();
+
+    /**
+     * @param style 待渲染的样式
+     */
+    void populateConfig(Style style);
+}

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

@@ -1,6 +1,8 @@
 package com.fr.design.fun;
 
+import com.fr.design.mainframe.JTemplate;
 import com.fr.form.ui.Widget;
+import com.fr.stable.Filter;
 import com.fr.stable.fun.mark.Mutable;
 
 /**
@@ -8,7 +10,7 @@ import com.fr.stable.fun.mark.Mutable;
  * @since : 8.0
  * 自定义web工具栏菜单
  */
-public interface ToolbarItemProvider extends Mutable {
+public interface ToolbarItemProvider extends Mutable, Filter<JTemplate> {
 
     String XML_TAG = "ToolbarItemProvider";
 
@@ -36,4 +38,12 @@ public interface ToolbarItemProvider extends Mutable {
      */
     String nameForWidget();
 
+    /**
+     * 模板（决策报表 or cpt）是否支持此工具栏按钮
+     * JTemplate  模板
+     * @return 支持返回true, 否则false
+     */
+    @Override
+    boolean accept(JTemplate template);
+
 }

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

@@ -1,19 +1,55 @@
 package com.fr.design.fun.impl;
 
+import com.fr.design.beans.BasicStorePane;
 import com.fr.design.fun.ExportAttrTabProvider;
+import com.fr.design.report.AbstractExportPane;
+import com.fr.stable.StringUtils;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
+import javax.swing.*;
+
 /**
  * Created by vito on 16/5/5.
  */
 @API(level = ExportAttrTabProvider.CURRENT_LEVEL)
-public abstract class AbstractExportAttrTabProvider extends AbstractProvider implements ExportAttrTabProvider  {
+public abstract class AbstractExportAttrTabProvider extends AbstractProvider implements ExportAttrTabProvider {
     @Override
     public int currentAPILevel() {
         return CURRENT_LEVEL;
     }
 
+    /**
+     * @see ExportAttrTabProvider#toServiceComponent()
+     */
+    @Deprecated
+    public AbstractExportPane toExportPane() {
+        return null;
+    }
+
+    /**
+     * @see ExportAttrTabProvider#toServiceComponent()
+     */
+    @Deprecated
+    public JComponent toSwingComponent() {
+        return toServiceComponent();
+    }
+
+    @Deprecated
+    public String title() {
+        return StringUtils.EMPTY;
+    }
+
+    @Deprecated
+    public String tag() {
+        return StringUtils.EMPTY;
+    }
+
+    @Override
+    public BasicStorePane<?> toServiceComponent() {
+        return toExportPane();
+    }
+
     @Override
     public String mark4Provider() {
         return this.getClass().getName();

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

@@ -0,0 +1,26 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.StyleUIConfigProvider;
+import com.fr.design.fun.MultiStyleUIConfigProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@API(level = MultiStyleUIConfigProvider.CURRENT_LEVEL)
+public abstract class AbstractMultiStyleUIConfigProvider extends AbstractProvider implements MultiStyleUIConfigProvider {
+    @Override
+    public List<StyleUIConfigProvider> getConfigList() {
+        return new ArrayList<StyleUIConfigProvider>();
+    }
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.ReportSupportedFileUIProvider;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILEChooserPane;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import javax.swing.Icon;
+
+/**
+ * Created by kerry on 2019-10-14
+ */
+@API(level = ReportSupportedFileUIProvider.CURRENT_LEVEL)
+public abstract class AbstractReportSupportedFileUIProvider extends AbstractProvider implements ReportSupportedFileUIProvider {
+    @Override
+    public void addChooseFileFilter(FILEChooserPane fileChooser, String suffix) {
+
+    }
+
+    @Override
+    public Icon getFileIcon(String path, boolean isShowLock) {
+        return null;
+    }
+
+    @Override
+    public boolean saveToNewFile(String targetPath, JTemplate jTemplate) {
+        return false;
+    }
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.fr.design.fun.impl;
+
+import com.fr.base.Style;
+import com.fr.design.fun.StyleUIConfigProvider;
+import com.fr.stable.StringUtils;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import javax.swing.JComponent;
+import javax.swing.event.ChangeListener;
+
+/**
+ * Created by kerry on 2019-11-11
+ */
+@API(level = StyleUIConfigProvider.CURRENT_LEVEL)
+public class AbstractStyleUIConfigProvider extends AbstractProvider implements StyleUIConfigProvider {
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String configName() {
+        return StringUtils.EMPTY;
+    }
+
+    @Override
+    public JComponent uiComponent(ChangeListener changeListener) {
+        return null;
+    }
+
+    @Override
+    public Style updateConfig() {
+        return null;
+    }
+
+    @Override
+    public void populateConfig(Style style) {
+
+    }
+}

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

@@ -1,6 +1,9 @@
 package com.fr.design.fun.impl;
 
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.fun.ToolbarItemProvider;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JVirtualTemplate;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -10,6 +13,7 @@ import com.fr.stable.fun.mark.API;
 @API(level = ToolbarItemProvider.CURRENT_LEVEL)
 public abstract class AbstractToolbarItem extends AbstractProvider implements ToolbarItemProvider {
 
+    @Override
     public int currentAPILevel() {
         return CURRENT_LEVEL;
     }
@@ -18,4 +22,12 @@ public abstract class AbstractToolbarItem extends AbstractProvider implements To
     public String mark4Provider() {
         return getClass().getName();
     }
+
+    @Override
+    public boolean accept(JTemplate jTemplate) {
+        if (jTemplate == null) {
+            jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        }
+        return jTemplate == null || jTemplate.isJWorkBook() || jTemplate instanceof JVirtualTemplate;
+    }
 }

designer-base/src/main/java/com/fr/design/gui/borders/UIFrameBorder.java

@@ -141,8 +141,8 @@ public class UIFrameBorder extends AbstractBorder implements UIResource {
         int spread1 = ThemeUtils.FRAME_SPREAD_DARK_DISABLED;
         int spread2 = ThemeUtils.FRAME_SPREAD_LIGHT_DISABLED;
         int y2 = y;
-        Color borderColor = null;
-        drawFirstCaption(g, borderColor, spread1, spread2, x, y2, w);
+        Color borderColor = isActive ? ThemeUtils.FRAME_BORDER_COLOR : ThemeUtils.FRAME_BORDER_DISABLED_COLOR;
+        drawFirstCaption(g, borderColor, x, y2, w);
         Color c2 = ColorRoutines.darken(c, 4 * spread1);
         drawSecondCaption(g, c2, c, spread2, x, y2, w);
         c2 = ColorRoutines.darken(c, 6 * spread1);
@@ -257,14 +257,8 @@ public class UIFrameBorder extends AbstractBorder implements UIResource {
         g.drawLine(x + w - 4, y2, x + w - 4, y2);
     }
 
-    private void drawFirstCaption(Graphics g, Color borderColor, int spread1, int spread2, int x, int y2, int w) {
-        if (isActive) {
-            borderColor = ThemeUtils.FRAME_BORDER_COLOR;
-            spread1 = ThemeUtils.FRAME_SPREAD_DARK;
-            spread2 = ThemeUtils.FRAME_SPREAD_LIGHT;
-        } else {
-            borderColor = ThemeUtils.FRAME_BORDER_DISABLED_COLOR;
-        }
+
+    private void drawFirstCaption(Graphics g, Color borderColor, int x, int y2, int w) {
         // always paint the semi-transparent parts
 // 1
         // blend
@@ -580,4 +574,4 @@ public class UIFrameBorder extends AbstractBorder implements UIResource {
         }
     }
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/chart/MiddleChartComponent.java

@@ -1,7 +1,6 @@
 package com.fr.design.gui.chart;
 
 import com.fr.base.chart.BaseChartCollection;
-import com.fr.chartx.attr.ChartProvider;
 import com.fr.stable.core.PropertyChangeListener;
 
 import javax.swing.JComponent;
@@ -18,7 +17,5 @@ public abstract class MiddleChartComponent extends JComponent {
 	
 	public abstract void reset();
 
-	public abstract ChartProvider getEditingChart();
-
 	public abstract void addStopEditingListener(PropertyChangeListener list);
 }

designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java

@@ -437,18 +437,18 @@ public class UICalendarPanel extends JPanel {
         };
     }
 
-    protected EventListenerList listenerList = new EventListenerList();
+    protected EventListenerList eventlistenerList = new EventListenerList();
 
     public void addDateChangeListener(ChangeListener l) {
-        listenerList.add(ChangeListener.class, l);
+        eventlistenerList.add(ChangeListener.class, l);
     }
 
     public void removeDateChangeListener(ChangeListener l) {
-        listenerList.remove(ChangeListener.class, l);
+        eventlistenerList.remove(ChangeListener.class, l);
     }
 
     protected void fireDateChanged(ChangeEvent e) {
-        Object[] listeners = listenerList.getListenerList();
+        Object[] listeners = eventlistenerList.getListenerList();
         for (int i = listeners.length - 2; i >= 0; i -= 2) {
             if (listeners[i] == ChangeListener.class) {
                 ((ChangeListener) listeners[i + 1]).stateChanged(e);

designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java

@@ -296,7 +296,7 @@ public  class CommitTabbedPane extends JComponent implements MouseListener, Mous
         double[] x = {startX, startX, startX + tabWidth, startX + tabWidth, startX};
         double[] y = {-1, getHeight(), getHeight(), -1, -1};
         RoundRectangle2D.Double rect1 = new RoundRectangle2D.Double(startX, 1, this.getWidth(), this.getHeight(), 7, 7);
-        g2d.setPaint(new GradientPaint(1, 1, new Color(255, 255, 255), 1, getHeight() - 1, UIConstants.NORMAL_BACKGROUND));
+        g2d.setPaint(new GradientPaint(1, 1, new Color(255, 255, 255), 1, getHeight() - 1f, UIConstants.NORMAL_BACKGROUND));
 
         GeneralPath generalPath = new GeneralPath(Path2D.WIND_EVEN_ODD, x.length);
         generalPath.moveTo((float) x[0] + CORNOR_RADIUS, (float) y[0]);
@@ -345,9 +345,9 @@ public  class CommitTabbedPane extends JComponent implements MouseListener, Mous
         double[] x = {startX, startX, startX + tabWidth, startX + tabWidth, startX};
         double[] y = {-1, getHeight() - 1, getHeight() - 1, -1, -1};
         if (selfIndex == mouseOveredIndex) {
-            g2d.setPaint(new GradientPaint(1, 1, new Color(255, 255, 255), 1, getHeight() - 1, UIConstants.NORMAL_BACKGROUND));
+            g2d.setPaint(new GradientPaint(1, 1, new Color(255, 255, 255), 1, getHeight() - 1f, UIConstants.NORMAL_BACKGROUND));
         } else {
-            g2d.setPaint(new GradientPaint(1, 1, UIConstants.NORMAL_BACKGROUND, 1, getHeight() - 1, UIConstants.NORMAL_BACKGROUND));
+            g2d.setPaint(new GradientPaint(1, 1, UIConstants.NORMAL_BACKGROUND, 1, getHeight() - 1f, UIConstants.NORMAL_BACKGROUND));
         }
 
 

designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@@ -111,8 +111,8 @@ public class RegPane extends BasicPane {
                         cardPane.setPreferredSize(new Dimension(0,0 ));
                         detailedCardLayout.show(cardPane, "Default");
                     }
-                    fireRegChangeAction();
                 }
+                fireRegChangeAction();
             }
         });
     }

designer-base/src/main/java/com/fr/design/gui/frpane/UnitInputPane.java

@@ -133,14 +133,17 @@ public abstract class UnitInputPane extends BasicPane {
 
 		@Override
 		public void keyTyped(KeyEvent arg0) {
+			// 敲击键盘，发生在按键按下后，按键放开前
 		}
 
 		@Override
 		public void keyReleased(KeyEvent arg0) {
+			// 松开按键时
 		}
 
 		@Override
 		public void keyPressed(KeyEvent arg0) {
+			// 按下按键时
 			changed = true;
 		}
 	};
@@ -149,23 +152,28 @@ public abstract class UnitInputPane extends BasicPane {
 
 		@Override
 		public void mouseReleased(MouseEvent arg0) {
+			// 鼠标按键在组件上释放时
 		}
 
 		@Override
 		public void mousePressed(MouseEvent arg0) {
+			// 鼠标按键在组件上按下时
 			changed = true;
 		}
 
 		@Override
 		public void mouseExited(MouseEvent arg0) {
+			// 鼠标离开组件时
 		}
 
 		@Override
 		public void mouseEntered(MouseEvent arg0) {
+			// 鼠标进入到组件时
 		}
 
 		@Override
 		public void mouseClicked(MouseEvent arg0) {
+			// 鼠标按键在组件上单击时
 		}
 	};
 }

designer-base/src/main/java/com/fr/design/gui/ibutton/UIBasicButtonUI.java

@@ -321,9 +321,9 @@ public class UIBasicButtonUI extends MetalButtonUI {
 
     //harry: 画带有高光的按钮。
     private void drawHighLightButton(Graphics2D g2, Color color1, Color color2, int w, int h) {
-        GradientPaint buttonPaint = new GradientPaint(0, 0, color1, 0, h - 1, color2);
-        GradientPaint buttonHighLightPaint = new GradientPaint(0, 0, new Color(1.0f, 1.0f, 1.0f, 0.6f), 0, h / 2, new Color(1.0f, 1.0f, 1.0f, 0.2f));
-        GradientPaint buttonHighLightLinePaint = new GradientPaint(1, 1, new Color(1.0f, 1.0f, 1.0f, 0.8f), 0, h / 2, new Color(1.0f, 1.0f, 1.0f, 0.4f));
+        GradientPaint buttonPaint = new GradientPaint(0, 0, color1, 0, h - 1f, color2);
+        GradientPaint buttonHighLightPaint = new GradientPaint(0, 0, new Color(1.0f, 1.0f, 1.0f, 0.6f), 0, h / 2f, new Color(1.0f, 1.0f, 1.0f, 0.2f));
+        GradientPaint buttonHighLightLinePaint = new GradientPaint(1, 1, new Color(1.0f, 1.0f, 1.0f, 0.8f), 0, h / 2f, new Color(1.0f, 1.0f, 1.0f, 0.4f));
         g2.setPaint(buttonPaint);
         g2.fillRoundRect(0, 0, w - 1, h - 1, 3, 3);
         g2.setPaint(buttonHighLightLinePaint);//按钮内侧高光线（内发光，0%阻塞）

designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java

@@ -251,7 +251,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 	protected void paintOtherBorder(Graphics g) {
 		Graphics2D g2d = (Graphics2D) g;
 		g2d.setStroke(borderStroke);
-		Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+		Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1f, getHeight() - 1f, UIConstants.ARC, UIConstants.ARC);
 		g2d.setColor(borderColor);
 		g2d.draw(shape);
 	}

designer-base/src/main/java/com/fr/design/gui/ibutton/UICombinationButton.java

@@ -18,11 +18,11 @@ public class UICombinationButton extends JPanel{
 	protected UIButton rightButton;
 	
 	protected void leftButtonClickEvent() {
-		
+		// 左边按钮点击事件
 	}
 	
 	protected void rightButtonClickEvent() {
-		
+		// 右边按钮点击事件
 	}
 	
 	public UICombinationButton() {

designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButton.java

@@ -232,7 +232,7 @@ public class UISliderButton extends JButton implements UIObserver {
     protected void paintOtherBorder(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         g2d.setStroke(borderStroke);
-        Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+        Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1f, getHeight() - 1f, UIConstants.ARC, UIConstants.ARC);
         g2d.setColor(borderColor);
         g2d.draw(shape);
     }

designer-base/src/main/java/com/fr/design/gui/ibutton/UISliderButtonUI.java

@@ -176,11 +176,11 @@ public class UISliderButtonUI extends BasicButtonUI {
     private void fillNormal(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
         GradientPaint gp;
         if (DesignerMode.isAuthorityEditing() && isAuthorityEdited) {
-            gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1, UIConstants.AUTHORITY_DARK_BLUE);
+            gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1F, UIConstants.AUTHORITY_DARK_BLUE);
         } else if (isPressedPainted) {
-            gp = new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, height - 1, UIConstants.SELECT_TAB);
+            gp = new GradientPaint(1, 1, UIConstants.SELECT_TAB, 1, height - 1F, UIConstants.SELECT_TAB);
         }else{
-            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
         }
 
         fillPaint(g2d, x, y, width, height, isRound, rectDirection, gp, UIConstants.ARC);
@@ -189,11 +189,11 @@ public class UISliderButtonUI extends BasicButtonUI {
     private void fillRollOver(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
         GradientPaint gp;
         if (DesignerMode.isAuthorityEditing() && isAuthorityEdited) {
-            gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1, UIConstants.HOVER_BLUE);
+            gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1F, UIConstants.HOVER_BLUE);
         } else if (isPressedPainted) {
-            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
         }else {
-            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1, UIConstants.POP_DIALOG_BORDER);
+            gp = new GradientPaint(1, 1, UIConstants.POP_DIALOG_BORDER, 1, height - 1F, UIConstants.POP_DIALOG_BORDER);
         }
         fillPaint(g2d, x, y, width, height, isRound, rectDirection, gp, UIConstants.ARC);
     }
@@ -225,4 +225,4 @@ public class UISliderButtonUI extends BasicButtonUI {
 
         g2d.setColor(oldColor);
     }
-}
+}

designer-base/src/main/java/com/fr/design/gui/ibutton/UITabButton.java

@@ -162,12 +162,12 @@ public class UITabButton extends UILabel implements UISelectedComponent {
 			Color blue = UIConstants.LIGHT_BLUE;
 			g2d.setColor(blue);
 			g2d.fillRect(0, 1, w - 1, h / 2);
-			GradientPaint gp = new GradientPaint(1, 1, UIConstants.OCEAN_BLUE, 1, h - 1, blue);
+			GradientPaint gp = new GradientPaint(1, 1, UIConstants.OCEAN_BLUE, 1, h - 1F, blue);
 			g2d.setPaint(gp);
 			g2d.fillRect(0, h / 2, w - 1, h / 2);
 			this.setForeground(UIConstants.FONT_COLOR);
 		} else if (!isSelected() && !isRollover) {
-			GradientPaint gp = new GradientPaint(1, 1, TOP, 1, h - 1, DOWN);
+			GradientPaint gp = new GradientPaint(1, 1, TOP, 1, h - 1F, DOWN);
 			g2d.setPaint(gp);
 			g2d.fillRect(0, h / 2, w - 1, h / 2);
 			this.setForeground(UIConstants.FONT_COLOR);
@@ -178,4 +178,4 @@ public class UITabButton extends UILabel implements UISelectedComponent {
 
 	}
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/ibutton/UIToggleButton.java

@@ -220,7 +220,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 	protected void paintOtherBorder(Graphics g) {
 		Graphics2D g2d = (Graphics2D) g;
 		g2d.setStroke(UIConstants.BS);
-		Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1, getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
+		Shape shape = new RoundRectangle2D.Float(0.5f, 0.5f, getWidth() - 1F, getHeight() - 1F, UIConstants.ARC, UIConstants.ARC);
 		g2d.setColor(UIConstants.LINE_COLOR);
 		g2d.draw(shape);
 	}
@@ -252,4 +252,4 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 		return true;
 	}
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java

@@ -125,60 +125,58 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
 
     private class UICheckBoxUI extends MetalCheckBoxUI {
         @Override
-        public void paint(Graphics g, JComponent c) {
-            synchronized (this) {
-                AbstractButton b = (AbstractButton) c;
-                ButtonModel model = b.getModel();
-                Dimension size = c.getSize();
-                Font f = c.getFont();
-                g.setFont(f);
-                FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f);
-
-                Rectangle viewRect = new Rectangle(size);
-                Rectangle iconRect = new Rectangle();
-                Rectangle textRect = new Rectangle();
-
-                Insets i = c.getInsets();
-                viewRect.x += i.left;
-                viewRect.y += i.top;
-                viewRect.width -= (i.right + viewRect.x);
-                viewRect.height -= (i.bottom + viewRect.y);
-
-                Icon altIcon = b.getIcon();
-
-                String text = SwingUtilities.layoutCompoundLabel(
-                        c, fm, b.getText(), altIcon != null ? altIcon : getDefaultIcon(),
-                        b.getVerticalAlignment(), b.getHorizontalAlignment(),
-                        b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
-                        viewRect, iconRect, textRect, b.getIconTextGap());
-
-                // fill background
-                if (c.isOpaque()) {
-                    g.setColor(b.getBackground());
-                    g.fillRect(0, 0, size.width, size.height);
-                }
-
-                Graphics2D g2d = (Graphics2D) g;
-                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                if (model.isSelected()) {
-                    GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL,
-                            model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0);
-                } else if (model.isRollover() && !model.isSelected()) {
-                    g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED);
-                    g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
-                } else {
-                    g.setColor(UIConstants.LINE_COLOR);
-                    g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
-                }
+        public synchronized void paint(Graphics g, JComponent c) {
+            AbstractButton b = (AbstractButton) c;
+            ButtonModel model = b.getModel();
+            Dimension size = c.getSize();
+            Font f = c.getFont();
+            g.setFont(f);
+            FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f);
+
+            Rectangle viewRect = new Rectangle(size);
+            Rectangle iconRect = new Rectangle();
+            Rectangle textRect = new Rectangle();
+
+            Insets i = c.getInsets();
+            viewRect.x += i.left;
+            viewRect.y += i.top;
+            viewRect.width -= (i.right + viewRect.x);
+            viewRect.height -= (i.bottom + viewRect.y);
+
+            Icon altIcon = b.getIcon();
+
+            String text = SwingUtilities.layoutCompoundLabel(
+                    c, fm, b.getText(), altIcon != null ? altIcon : getDefaultIcon(),
+                    b.getVerticalAlignment(), b.getHorizontalAlignment(),
+                    b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
+                    viewRect, iconRect, textRect, b.getIconTextGap());
+
+            // fill background
+            if (c.isOpaque()) {
+                g.setColor(b.getBackground());
+                g.fillRect(0, 0, size.width, size.height);
+            }
 
-                if (model.isSelected()) {
-                    UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2);
-                }
-                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+            Graphics2D g2d = (Graphics2D) g;
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            if (model.isSelected()) {
+                GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL,
+                        model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0);
+            } else if (model.isRollover() && !model.isSelected()) {
+                g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED);
+                g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
+            } else {
+                g.setColor(UIConstants.LINE_COLOR);
+                g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
+            }
 
-                // Draw the Text
-                drawLine(text, g, b, c, textRect, fm);
+            if (model.isSelected()) {
+                UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2);
             }
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+
+            // Draw the Text
+            drawLine(text, g, b, c, textRect, fm);
         }
 
         private void drawLine(String text, Graphics g, AbstractButton b, JComponent c, Rectangle textRect, FontMetrics fm) {

designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBoxUI.java

@@ -64,7 +64,7 @@ public class UICheckBoxUI extends MetalCheckBoxUI {
         }
     }
 
-    static BasicStroke focusStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 1.0f, new float[]{1.0f / 1.0f}, 1.0f);
+    static BasicStroke focusStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 1.0f, new float[]{1.0f}, 1.0f);
 
     protected void paintFocus(Graphics g, Rectangle t, Dimension arg2) {
         if (!ThemeUtils.BUTTON_FOCUS) {