Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

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

@@ -263,6 +263,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error("Map Save Error");
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -658,9 +659,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());
         }

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;
@@ -34,6 +35,7 @@ import java.util.Set;
  * @since : 8.0
  * 用于设计器扩展的管理类
  */
+@Open
 public class ExtraDesignClassManager extends AbstractExtraClassManager implements ExtraDesignClassManagerProvider {
 
     private static ExtraDesignClassManager classManager = new ExtraDesignClassManager();

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

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

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;
 
-/**
+@Open
- * @author zhou
- * @since 2012-5-30下午12:12:42
- */
 public abstract class FurtherBasicBeanPane<T> extends BasicBeanPane<T> {
     /**
      * 是否是指定类型

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/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) {
@@ -320,6 +325,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 +406,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/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> templateDataMap;
-        Map<String, TableDataWrapper> serverDataMap = null;
+        Map<String, TableDataWrapper> serverDataMap;
-        Map<String, TableDataWrapper> storeProcedureMap = null;
+        Map<String, TableDataWrapper> storeProcedureMap;
 
-        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();
+        List<ExpandMutableTreeNode> list = new ArrayList<>();
-            storeProcedureMap = Collections.emptyMap();
+        //模板数据集
-        }
+        List<ExpandMutableTreeNode> templist = new ArrayList<>();
-        List<ExpandMutableTreeNode> list = new ArrayList<ExpandMutableTreeNode>(); //所有的数据集
+        //服务器数据集
-        List<ExpandMutableTreeNode> templist = new ArrayList<ExpandMutableTreeNode>(); //模板数据集
+        List<ExpandMutableTreeNode> serverlist = new ArrayList<>();
-        List<ExpandMutableTreeNode> serverlist = new ArrayList<ExpandMutableTreeNode>();   //服务器数据集
 
         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++) {
+            for (String resultName : resultNames) {
-                if (!nodeName.contains(resultNames.get(i))) {
+                if (!nodeName.contains(resultName)) {
-                    nodeName.add(resultNames.get(i));
+                    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/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;
@@ -217,6 +218,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private ActionListener testConnectionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             String uri = ParameterHelper.analyze4Templatee(urlText.getText(), params);
             if (!checkURL(uri)) {
@@ -249,6 +251,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         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();
             }
@@ -264,7 +267,6 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         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));
         controlPane.setPreferredSize(new Dimension(width, height));
         JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8));
@@ -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();
@@ -356,8 +359,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     private void addToNorthPane(JPanel northPane) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double columnSize[] = {f, p, p};
+        double[] columnSize = {f, p, p};
-        double rowSize[] = {B, B, B, B, B, B, B};
+        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);
@@ -402,6 +405,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private ActionListener radioActionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (localFileRadioButton.isSelected()) {
                 localRadioSelectAction();
@@ -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();
+        String suffix = Objects.requireNonNull(fileTypeComboBox.getSelectedItem()).toString().toLowerCase();
-        if (suffix.equalsIgnoreCase("excel")) {
+        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();
+        String suffixToString = Objects.requireNonNull(fileTypeComboBox.getSelectedItem()).toString().toLowerCase();
-        if (suffixToString.equalsIgnoreCase("excel")) {
+        if ("excel".equalsIgnoreCase(suffixToString)) {
             suffixToString = "xls";
         }
         return suffixToString;
@@ -476,6 +480,7 @@ 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("");
@@ -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();
@@ -817,6 +823,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();
@@ -845,6 +852,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
 
         private MouseListener treeMouseListener = new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent e) {
                 if (XMLNodeTree.this.getModel() != treeModel) {
                     return;
@@ -941,6 +949,10 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 loadedTreeModel();
             }
+            if (treeModel == null) {
+                FineLoggerFactory.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
+                return;
+            }
             if (treeModel.getChildCount(treeModel.getRoot()) == 1) {
                 treeModel = new DefaultTreeModel((ExpandMutableTreeNode) treeModel.getChild(treeModel.getRoot(), 0));
             } else {
@@ -986,6 +998,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 this.layer = layer;
             }
 
+            @Override
             public void readXML(XMLableReader reader) {
                 String nodeName;
                 if (this.layer < 0) {

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.*;
 
-/*
+@Open
- * @author _denny
- */
 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.*;
-import java.awt.Color;
+
-import java.awt.Dialog;
+@Open
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Window;
-
-/*
- * _denny: 这里的BasicPane通常会有populate & update方法
- * 记得populate 一定要在对应的dialog setVisible之前populate
- */
 public abstract class BasicPane extends JPanel {
 
     /**

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();
+    void doOk();
 
-	public void doCancel();
+    void doCancel();
 }

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/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,30 @@ 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 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 +115,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 +146,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 +220,6 @@ public class LoginWebBridge {
         }
     }
 
-
     public void openUrlAtLocalWebBrowser(WebEngine eng, String url) {
-        if (url.indexOf("qqLogin.html") > 0) {
-            return;
-        }
     }
 }

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

@@ -15,6 +15,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;
@@ -142,6 +143,7 @@ public class PluginControlPane extends BasicPane {
         }
     }
 
+    @Nullable
     public PluginView getSelectedPlugin() {
         return (PluginView) pluginList.getSelectedValue();
     }

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

@@ -28,8 +28,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 +43,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @return 创建的页面对象
      */
+    @Override
     public JPanel createSuccessPane() {
         return new PluginStatusCheckCompletePane() {
 
@@ -130,8 +129,8 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
      *
      * @return 插件
      */
+    @Override
     public List<PluginView> loadData() throws Exception {
-        //Thread.sleep(3000);
         return PluginsReaderFromStore.readPlugins();
     }
 
@@ -140,6 +139,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 +150,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);
@@ -196,10 +198,11 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
         }
         if (StringUtils.isNotEmpty(MarketConfig.getInstance().getBbsUsername())) {
             PluginView plugin = controlPane.getSelectedPlugin();
-            String id = null;
+            if (plugin == null) {
-            if (plugin != null) {
+                FineLoggerFactory.getLogger().error("selected plugin is null");
-                id = plugin.getID();
+                return;
             }
+            String id = plugin.getID();
 
             try {
                 PluginMarker pluginMarker = PluginMarker.create(id, plugin.getVersion());
@@ -219,6 +222,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/WebViewDlgHelper.java

@@ -5,17 +5,15 @@ 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.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 +278,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);
                 }
 

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",
@@ -39,7 +40,7 @@ public abstract class VariableResolverAdapter implements VariableResolver {
         };
         Set<BuiltInParametersProvider> set = ExtraClassManager.getInstance().getArray(BuiltInParametersProvider.XML_TAG);
             for (BuiltInParametersProvider provider : set) {
-            return (String[]) ArrayUtils.addAll(variables, new String[]{
+                ArrayUtils.addAll(variables, new String[]{
                         ScriptConstants.DETAIL_TAG + provider.getParametersName()
                 });
         }
@@ -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/gui/icheckbox/UICheckBox.java

@@ -125,8 +125,7 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
 
     private class UICheckBoxUI extends MetalCheckBoxUI {
         @Override
-        public void paint(Graphics g, JComponent c) {
+        public synchronized void paint(Graphics g, JComponent c) {
-            synchronized (this) {
             AbstractButton b = (AbstractButton) c;
             ButtonModel model = b.getModel();
             Dimension size = c.getSize();
@@ -179,7 +178,6 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
             // 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) {
             if (text != null) {

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) {

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@@ -84,6 +84,7 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
                     LazyComboBox.this.loadList(get());
                 } catch (InterruptedException | ExecutionException exception) {
                     FineLoggerFactory.getLogger().debug(exception.getMessage());
+                    Thread.currentThread().interrupt();
                 }
                 LazyComboBox.this.showPopup();
             }

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBoxTest.java

@@ -40,6 +40,7 @@ public class LazyComboBoxTest {
 					Thread.sleep(3000);
 				} catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
+					Thread.currentThread().interrupt();
 				}
 				return m;
 			}

designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java

@@ -127,10 +127,6 @@ public class UIComboBoxButton extends JButton {
         boolean savedOpaque = false;
 
         paintRender(g, c, mustResetOpaque, savedOpaque, leftToRight, width, insets, iconWidth, left, top, height);
-        if (mustResetOpaque) {
-            JComponent jc = (JComponent) c;
-            jc.setOpaque(savedOpaque);
-        }
     }
 
     private void paintRender(Graphics g, Component c, boolean mustResetOpaque, boolean savedOpaque, boolean leftToRight,
@@ -152,14 +148,6 @@ public class UIComboBoxButton extends JButton {
             } else {
                 rendererPane.paintComponent(g, c, this, left + iconWidth, top, cWidth, height, shouldValidate);
             }
-            if (paintFocus && ThemeUtils.COMBO_FOCUS) {
-                g.setColor(Color.black);
-                Graphics2D g2d = (Graphics2D) g;
-                Rectangle r = new Rectangle(left, top, 2, 2);
-                TexturePaint tp = new TexturePaint(focusImg, r);
-                g2d.setPaint(tp);
-                g2d.draw(new Rectangle(left, top, cWidth, height));
-            }
         }
     }
 

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java

@@ -7,12 +7,25 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
-
+import com.fr.general.IOUtils;
-import javax.swing.*;
+
-import java.awt.*;
+import javax.swing.JCheckBox;
-import java.awt.event.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class UICheckListPopup extends UIPopupMenu {
     private List<ActionListener> listeners = new ArrayList<ActionListener>();
@@ -66,10 +79,10 @@ public class UICheckListPopup extends UIPopupMenu {
         }
         addSelectListener();
 
-        jScrollPane.setPreferredSize(new Dimension(200, checkBoxList.size() * CHECKBOX_HEIGHT + 10));
+        jScrollPane.setPreferredSize(new Dimension(130, checkBoxList.size() * CHECKBOX_HEIGHT + 10));
         //超过1页的数量时显示滚动条
         if (checkBoxList.size() > maxDisplayNumber) {
-            jScrollPane.setPreferredSize(new Dimension(200, maxDisplayNumber * CHECKBOX_HEIGHT));
+            jScrollPane.setPreferredSize(new Dimension(130, maxDisplayNumber * CHECKBOX_HEIGHT));
         }
         checkboxPane.repaint();
         jScrollPane.repaint();
@@ -77,11 +90,11 @@ public class UICheckListPopup extends UIPopupMenu {
 
     private void addOneCheckValue(Object checkValue) {
         JPanel checkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        checkPane.setPreferredSize(new Dimension(185, CHECKBOX_HEIGHT));
+        checkPane.setPreferredSize(new Dimension(120, CHECKBOX_HEIGHT));
         final JCheckBox temp = createCheckbox();
         final UILabel label = new UILabel(checkValue.toString());
         label.setBackground(Color.WHITE);
-        label.setPreferredSize(new Dimension(156, 20));
+        label.setPreferredSize(new Dimension(80, 20));
         checkPane.setBackground(Color.WHITE);
         checkPane.add(temp);
         checkPane.add(label);
@@ -95,8 +108,8 @@ public class UICheckListPopup extends UIPopupMenu {
         JCheckBox checkBox = new JCheckBox();
         checkBox.setPreferredSize(new Dimension(20, 20));
         checkBox.setBackground(Color.WHITE);
-        checkBox.setIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL));
+        checkBox.setIcon(IOUtils.readIcon(IconPathConstants.CHECKBOX_NORMAL));
-        checkBox.setSelectedIcon(BaseUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED));
+        checkBox.setSelectedIcon(IOUtils.readIcon(IconPathConstants.CHECKBOX_SELECTED));
 
         return checkBox;
     }
@@ -109,10 +122,12 @@ public class UICheckListPopup extends UIPopupMenu {
      */
     private void addMouseListener(final JCheckBox checkBox, final UILabel label) {
         label.addMouseListener(new MouseAdapter() {
+            @Override
             public void mouseExited(MouseEvent e) {
                 label.setBackground(Color.WHITE);
             }
 
+            @Override
             public void mouseEntered(MouseEvent e) {
                 label.setOpaque(true);
                 label.setBackground(mouseEnteredColor);
@@ -133,6 +148,7 @@ public class UICheckListPopup extends UIPopupMenu {
             JCheckBox checkBox = checkBoxList.get(i);
             if (i == 0) {
                 checkBox.addItemListener(new ItemListener() {
+                    @Override
                     public void itemStateChanged(ItemEvent e) {
                         //全选checkbox事件
                         doSelectAll(checkBoxList.get(0).isSelected());
@@ -140,6 +156,7 @@ public class UICheckListPopup extends UIPopupMenu {
                 });
             } else {
                 checkBox.addItemListener(new ItemListener() {
+                    @Override
                     public void itemStateChanged(ItemEvent e) {
                         //do半选判断放在commit事件里
                         commit();
@@ -157,10 +174,19 @@ public class UICheckListPopup extends UIPopupMenu {
     private void doSelectAll(boolean isSelected) {
         for (int i = 1; i < checkBoxList.size(); i++) {
             //全选和反全选都不考虑全选按钮本身
-            if (!SELECT_ALL.equals(checkBoxList.get(i).getText()))
+            if (!SELECT_ALL.equals(checkBoxList.get(i).getText())) {
                 checkBoxList.get(i).setSelected(isSelected);
             }
         }
+    }
+
+    public void setSelectedValue(Map<Object, Boolean> selectedValues) {
+        List<Object> allValue = Arrays.asList(values);
+        for (Object value : selectedValues.keySet()) {
+            int index = allValue.indexOf(value);
+            checkBoxList.get(index + 1).setSelected(selectedValues.get(value));
+        }
+    }
 
     /**
      * 获取所有选中的值
@@ -214,9 +240,10 @@ public class UICheckListPopup extends UIPopupMenu {
     }
 
     public void addActionListener(ActionListener listener) {
-        if (!listeners.contains(listener))
+        if (!listeners.contains(listener)) {
             listeners.add(listener);
         }
+    }
 
     public void removeActionListener(ActionListener listener) {
         if (listeners.contains(listener)) {

designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java

@@ -11,14 +11,23 @@ import com.fr.design.icon.IconPathConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.Icon;
-import java.awt.*;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设计器下拉复选框组件
@@ -125,7 +134,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
     private UITextField createEditor() {
         UITextField editor = new UITextField();
         editor.setEditable(false);
-        editor.setPreferredSize(new Dimension(180, 20));
+        editor.setPreferredSize(new Dimension(110, 20));
         addPopupListener(editor);
 
         return editor;
@@ -138,6 +147,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
      */
     private void addPopupListener(Component component) {
         component.addMouseListener(new MouseAdapter() {
+            @Override
             public void mouseClicked(MouseEvent e) {
                 togglePopup();
             }
@@ -166,6 +176,7 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
 
     private class PopupAction implements ActionListener {
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (e.getActionCommand().equals(UICheckListPopup.COMMIT_EVENT)) {
                 selectedValues = popup.getSelectedValues();
@@ -292,14 +303,16 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
     }
 
     public void addActionListener(ActionListener listener) {
-        if (!listeners.contains(listener))
+        if (!listeners.contains(listener)) {
             listeners.add(listener);
         }
+    }
 
     public void removeActionListener(ActionListener listener) {
-        if (listeners.contains(listener))
+        if (listeners.contains(listener)) {
             listeners.remove(listener);
         }
+    }
 
     protected void fireActionPerformed(ActionEvent e) {
         for (ActionListener l : listeners) {
@@ -307,6 +320,10 @@ public class UIComboCheckBox extends JComponent implements UIObserver, GlobalNam
         }
     }
 
+    public void setSelectedValues(Map<Object, Boolean> map) {
+        popup.setSelectedValue(map);
+    }
+
     /**
      * 简单的测试demo
      * @param args

designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -438,11 +438,6 @@ public class UIResizableContainer extends JPanel {
 
                     containerWidth = containerWidth > MAX_WIDTH ? MAX_WIDTH : containerWidth;
                     containerWidth = containerWidth < MIN_WIDTH ? MIN_WIDTH : containerWidth;
-                    if (containerWidth < MIN_WIDTH) {
-                        upPane.setVisible(false);
-                        downPane.setVisible(false);
-                        containerWidth = toolPaneHeight;
-                    }
                     refreshContainer();
                     if (DesignerMode.isAuthorityEditing()) {
                         DesignerContext.getDesignerFrame().doResize();

designer-base/src/main/java/com/fr/design/gui/ilable/MultilineLabel.java

@@ -19,15 +19,15 @@ import com.fr.design.gui.itextarea.UITextArea;
  */
 public class MultilineLabel extends UITextArea {
     public MultilineLabel() {
-        initComponents();
+        initCurrentComponents();
     }
 
     public MultilineLabel(String s) {
         super(s);
-        initComponents();
+        initCurrentComponents();
     }
 
-    private void initComponents() {
+    private void initCurrentComponents() {
         adjustUI();
     }
 

designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java

@@ -7,6 +7,7 @@ package com.fr.design.gui.imenu;
 import com.fr.design.utils.ColorRoutines;
 import com.fr.design.utils.ThemeUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.AbstractAction;
 import javax.swing.ActionMap;
@@ -579,7 +580,8 @@ public class UIBasicMenuItemUI extends MenuItemUI {
      */
     private boolean isInternalFrameSystemMenu() {
         String actionCommand = menuItem.getActionCommand();
-        return (actionCommand == "Close") || (actionCommand == "Minimize") || (actionCommand == "Restore") || (actionCommand == "Maximize");
+        return (StringUtils.equals(actionCommand,"Close") || StringUtils.equals(actionCommand,"Minimize")
+                || StringUtils.equals(actionCommand,"Restore") || StringUtils.equals(actionCommand,"Maximize"));
     }
 
     //////////////////////////////////////////////////////////

designer-base/src/main/java/com/fr/design/gui/iscrollbar/UIScrollBarUI.java

@@ -1,5 +1,7 @@
 package com.fr.design.gui.iscrollbar;
 
+import com.fr.design.constants.UIConstants;
+import com.fr.stable.StringUtils;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -20,7 +22,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-
 import javax.swing.BoundedRangeModel;
 import javax.swing.InputMap;
 import javax.swing.JComponent;
@@ -38,8 +39,6 @@ import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ScrollBarUI;
 import javax.swing.plaf.UIResource;
-
-import com.fr.design.constants.UIConstants;
 import sun.swing.DefaultLookup;
 
 /**
@@ -148,6 +147,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
      *
      * @param c
      */
+    @Override
     public void installUI(JComponent c) {
         scrollbar = (JScrollBar) c;
         thumbRect = new Rectangle(0, 0, 0, 0);
@@ -163,6 +163,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
      *
      * @param c
      */
+    @Override
     public void uninstallUI(JComponent c) {
         scrollbar = (JScrollBar) c;
         uninstallListeners();
@@ -357,6 +358,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
     /**
      * 只画Thumb
      */
+    @Override
     public void paint(Graphics g, JComponent c) {
         Rectangle thumbBounds = getThumbBounds();
         if (thumbBounds.intersects(g.getClipBounds())) {
@@ -380,6 +382,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
      * @see #getMaximumSize
      * @see #getMinimumSize
      */
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         return (scrollbar.getOrientation() == JScrollBar.VERTICAL) ? new Dimension(scrollBarWidth, 48) : new Dimension(48, scrollBarWidth);
     }
@@ -390,6 +393,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
      * @see #getMinimumSize
      * @see #getPreferredSize
      */
+    @Override
     public Dimension getMaximumSize(JComponent c) {
         return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
@@ -937,6 +941,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
         private transient int direction = +1;
 
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             isPressing = false;
             if (isDragging) {
@@ -968,6 +973,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
          * one page. If there is no thumb then page up if the mouse is in the
          * upper half of the track.
          */
+        @Override
         public void mousePressed(MouseEvent e) {
             boolean isMiddle = !isSupportsAbsolutePositioning() && SwingUtilities.isMiddleMouseButton(e);
             if (SwingUtilities.isRightMouseButton(e) || isMiddle) {
@@ -1313,7 +1319,7 @@ public class UIScrollBarUI extends ScrollBarUI implements LayoutManager, SwingCo
         public void propertyChange(PropertyChangeEvent e) {
             String propertyName = e.getPropertyName();
 
-            if ("model" == propertyName) {
+            if (StringUtils.equals("model", propertyName)) {
                 BoundedRangeModel oldModel = (BoundedRangeModel) e.getOldValue();
                 BoundedRangeModel newModel = (BoundedRangeModel) e.getNewValue();
                 oldModel.removeChangeListener(modelListener);

designer-base/src/main/java/com/fr/design/gui/ispinner/UnsignedIntUISpinner.java

@@ -0,0 +1,31 @@
+package com.fr.design.gui.ispinner;
+
+import com.fr.design.gui.itextfield.UIIntNumberField;
+import com.fr.design.gui.itextfield.UINumberField;
+
+/**
+ * Created by IntelliJ IDEA.
+ * Author : Hugh.C
+ * Date: 19-08-28
+ * Time: 下午2:19
+ */
+public class UnsignedIntUISpinner extends UISpinner {
+
+
+    public UnsignedIntUISpinner(double minValue, double maxValue, double dierta) {
+        super(minValue, maxValue, dierta);
+    }
+
+    public UnsignedIntUISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
+        super(minValue, maxValue, dierta, defaultValue);
+    }
+
+    @Override
+    protected UINumberField initNumberField() {
+        return new UIIntNumberField() {
+            public boolean shouldResponseChangeListener() {
+                return false;
+            }
+        };
+    }
+}

designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java

@@ -3,11 +3,15 @@
  */
 package com.fr.design.gui.itable;
 
-import java.awt.*;
+import com.fr.general.ComparatorUtils;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
@@ -16,9 +20,6 @@ import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
-import com.fr.general.ComparatorUtils;
-
-
 /**
  * @author richer
  * @since 6.5.3
@@ -109,8 +110,8 @@ public abstract class AbstractPropertyTable extends JTable {
 
     @Override
     public TableCellEditor getCellEditor(int row, int column) {
-        if (groups != null) {
         Point pIndex = getGroupIndex(row);
+        if (groups != null && pIndex != null) {
             PropertyGroup group = groups.get(pIndex.x);
             if (pIndex.y == 0) {
                 return super.getCellEditor(row, column);
@@ -162,7 +163,7 @@ public abstract class AbstractPropertyTable extends JTable {
                     int row = AbstractPropertyTable.super.rowAtPoint(e.getPoint());
                     if (row != -1) {
                         Point pIndex = getGroupIndex(row);
-                        if (pIndex.y == 0 && e.getClickCount() > 1) {
+                        if (pIndex != null && pIndex.y == 0 && e.getClickCount() > 1) {
                             toggleCollapse(pIndex.x);
                         }
                     }
@@ -180,7 +181,7 @@ public abstract class AbstractPropertyTable extends JTable {
                     int row = AbstractPropertyTable.super.rowAtPoint(e.getPoint());
                     if (row != -1) {
                         Point pIndex = getGroupIndex(row);
-                        if (pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < PROPERTY_ICON_WIDTH) {
+                        if (pIndex != null && pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < PROPERTY_ICON_WIDTH) {
                             toggleCollapse(pIndex.x);
                         }
                     }
@@ -263,6 +264,9 @@ public abstract class AbstractPropertyTable extends JTable {
         @Override
         public void setValueAt(Object aValue, int row, int column) {
             Point pIndex = getGroupIndex(row);
+            if (pIndex == null) {
+                return;
+            }
             PropertyGroup group = groups.get(pIndex.x);
             if (pIndex.y != 0) {
                 Object old_value = getValueAt(row, column);
@@ -276,16 +280,11 @@ public abstract class AbstractPropertyTable extends JTable {
         @Override
         public boolean isCellEditable(int row, int column) {
             Point pIndex = getGroupIndex(row);
-            PropertyGroup group = groups.get(pIndex.x);
+            if (pIndex == null) {
-            if (pIndex.y == 0) {
-                if (column == 0) {
-                    return false;
-                } else {
                 return false;
             }
-            } else {
+            PropertyGroup group = groups.get(pIndex.x);
-                return column == 1 && group.getModel().isEditable(pIndex.y - 1);
+            return pIndex.y != 0 && (column == 1 && group.getModel().isEditable(pIndex.y - 1));
-            }
         }
     }
 }

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -244,7 +244,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
                     FineLoggerFactory.getLogger().error(ee.getMessage(), ee);
 				}
 			}
-			if (getRowCount() < 1 || selectedRow.length < 0) {
+			if (getRowCount() < 1) {
 				return;
 			}
 			

designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java

@@ -153,6 +153,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 								try {
 									Thread.sleep(3);
 								} catch (InterruptedException e) {
+									Thread.currentThread().interrupt();
 								}
 							}
 							if (currentPanel != panel) {
@@ -202,7 +203,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent {
 	}
 
 	@Override
-	public int getSelectedIndex() {
+	public synchronized int getSelectedIndex() {
 		return selectedIndex;
 	}
 

designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java

@@ -127,6 +127,7 @@ public class NumberDragBar extends JComponent {
 					revalidate();
 				} catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.toString());
+					Thread.currentThread().interrupt();
 				}
 			}
 		});

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java

@@ -366,7 +366,9 @@ public class RSyntaxDocument extends RDocument implements Iterable<Token>,
 	 */
 	public boolean getShouldIndentNextLine(int line) {
 		Token t = getTokenListForLine(line);
+		if (t != null) {
 			t = t.getLastNonCommentNonWhitespaceToken();
+		}
 		return tokenMaker.getShouldIndentNextLineAfter(t);
 	}
 

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java

@@ -8,23 +8,33 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.util.ResourceBundle;
-import java.util.Stack;
-import javax.swing.*;
-import javax.swing.text.*;
-
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldCollapser;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.templates.CodeTemplate;
 import com.fr.design.gui.syntax.ui.rtextarea.Gutter;
 import com.fr.design.gui.syntax.ui.rtextarea.IconRowHeader;
-import com.fr.design.gui.syntax.ui.rtextarea.RecordableTextAction;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextAreaEditorKit;
+import com.fr.design.gui.syntax.ui.rtextarea.RecordableTextAction;
 
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
+import javax.swing.UIManager;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Caret;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.Segment;
+import javax.swing.text.TextAction;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.Objects;
+import java.util.Stack;
 
 
 /**
@@ -269,8 +279,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                     fold.setCollapsed(collapse);
                 }
                 possiblyRepaintGutter(textArea);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }
@@ -473,15 +482,13 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                                 }
                                 t = t.getNextToken();
                             }
-						}
+                        } else if (t.length() == 2 && t.charAt(0) == '/' &&
-						else if (t.length()==2 && t.charAt(0)=='/' &&
                                 (t.charAt(1) == '>' ||
                                         t.charAt(1) == ']')) {
                             if (!stack.isEmpty()) { // Always true for valid XML
                                 stack.pop();
                             }
-						}
+                        } else if (t.length() == 2 &&
-						else if (t.length()==2 && 
                                 (t.charAt(0) == '<' || t.charAt(0) == '[') &&
                                 t.charAt(1) == '/') {
                             String tagName = null;
@@ -494,7 +501,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                         }
                     }
 
-					t = t.getNextToken();
+                    t = Objects.requireNonNull(t).getNextToken();
 
                 }
 
@@ -536,8 +543,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 FoldCollapser collapser = new FoldCollapser();
                 collapser.collapseFolds(rsta.getFoldManager());
                 possiblyRepaintGutter(textArea);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }
@@ -585,8 +591,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 };
                 collapser.collapseFolds(rsta.getFoldManager());
                 possiblyRepaintGutter(textArea);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }
@@ -671,8 +676,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                             // Shrink by decreaseAmount.
                             ss.font = font.deriveFont(newSize);
                             changed = true;
-						}
+                        } else if (oldSize > MINIMUM_SIZE) {
-						else if (oldSize>MINIMUM_SIZE) {
                             // Can't shrink by full decreaseAmount, but
                             // can shrink a little bit.
                             ss.font = font.deriveFont(MINIMUM_SIZE);
@@ -690,8 +694,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 // Shrink by decreaseAmount.
                 rsta.setFont(font.deriveFont(newSize));
                 changed = true;
-			}
+            } else if (oldSize > MINIMUM_SIZE) {
-			else if (oldSize>MINIMUM_SIZE) {
                 // Can't shrink by full decreaseAmount, but
                 // can shrink a little bit.
                 rsta.setFont(font.deriveFont(MINIMUM_SIZE));
@@ -717,9 +720,9 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                         parent.repaint();
                     }
                 }
-			}
+            } else {
-			else
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
+            }
 
         }
 
@@ -789,8 +792,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                     UIManager.getLookAndFeel().
                             provideErrorFeedback(textArea);
                 }
-			}
+            } else {
-			else {
                 Element elem = map.getElement(line1);
                 try {
                     handleDecreaseIndent(elem, document, tabSize);
@@ -1038,8 +1040,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                     expand(fm.getFold(i));
                 }
                 possiblyRepaintGutter(rsta);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }
@@ -1128,8 +1129,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 // Go to the position AFTER the bracket so the previous
                 // bracket (which we were just on) is highlighted.
                 rsta.setCaretPosition(bracketInfo.y + 1);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }
@@ -1184,8 +1184,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                             // Grow by increaseAmount.
                             ss.font = font.deriveFont(newSize);
                             changed = true;
-						}
+                        } else if (oldSize < MAXIMUM_SIZE) {
-						else if (oldSize<MAXIMUM_SIZE) {
                             // Can't grow by full increaseAmount, but
                             // can grow a little bit.
                             ss.font = font.deriveFont(MAXIMUM_SIZE);
@@ -1203,8 +1202,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 // Grow by increaseAmount.
                 rsta.setFont(font.deriveFont(newSize));
                 changed = true;
-			}
+            } else if (oldSize < MAXIMUM_SIZE) {
-			else if (oldSize<MAXIMUM_SIZE) {
                 // Can't grow by full increaseAmount, but
                 // can grow a little bit.
                 rsta.setFont(font.deriveFont(MAXIMUM_SIZE));
@@ -1230,9 +1228,9 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                         parent.repaint();
                     }
                 }
-			}
+            } else {
-			else
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
+            }
 
         }
 
@@ -1282,9 +1280,10 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
          */
         private static final int atEndOfLine(int pos, String s, int sLen) {
             for (int i = pos; i < sLen; i++) {
-				if (!RSyntaxUtilities.isWhitespace(s.charAt(i)))
+                if (!RSyntaxUtilities.isWhitespace(s.charAt(i))) {
                     return i;
                 }
+            }
             return -1;
         }
 
@@ -1299,8 +1298,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                         char ch = t.charAt(0);
                         if (ch == '{') {
                             openCount++;
-						}
+                        } else if (ch == '}') {
-						else if (ch=='}') {
                             openCount--;
                         }
                     }
@@ -1323,8 +1321,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
             // If we're auto-indenting...
             if (noSelection && textArea.isAutoIndentEnabled()) {
                 insertNewlineWithAutoIndent(textArea);
-			}
+            } else {
-			else {
                 textArea.replaceSelection("\n");
                 if (noSelection) {
                     possiblyCloseCurlyBrace(textArea, null);
@@ -1472,7 +1469,8 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
             if (dotLine != markLine) {
                 int first = Math.min(dotLine, markLine);
                 int last = Math.max(dotLine, markLine);
-				Element elem; int start;
+                Element elem;
+                int start;
 
                 // Since we're using Document.insertString(), we must mimic the
                 // soft tab behavior provided by RTextArea.replaceSelection().
@@ -1509,8 +1507,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 } finally {
                     textArea.endAtomicEdit();
                 }
-			}
+            } else {
-			else {
                 textArea.replaceSelection("\t");
             }
 
@@ -1559,14 +1556,15 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 if (rsta.isCodeFoldingEnabled()) { // Start of next visible line
                     FoldManager fm = rsta.getFoldManager();
                     int lineCount = root.getElementCount();
-					while (++line<lineCount && fm.isLineHidden(line));
+                    while (++line < lineCount && fm.isLineHidden(line)) {
+                        ;
+                    }
                     if (line < lineCount) { // Found a lower visible line
                         offs = root.getElement(line).getStartOffset();
                     }
                     // No lower visible line - we're already at last visible offset
                     return offs;
-				}
+                } else {
-				else {
                     return offs + 1; // Start of next line.
                 }
             }
@@ -1621,8 +1619,9 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
         @Override
         public void actionPerformedImpl(ActionEvent e, RTextArea textArea) {
 
-			if (!textArea.isEditable() || !textArea.isEnabled())
+            if (!textArea.isEditable() || !textArea.isEnabled()) {
                 return;
+            }
 
             RSyntaxTextArea rsta = (RSyntaxTextArea) textArea;
 
@@ -1726,14 +1725,15 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                 RSyntaxTextArea rsta = (RSyntaxTextArea) textArea;
                 if (rsta.isCodeFoldingEnabled()) { // End of next visible line
                     FoldManager fm = rsta.getFoldManager();
-					while (--line>=0 && fm.isLineHidden(line));
+                    while (--line >= 0 && fm.isLineHidden(line)) {
+                        ;
+                    }
                     if (line >= 0) { // Found an earlier visible line
                         offs = root.getElement(line).getEndOffset() - 1;
                     }
                     // No earlier visible line - we must be at offs==0...
                     return offs;
-				}
+                } else {
-				else {
                     return start - 1; // End of previous line.
                 }
             }
@@ -1879,8 +1879,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                     doc.insertString(end + startEnd[0].length(), startEnd[1],
                             null);
                 }
-			}
+            } else {
-			else {
                 doc.remove(start, startEnd[0].length());
                 if (startEnd[1] != null) {
                     int temp = startEnd[1].length();
@@ -1923,8 +1922,7 @@ public class RSyntaxTextAreaEditorKit extends RTextAreaEditorKit {
                     fold.toggleCollapsedState();
                 }
                 possiblyRepaintGutter(textArea);
-			}
+            } else {
-			else {
                 UIManager.getLookAndFeel().provideErrorFeedback(rsta);
             }
         }

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxUtilities.java

@@ -9,6 +9,24 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
+import com.fr.design.gui.syntax.ui.rsyntaxtextarea.TokenUtils.TokenSubList;
+import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
+import com.fr.design.gui.syntax.ui.rtextarea.Gutter;
+import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
+import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane;
+
+import javax.swing.JLabel;
+import javax.swing.JViewport;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Caret;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.Position;
+import javax.swing.text.Segment;
+import javax.swing.text.TabExpander;
+import javax.swing.text.View;
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.Point;
@@ -16,23 +34,9 @@ import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.Toolkit;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Caret;
-import javax.swing.text.Document;
-import javax.swing.text.Element;
-import javax.swing.text.Position;
-import javax.swing.text.Segment;
-import javax.swing.text.TabExpander;
-import javax.swing.text.View;
-
-import com.fr.design.gui.syntax.ui.rsyntaxtextarea.TokenUtils.TokenSubList;
-import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
-import com.fr.design.gui.syntax.ui.rtextarea.Gutter;
-import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
-import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane;
 
 
 /**
@@ -163,8 +167,7 @@ public class RSyntaxUtilities implements SwingConstants {
                 case ' ':
                     if (inPreBlock || !lastWasSpace) {
                         sb.append(' ');
-					}
+                    } else {
-					else {
                         sb.append(" ");
                     }
                     lastWasSpace = true;
@@ -361,10 +364,11 @@ public class RSyntaxUtilities implements SwingConstants {
         RSyntaxDocument doc = (RSyntaxDocument) textArea.getDocument();
 
         // Ensure p0 and p1 are valid document positions.
-		if (p0<0)
+        if (p0 < 0) {
             throw new BadLocationException("Invalid document position", p0);
-		else if (p1>doc.getLength())
+        } else if (p1 > doc.getLength()) {
             throw new BadLocationException("Invalid document position", p1);
+        }
 
         // Ensure p0 and p1 are in the same line, and get the start/end
         // offsets for that line.
@@ -373,9 +377,10 @@ public class RSyntaxUtilities implements SwingConstants {
         // We do ">1" because p1 might be the first position on the next line
         // or the last position on the previous one.
         // if (lineNum!=map.getElementIndex(p1))
-		if (Math.abs(lineNum-map.getElementIndex(p1))>1)
+        if (Math.abs(lineNum - map.getElementIndex(p1)) > 1) {
             throw new IllegalArgumentException("p0 and p1 are not on the " +
                     "same line (" + p0 + ", " + p1 + ").");
+        }
 
         // Get the token list.
         Token t = doc.getTokenListForLine(lineNum);
@@ -455,14 +460,13 @@ public class RSyntaxUtilities implements SwingConstants {
             Token token = doc.getTokenListForLine(curLine);
             token = RSyntaxUtilities.getTokenAtOffset(token, caretPosition);
             // All brackets are always returned as "separators."
-			if (token.getType()!=Token.SEPARATOR) {
+            if (Objects.requireNonNull(token).getType() != Token.SEPARATOR) {
                 return input;
             }
             if (index < 3) { // One of "{[("
                 goForward = true;
                 bracketMatch = BRACKETS.charAt(index + 3);
-			}
+            } else { // One of ")]}"
-			else { // One of ")]}"
                 goForward = false;
                 bracketMatch = BRACKETS.charAt(index - 3);
             }
@@ -487,24 +491,23 @@ public class RSyntaxUtilities implements SwingConstants {
                         char ch = charSegment.array[i];
 
                         if (ch == bracket) {
-							if (haveTokenList==false) {
+                            if (!haveTokenList) {
                                 token = doc.getTokenListForLine(curLine);
                                 haveTokenList = true;
                             }
                             int offset = start + (i - segOffset);
                             token = RSyntaxUtilities.getTokenAtOffset(token, offset);
-							if (token.getType()==Token.SEPARATOR)
+                            if (Objects.requireNonNull(token).getType() == Token.SEPARATOR) {
                                 numEmbedded++;
                             }
-
+                        } else if (ch == bracketMatch) {
-						else if (ch==bracketMatch) {
+                            if (!haveTokenList) {
-							if (haveTokenList==false) {
                                 token = doc.getTokenListForLine(curLine);
                                 haveTokenList = true;
                             }
                             int offset = start + (i - segOffset);
                             token = RSyntaxUtilities.getTokenAtOffset(token, offset);
-							if (token.getType()==Token.SEPARATOR) {
+                            if (Objects.requireNonNull(token).getType() == Token.SEPARATOR) {
                                 if (numEmbedded == 0) {
                                     if (textArea.isCodeFoldingEnabled() &&
                                             textArea.getFoldManager().isLineHidden(curLine)) {
@@ -521,8 +524,9 @@ public class RSyntaxUtilities implements SwingConstants {
 
                     // Bail out if we've gone through all lines and
                     // haven't found the match.
-					if (++curLine==lastLine)
+                    if (++curLine == lastLine) {
                         return input;
+                    }
 
                     // Otherwise, go through the next line.
                     haveTokenList = false;
@@ -557,24 +561,23 @@ public class RSyntaxUtilities implements SwingConstants {
                         char ch = charSegment.array[i];
 
                         if (ch == bracket) {
-							if (haveTokenList==false) {
+                            if (!haveTokenList) {
                                 token = doc.getTokenListForLine(curLine);
                                 haveTokenList = true;
                             }
                             int offset = start + (i - segOffset);
                             t2 = RSyntaxUtilities.getTokenAtOffset(token, offset);
-							if (t2.getType()==Token.SEPARATOR)
+                            if (Objects.requireNonNull(t2).getType() == Token.SEPARATOR) {
                                 numEmbedded++;
                             }
-
+                        } else if (ch == bracketMatch) {
-						else if (ch==bracketMatch) {
+                            if (!haveTokenList) {
-							if (haveTokenList==false) {
                                 token = doc.getTokenListForLine(curLine);
                                 haveTokenList = true;
                             }
                             int offset = start + (i - segOffset);
                             t2 = RSyntaxUtilities.getTokenAtOffset(token, offset);
-							if (t2.getType()==Token.SEPARATOR) {
+                            if (Objects.requireNonNull(t2).getType() == Token.SEPARATOR) {
                                 if (numEmbedded == 0) {
                                     input.setLocation(caretPosition, offset);
                                     return input;
@@ -642,7 +645,7 @@ public class RSyntaxUtilities implements SwingConstants {
      * Some views may not be visible,
      * they might not be in the same order found in the model, or they just
      * might not allow access to some of the locations in the model.<p>
-	 *
+     * <p>
      * NOTE:  You should only call this method if the passed-in
      * <code>javax.swing.text.View</code> is an instance of
      * {@link TokenOrientedView} and <code>javax.swing.text.TabExpander</code>;
@@ -661,8 +664,8 @@ public class RSyntaxUtilities implements SwingConstants {
      *                  </ul>
      * @return the location within the model that best represents the next
      * location visual position
-	 * @exception BadLocationException
+     * @throws BadLocationException
-	 * @exception IllegalArgumentException if <code>direction</code>
+     * @throws IllegalArgumentException if <code>direction</code>
      *                                  doesn't have one of the legal values above
      */
     public static int getNextVisualPositionFrom(int pos, Position.Bias b,
@@ -688,29 +691,29 @@ public class RSyntaxUtilities implements SwingConstants {
                 // YECK! Ideally, the x location from the magic caret
                 // position would be passed in.
                 Point mcp;
-				if (c != null)
+                if (c != null) {
                     mcp = c.getMagicCaretPosition();
-				else
+                } else {
                     mcp = null;
+                }
                 int x;
                 if (mcp == null) {
-					Rectangle loc = target.modelToView(pos);
+                    Rectangle loc = Objects.requireNonNull(target).modelToView(pos);
                     x = (loc == null) ? 0 : loc.x;
-				}
+                } else {
-				else {
                     x = mcp.x;
                 }
-				if (direction == NORTH)
+                if (direction == NORTH) {
                     pos = getPositionAbove(target, pos, x, (TabExpander) view);
-				else
+                } else {
                     pos = getPositionBelow(target, pos, x, (TabExpander) view);
+                }
                 break;
 
             case WEST:
                 if (pos == -1) {
                     pos = Math.max(0, view.getEndOffset() - 1);
-				}
+                } else {
-				else {
                     pos = Math.max(0, pos - 1);
                     if (target.isCodeFoldingEnabled()) {
                         int last = target.getLineOfOffset(pos + 1);
@@ -718,7 +721,9 @@ public class RSyntaxUtilities implements SwingConstants {
                         if (last != current) { // If moving up a line...
                             FoldManager fm = target.getFoldManager();
                             if (fm.isLineHidden(current)) {
-								while (--current>0 && fm.isLineHidden(current));
+                                while (--current > 0 && fm.isLineHidden(current)) {
+                                    ;
+                                }
                                 pos = target.getLineEndOffset(current) - 1;
                             }
                         }
@@ -729,8 +734,7 @@ public class RSyntaxUtilities implements SwingConstants {
             case EAST:
                 if (pos == -1) {
                     pos = view.getStartOffset();
-				}
+                } else {
-				else {
                     pos = Math.min(pos + 1, view.getDocument().getLength());
                     if (target.isCodeFoldingEnabled()) {
                         int last = target.getLineOfOffset(pos - 1);
@@ -739,7 +743,9 @@ public class RSyntaxUtilities implements SwingConstants {
                             FoldManager fm = target.getFoldManager();
                             if (fm.isLineHidden(current)) {
                                 int lineCount = target.getLineCount();
-								while (++current<lineCount && fm.isLineHidden(current));
+                                while (++current < lineCount && fm.isLineHidden(current)) {
+                                    ;
+                                }
                                 pos = current == lineCount ?
                                         target.getLineEndOffset(last) - 1 : // Was the last visible line
                                         target.getLineStartOffset(current);
@@ -770,23 +776,22 @@ public class RSyntaxUtilities implements SwingConstants {
      * @param x    the X coordinate >= 0
      * @return the position >= 0 if the request can be computed, otherwise
      * a value of -1 will be returned.
-	 * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getPositionAbove(RSyntaxTextArea c, int offs,
                                              float x, TabExpander e) throws BadLocationException {
 
         TokenOrientedView tov = (TokenOrientedView) e;
         Token token = tov.getTokenListForPhysicalLineAbove(offs);
-		if (token==null)
+        if (token == null) {
             return -1;
+        }
 
         // A line containing only Token.NULL is an empty line.
         else if (token.getType() == Token.NULL) {
             int line = c.getLineOfOffset(offs);    // Sure to be >0 ??
             return c.getLineStartOffset(line - 1);
-		}
+        } else {
-
-		else {
             return token.getListOffset(c, e, 0, x);
         }
 
@@ -804,15 +809,16 @@ public class RSyntaxUtilities implements SwingConstants {
      * @param x    the X coordinate >= 0
      * @return the position >= 0 if the request can be computed, otherwise
      * a value of -1 will be returned.
-	 * @exception BadLocationException if the offset is out of range
+     * @throws BadLocationException if the offset is out of range
      */
     public static final int getPositionBelow(RSyntaxTextArea c, int offs,
                                              float x, TabExpander e) throws BadLocationException {
 
         TokenOrientedView tov = (TokenOrientedView) e;
         Token token = tov.getTokenListForPhysicalLineBelow(offs);
-		if (token==null)
+        if (token == null) {
             return -1;
+        }
 
         // A line containing only Token.NULL is an empty line.
         else if (token.getType() == Token.NULL) {
@@ -821,9 +827,7 @@ public class RSyntaxUtilities implements SwingConstants {
             FoldManager fm = c.getFoldManager();
             line = fm.getVisibleLineBelow(line);
             return c.getLineStartOffset(line);
-		}
+        } else {
-
-		else {
             return token.getListOffset(c, e, 0, x);
         }
 
@@ -869,9 +873,10 @@ return c.getLineStartOffset(line);
      */
     public static final Token getTokenAtOffset(Token tokenList, int offset) {
         for (Token t = tokenList; t != null && t.isPaintable(); t = t.getNextToken()) {
-			if (t.containsPosition(offset))
+            if (t.containsPosition(offset)) {
                 return t;
             }
+        }
         return null;
     }
 
@@ -901,12 +906,14 @@ return c.getLineStartOffset(line);
             int count = s.length();
             char ch = s.charAt(i);
             if (Character.isWhitespace(ch)) {
-				while (i<count && Character.isWhitespace(s.charAt(i++)));
+                while (i < count && Character.isWhitespace(s.charAt(i++))) {
+                    ;
                 }
-			else if (Character.isLetterOrDigit(ch)) {
+            } else if (Character.isLetterOrDigit(ch)) {
-				while (i<count && Character.isLetterOrDigit(s.charAt(i++)));
+                while (i < count && Character.isLetterOrDigit(s.charAt(i++))) {
+                    ;
                 }
-			else {
+            } else {
                 i = 2;
             }
             offs += i - 1;
@@ -949,8 +956,7 @@ return c.getLineStartOffset(line);
                     i--;
                 }
                 offs = lineStart + i;
-			}
+            } else if (Character.isLetterOrDigit(ch)) {
-			else if (Character.isLetterOrDigit(ch)) {
                 while (i > 0 && Character.isLetterOrDigit(s.charAt(i - 1))) {
                     i--;
                 }
@@ -968,7 +974,7 @@ return c.getLineStartOffset(line);
      * Determines the width of the given token list taking tabs
      * into consideration.  This is implemented in a 1.1 style coordinate
      * system where ints are used and 72dpi is assumed.<p>
-	 *
+     * <p>
      * This method also assumes that the passed-in token list begins at
      * x-pixel <code>0</code> in the view (for tab purposes).
      *
@@ -1203,8 +1209,9 @@ return c.getLineStartOffset(line);
         // We do it this way as we'd need to do two conditions anyway (first
         // to check that ch<255 so it can index into our table, then whether
         // that table position has the upper-case mask).
-		if (ch>='A' && ch<='Z')
+        if (ch >= 'A' && ch <= 'Z') {
             return (char) (ch | 0x20);
+        }
         return ch;
     }
 
@@ -1233,15 +1240,16 @@ return c.getLineStartOffset(line);
         String osName = System.getProperty("os.name");
         if (osName != null) { // Should always be true.
             osName = osName.toLowerCase();
-			if (osName.indexOf("windows") > -1)
+            if (osName.contains("windows")) {
                 os = OS_WINDOWS;
-			else if (osName.indexOf("mac os x") > -1)
+            } else if (osName.contains("mac os x")) {
                 os = OS_MAC_OSX;
-			else if (osName.indexOf("linux") > -1)
+            } else if (osName.contains("linux")) {
                 os = OS_LINUX;
-			else
+            } else {
                 os = OS_OTHER;
             }
+        }
         return os;
     }
 
@@ -1280,12 +1288,17 @@ return c.getLineStartOffset(line);
                     sb.append('^');
                     break;
                 case '\\':
-				case '.': case '|':
+                case '.':
-				case '+': case '-':
+                case '|':
+                case '+':
+                case '-':
                 case '$':
-				case '[': case ']':
+                case '[':
-				case '{': case '}':
+                case ']':
-				case '(': case ')':
+                case '{':
+                case '}':
+                case '(':
+                case ')':
                     sb.append('\\').append(ch);
                     break;
                 default:

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java

@@ -9,24 +9,37 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
-import java.awt.*;
-import javax.swing.event.*;
-import javax.swing.text.*;
-
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
 
+import javax.swing.event.DocumentEvent;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.Position;
+import javax.swing.text.TabExpander;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Shape;
+
 
 /**
  * The <code>javax.swing.text.View</code> object used by {@link RSyntaxTextArea}
  * when word wrap is disabled.  It implements syntax highlighting for
  * programming languages using the colors and font styles specified by the
  * <code>RSyntaxTextArea</code>.<p>
- *
+ * <p>
  * You don't really have to do anything to use this class, as
  * {@link RSyntaxTextAreaUI} automatically sets the text area's view to be
  * an instance of this class if word wrap is disabled.<p>
- *
+ * <p>
  * The tokens that specify how to paint the syntax-highlighted text are gleaned
  * from the text area's {@link RSyntaxDocument}.
  *
@@ -149,8 +162,7 @@ public class SyntaxView extends View implements TabExpander,
 			if ((area0 != null) && (area1 != null)) {
 				Rectangle dmg = area0.union(area1); // damage.
 				host.repaint(dmg.x, dmg.y, dmg.width, dmg.height);
-			}
+			} else
-			else
 				host.repaint();
 		}
 	}
@@ -233,8 +245,7 @@ public class SyntaxView extends View implements TabExpander,
 				if (selCount == tokenLen) {
 					nextX = painter.paintSelected(token, g, nextX, y, host,
 							this, clipStart);
-				}
+				} else {
-				else {
 					tempToken.copyFrom(token);
 					tempToken.textCount = selCount;
 					nextX = painter.paintSelected(tempToken, g, nextX, y, host,
@@ -320,8 +331,8 @@ public class SyntaxView extends View implements TabExpander,
 	 *                  SwingConstants.NORTH, or SwingConstants.SOUTH.
 	 * @return the location within the model that best represents the next
 	 * location visual position.
-	 * @exception BadLocationException
+	 * @throws BadLocationException
-	 * @exception IllegalArgumentException for an invalid direction
+	 * @throws IllegalArgumentException for an invalid direction
 	 */
 	@Override
 	public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
@@ -341,7 +352,7 @@ public class SyntaxView extends View implements TabExpander,
 	 * Typically the view is told to render into the span
 	 * that is returned, although there is no guarantee.
 	 * The parent may choose to resize or break the view.
-	 * @exception IllegalArgumentException for an invalid axis
+	 * @throws IllegalArgumentException for an invalid axis
 	 */
 	@Override
 	public float getPreferredSpan(int axis) {
@@ -420,8 +431,7 @@ if (fm==null) {
 			if (line >= 0) {
 				return document.getTokenListForLine(line);
 			}
-}
+		} else {
-else {
 			line = fm.getVisibleLineAbove(line);
 			if (line >= 0) {
 				return document.getTokenListForLine(line);
@@ -455,8 +465,7 @@ if (!host.isCodeFoldingEnabled()) {
 			if (line < lineCount - 1) {
 				return document.getTokenListForLine(line + 1);
 			}
-}
+		} else {
-else {
 			FoldManager fm = host.getFoldManager();
 			line = fm.getVisibleLineBelow(line);
 			if (line >= 0 && line < lineCount) {
@@ -501,7 +510,7 @@ else {
 			// current line not being highlighted when a document is first
 			// opened.  So, we set it here just in case.
 			lineHeight = host != null ? host.getLineHeight() : lineHeight;
-if (host.isCodeFoldingEnabled()) {
+			if (host != null && host.isCodeFoldingEnabled()) {
 				FoldManager fm = host.getFoldManager();
 				int hiddenCount = fm.getHiddenLineCountAbove(line);
 				line -= hiddenCount;
@@ -520,7 +529,7 @@ if (host.isCodeFoldingEnabled()) {
 	 * @param pos the position to convert >= 0
 	 * @param a   the allocated region to render into
 	 * @return the bounding box of the given position
-	 * @exception BadLocationException  if the given position does not
+	 * @throws BadLocationException if the given position does not
 	 *                              represent a valid location in the associated document
 	 * @see View#modelToView
 	 */
@@ -554,7 +563,7 @@ if (host.isCodeFoldingEnabled()) {
 	 * Provides a mapping, for a given region, from the document model
 	 * coordinate space to the view coordinate space. The specified region is
 	 * created as a union of the first and last character positions.<p>
-	 *
+	 * <p>
 	 * This is implemented to subtract the width of the second character, as
 	 * this view's <code>modelToView</code> actually returns the width of the
 	 * character instead of "1" or "0" like the View implementations in
@@ -578,9 +587,9 @@ if (host.isCodeFoldingEnabled()) {
 	 * @param a  the area of the view, which encompasses the requested region
 	 * @return the bounding box which is a union of the region specified
 	 * by the first and last character positions
-	 * @exception BadLocationException  if the given position does
+	 * @throws BadLocationException     if the given position does
 	 *                                  not represent a valid location in the associated document
-	 * @exception IllegalArgumentException if <code>b0</code> or
+	 * @throws IllegalArgumentException if <code>b0</code> or
 	 *                                  <code>b1</code> are not one of the
 	 *                                  legal <code>Position.Bias</code> values listed above
 	 * @see View#viewToModel
@@ -605,8 +614,7 @@ if (host.isCodeFoldingEnabled()) {
 				s1 = new Rectangle(alloc.x + alloc.width - 1, alloc.y,
 						1, alloc.height);
 			}
-		}
+		} else {
-		else {
 			s1 = modelToView(p1, a, b1);
 		}
 		Rectangle r0 = s0 instanceof Rectangle ? (Rectangle) s0 : s0.getBounds();
@@ -720,8 +728,7 @@ if (host.isCodeFoldingEnabled()) {
 			if (!useSelectedTextColor || selStart == selEnd ||
 					(startOffset >= selEnd || endOffset < selStart)) {
 				drawLine(painter, token, g2d, x, y);
-			}
+			} else {
-			else {
 				//System.out.println("Drawing line with selection: " + line);
 				drawLineWithSelection(painter, token, g2d, x, y, selStart, selEnd);
 			}
@@ -846,9 +853,7 @@ if (host.isCodeFoldingEnabled()) {
 			int startLine = changes.getOffset();
 			int endLine = changes.getLength();
 			damageLineRange(startLine, endLine, a, host);
-		}
+		} else {
-
-		else {
 			Element map = getElement();
 			int line = map.getElementIndex(changes.getOffset());
 			damageLineRange(line, line, a, host);
@@ -861,14 +866,12 @@ if (host.isCodeFoldingEnabled()) {
 					// because it has gotten longer.
 					longLineWidth = getLineWidth(line);
 					preferenceChanged(null, true, false);
-				}
+				} else {
-				else {
 					// If long line gets updated, update the status bars too.
 					if (possiblyUpdateLongLine(e, line))
 						preferenceChanged(null, true, false);
 				}
-			}
+			} else if (changes.getType() == DocumentEvent.EventType.REMOVE) {
-			else if (changes.getType() == DocumentEvent.EventType.REMOVE) {
 				if (map.getElement(line) == longLine) {
 					// removed from longest line... recalc
 					longLineWidth = -1; // Must do this!
@@ -982,12 +985,14 @@ lineIndex += fm.getHiddenLineCountAbove(lineIndex, true);
 			// current line not being highlighted when a document is first
 			// opened.  So, we set it here just in case.
 			lineHeight = host != null ? host.getLineHeight() : lineHeight;
+			if (host != null) {
 				FoldManager fm = host.getFoldManager();
 				if (!fm.isLineHidden(line)) {
 					line -= fm.getHiddenLineCountAbove(line);
 					return alloc.y + line * lineHeight;
 				}
 			}
+		}
 
 		return -1;
 

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/WrappedSyntaxView.java

@@ -9,15 +9,33 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
-import java.awt.*;
-import javax.swing.text.*;
-import javax.swing.text.Position.Bias;
-import javax.swing.event.*;
-
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.TokenUtils.TokenSubList;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.Fold;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
 import com.fr.design.gui.syntax.ui.rtextarea.Gutter;
+import com.fr.stable.CommonUtils;
+
+import javax.swing.event.DocumentEvent;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.BoxView;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.LayeredHighlighter;
+import javax.swing.text.PlainDocument;
+import javax.swing.text.Position;
+import javax.swing.text.Position.Bias;
+import javax.swing.text.Segment;
+import javax.swing.text.TabExpander;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Shape;
 
 
 /**
@@ -93,7 +111,7 @@ public class WrappedSyntaxView extends BoxView implements TabExpander,
 		int p = p0;
 		RSyntaxTextArea textArea = (RSyntaxTextArea)getContainer();
 		float currentWidth = getWidth();
-		if (currentWidth==Integer.MAX_VALUE)
+		if (CommonUtils.equals(currentWidth, Integer.MAX_VALUE))
 			currentWidth = getPreferredSpan(X_AXIS);
 		// Make sure width>0; this is a huge hack to fix a bug where
 		// loading text into an RTextArea before it is visible if word wrap
@@ -1044,7 +1062,7 @@ return p + 1;
 
 		// Code folding may have hidden the last line.  If so, return the last
 		// visible offset instead of the last offset.
-		if (host.isCodeFoldingEnabled() && v==getView(getViewCount()-1) &&
+		if (v != null && host.isCodeFoldingEnabled() && v == getView(getViewCount() - 1) &&
 				offs == v.getEndOffset() - 1) {
 			offs = host.getLastVisibleOffset();
 		}
@@ -1170,7 +1188,7 @@ System.err.println(">>> >>> calculated number of lines for this view (line " + l
 			switch (axis) {
 				case View.X_AXIS:
 					float width = getWidth();
-					if (width == Integer.MAX_VALUE) {
+					if (CommonUtils.equals(width, Integer.MAX_VALUE)) {
 						// We have been initially set to MAX_VALUE, but we don't
 						// want this as our preferred.
 						return 100f;

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/TaskTagParser.java

@@ -18,6 +18,7 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.ErrorStrip;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxDocument;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.Token;
+import com.fr.stable.StringUtils;
 
 
 /**
@@ -60,6 +61,7 @@ public class TaskTagParser extends AbstractParser {
 	}
 
 
+	@SuppressWarnings("squid:S2259")
 	public ParseResult parse(RSyntaxDocument doc, String style) {
 
 		Element root = doc.getDefaultRootElement();
@@ -101,6 +103,9 @@ public class TaskTagParser extends AbstractParser {
 			}
 
 			if (start>-1) {
+				if (StringUtils.isEmpty(text)) {
+					continue;
+				}
 				text = text.substring(start);
 				// TODO: Strip off end of MLC's if they're there.
 				int len = text.length();

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/LineNumberList.java

@@ -349,6 +349,10 @@ public class LineNumberList extends AbstractGutterComponent
 				int width = metrics.stringWidth(number);
 				g.drawString(number, rhs-width,y);
 				y += cellHeight;
+				if (fm == null) {
+					line++;
+					continue;
+				}
 				Fold fold = fm.getFoldForLine(line-1);
 				// Skip to next line to paint, taking extra care for lines with
 				// block ends and begins together, e.g. "} else {"
@@ -371,6 +375,10 @@ public class LineNumberList extends AbstractGutterComponent
 				String number = Integer.toString(line + getLineNumberingStartIndex() - 1);
 				g.drawString(number, RHS_BORDER_WIDTH, y);
 				y += cellHeight;
+				if (fm == null) {
+					line++;
+					continue;
+				}
 				Fold fold = fm.getFoldForLine(line-1);
 				// Skip to next line to paint, taking extra care for lines with
 				// block ends and begins together, e.g. "} else {"

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextArea.java

@@ -635,6 +635,9 @@ public class RTextArea extends RTextAreaBase implements Printable {
 			parent = parent.getParent();
 		}
 		KeyStroke backspace = KeyStroke.getKeyStroke("BACK_SPACE");
+		if (inputMap == null) {
+			return;
+		}
 		inputMap.put(backspace, DefaultEditorKit.deletePrevCharAction);
 	}
 

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaEditorKit.java

@@ -902,6 +902,8 @@ public class RTextAreaEditorKit extends DefaultEditorKit {
 					}
 				} catch (BadLocationException bl) {
 				}
+			}else if (textArea == null) {
+				throw new IllegalArgumentException("RTextArea can not be null!");
 			}
 
 			if (beep)

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/VolatileImageBackgroundPainterStrategy.java

@@ -9,6 +9,8 @@
  */
 package com.fr.design.gui.syntax.ui.rtextarea;
 
+import com.fr.log.FineLoggerFactory;
+
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.image.VolatileImage;
@@ -95,9 +97,9 @@ public class VolatileImageBackgroundPainterStrategy
 				try {
 					tracker.waitForID(1);
 				} catch (InterruptedException e) {
-					e.printStackTrace();
+					FineLoggerFactory.getLogger().error(e.getMessage(),e);
 					bgImage = null;
-					return;
+					Thread.currentThread().interrupt();
 				} finally {
 					tracker.removeImage(i, 1);
 				}
@@ -106,9 +108,9 @@ public class VolatileImageBackgroundPainterStrategy
 				try {
 					tracker.waitForID(0);
 				} catch (InterruptedException e) {
-					e.printStackTrace();
+					FineLoggerFactory.getLogger().error(e.getMessage(),e);
 					bgImage = null;
-					return;
+					Thread.currentThread().interrupt();
 				} finally {
 					tracker.removeImage(bgImage, 0);
 				}

designer-base/src/main/java/com/fr/design/icon/LockIcon.java

@@ -34,6 +34,7 @@ public class LockIcon extends ImageIcon {
         }
     }
 
+    @Override
     public void paintIcon(Component c, Graphics g, int x, int y) {
         if (mainImage != null) {
             g.drawImage(mainImage, x, y, c);
@@ -48,6 +49,7 @@ public class LockIcon extends ImageIcon {
      *
      * @param image the image
      */
+    @Override
     protected void loadImage(Image image) {
         synchronized (tracker) {
             tracker.addImage(image, 0);
@@ -55,6 +57,7 @@ public class LockIcon extends ImageIcon {
                 tracker.waitForID(0, 0);
             } catch (InterruptedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                Thread.currentThread().interrupt();
             }
 
             loadStatus = tracker.statusID(0, false);
@@ -70,6 +73,7 @@ public class LockIcon extends ImageIcon {
      *
      * @return the <code>Image</code> object for this <code>ImageIcon</code>
      */
+    @Override
     public Image getImage() {
         return mainImage;
     }
@@ -85,6 +89,7 @@ public class LockIcon extends ImageIcon {
      *
      * @return the width in pixels of this icon
      */
+    @Override
     public int getIconWidth() {
         return width;
     }
@@ -94,6 +99,7 @@ public class LockIcon extends ImageIcon {
      *
      * @return the height in pixels of this icon
      */
+    @Override
     public int getIconHeight() {
         return height;
     }

designer-base/src/main/java/com/fr/design/icon/WarningIcon.java

@@ -59,6 +59,7 @@ public class WarningIcon extends ImageIcon {
 				tracker.waitForID(0, 0);
 			} catch (InterruptedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                Thread.currentThread().interrupt();
 			}
 
 			tracker.statusID(0, false);

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -217,6 +217,18 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个靠左空边框面板，间隔小，firsthgap 为0
+     *
+     * @return JPanel对象
+     */
+    public static JPanel createTinyHGapFlowInnerContainer_M_Pane_First0() {
+        JPanel jp = new JPanel();
+        jp.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        jp.setLayout(new FRLeftFlowLayout(0, 5, 0));
+        return jp;
+    }
+
     /**
      * 创建一个靠左空边框面板，间隔中等
      *

designer-base/src/main/java/com/fr/design/layout/TableLayout.java

@@ -1,6 +1,9 @@
 package com.fr.design.layout;
 
 
+import com.fr.general.GeneralUtils;
+import com.fr.stable.CommonUtils;
+
 import java.awt.Component;
 import java.awt.ComponentOrientation;
 import java.awt.Container;
@@ -12,8 +15,6 @@ import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.ListIterator;
 
-import com.fr.general.GeneralUtils;
-
 
 /**
  * <p>TableLayout is a layout manager that is more powerful than GridBagLayout
@@ -853,9 +854,9 @@ public class TableLayout implements LayoutManager2, Serializable {
 
         // Make sure row size is valid
         if ((size < 0.0) &&
-                (size != FILL) &&
+                (!CommonUtils.equals(size, FILL)) &&
-                (size != PREFERRED) &&
+                (!CommonUtils.equals(size, PREFERRED)) &&
-                (size != MINIMUM)) {
+                (!CommonUtils.equals(size, MINIMUM))) {
             size = 0.0;
         }
 
@@ -1177,7 +1178,7 @@ public class TableLayout implements LayoutManager2, Serializable {
         int numCr = crSpec[z].length;
 
         for (int counter = 0; counter < numCr; counter++)
-            if ((crSpec[z][counter] >= 1.0) || (crSpec[z][counter] == 0.0)) {
+            if ((crSpec[z][counter] >= 1.0) || CommonUtils.equals(crSpec[z][counter], 0.0)) {
                 crSize[z][counter] = (int) (crSpec[z][counter] + 0.5);
                 availableSize -= crSize[z][counter];
             }
@@ -1218,7 +1219,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      * @param z                indicates row or column
      * @param availableSize    amount of space available in the container
      */
-
+    @SuppressWarnings("squid:S3518")
     protected void assignFillSize(int z, int availableSize) {
         // Skip if there is no more space to allocate
         if (availableSize <= 0)
@@ -1229,7 +1230,7 @@ public class TableLayout implements LayoutManager2, Serializable {
         int numCr = crSpec[z].length;
 
         for (int counter = 0; counter < numCr; counter++)
-            if (crSpec[z][counter] == FILL)
+            if (CommonUtils.equals(crSpec[z][counter], FILL))
                 numFillSize++;
 
         // If numFillSize is zero, the if statement below will always evaluate to
@@ -1241,7 +1242,7 @@ public class TableLayout implements LayoutManager2, Serializable {
 
         // Assign "fill" cells equal amounts of the remaining space
         for (int counter = 0; counter < numCr; counter++)
-            if (crSpec[z][counter] == FILL) {
+            if (CommonUtils.equals(crSpec[z][counter], FILL)) {
                 crSize[z][counter] = availableSize / numFillSize;
                 slackSize -= crSize[z][counter];
             }
@@ -1249,7 +1250,7 @@ public class TableLayout implements LayoutManager2, Serializable {
         // Assign one pixel of slack to each FILL cr, starting at the last one,
         // until all slack has been consumed
         for (int counter = numCr - 1; (counter >= 0) && (slackSize > 0); counter--) {
-            if (crSpec[z][counter] == FILL) {
+            if (CommonUtils.equals(crSpec[z][counter], FILL)) {
                 crSize[z][counter]++;
                 slackSize--;
             }
@@ -1290,7 +1291,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      * @return the amount of space available after absolute crs have been assigned
      *         sizes
      */
-
+    @SuppressWarnings("squid:S3518")
     protected int assignPrefMinSize
             (int z, int availableSize, double typeOfSize) {
         // Get variables referring to columns or rows (crs)
@@ -1299,7 +1300,7 @@ public class TableLayout implements LayoutManager2, Serializable {
         // Address every cr
         for (int counter = 0; counter < numCr; counter++)
                 // Is the current cr a preferred/minimum (based on typeOfSize) size
-            if (crSpec[z][counter] == typeOfSize) {
+            if (CommonUtils.equals(crSpec[z][counter], typeOfSize)) {
                 // Assume a maximum width of zero
                 int maxSize = 0;
 
@@ -1319,7 +1320,7 @@ public class TableLayout implements LayoutManager2, Serializable {
                     // the current component occupies
                     if ((entry.cr1[z] <= counter) && (entry.cr2[z] >= counter)) {
                         // Setup size and number of adjustable crs
-                        Dimension p = (typeOfSize == PREFERRED) ?
+                        Dimension p = CommonUtils.equals(typeOfSize, PREFERRED) ?
                                 entry.component.getPreferredSize() :
                                 entry.component.getMinimumSize();
 
@@ -1328,23 +1329,23 @@ public class TableLayout implements LayoutManager2, Serializable {
                         int numAdjustable = 0;
 
                         // Calculate for preferred size
-                        if (typeOfSize == PREFERRED)
+                        if (CommonUtils.equals(typeOfSize, PREFERRED))
                         // Consider all crs this component occupies
                             for (int entryCr = entry.cr1[z];
                                  entryCr <= entry.cr2[z]; entryCr++) {
                                 // Subtract absolute, relative, and minumum cr
                                 // sizes, which have already been calculated
                                 if ((crSpec[z][entryCr] >= 0.0) ||
-                                        (crSpec[z][entryCr] == MINIMUM)) {
+                                        CommonUtils.equals(crSpec[z][entryCr], MINIMUM)) {
                                     size -= crSize[z][entryCr];
                                 }
                                 // Count preferred/min width columns
-                                else if (crSpec[z][entryCr] == PREFERRED)
+                                else if (CommonUtils.equals(crSpec[z][entryCr], PREFERRED))
                                     numAdjustable++;
                                     // Skip any component that occupies a fill cr
                                     // because the fill should fulfill the size
                                     // requirements
-                                else if (crSpec[z][entryCr] == FILL)
+                                else if (CommonUtils.equals(crSpec[z][entryCr], FILL))
                                     continue nextComponent;
                             }
                         // Calculate for minimum size
@@ -1357,14 +1358,14 @@ public class TableLayout implements LayoutManager2, Serializable {
                                 if (crSpec[z][entryCr] >= 0.0)
                                     size -= crSize[z][entryCr];
                                 // Count preferred/min width columns
-                                else if ((crSpec[z][entryCr] == PREFERRED) ||
+                                else if (CommonUtils.equals(crSpec[z][entryCr], PREFERRED) ||
-                                        (crSpec[z][entryCr] == MINIMUM)) {
+                                        CommonUtils.equals(crSpec[z][entryCr], MINIMUM)) {
                                     numAdjustable++;
                                 }
                                 // Skip any component that occupies a fill cr
                                 // because the fill should fulfill the size
                                 // requirements
-                                else if (crSpec[z][entryCr] == FILL)
+                                else if (CommonUtils.equals(crSpec[z][entryCr], FILL))
                                     continue nextComponent;
                             }
 
@@ -1692,7 +1693,7 @@ public class TableLayout implements LayoutManager2, Serializable {
         Dimension prefMinSize[] = new Dimension[numEntry];
 
         for (int i = 0; i < numEntry; i++)
-            prefMinSize[i] = (typeOfSize == PREFERRED) ?
+            prefMinSize[i] = CommonUtils.equals(typeOfSize, PREFERRED) ?
                     entryList[i].component.getPreferredSize() :
                     entryList[i].component.getMinimumSize();
 
@@ -1727,7 +1728,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      *
      * @return a dimension indicating the container's preferred or minimum size
      */
-
+    @SuppressWarnings("squid:S3518")
     protected int calculateLayoutSize
             (Container container, int z, double typeOfSize, Entry entryList[],
              Dimension prefMinSize[]) {

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -1091,6 +1091,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             thread.join();
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error("Map Thread Error");
+            Thread.currentThread().interrupt();
         }
 
         DesignerEnvManager.getEnvManager().setLastOpenFile(

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.mobile.ui;
 
+import com.fr.base.background.ColorBackground;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
@@ -23,6 +24,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
     private MobileStyleCustomDefinePane customBeanPane;
     private Class<? extends MobileStyle> mobileStyleClazz;
     private NewColorSelectBox colorSelectBox;
+    private Color titleColor = new Color(47, 142, 241);
 
     MobileStyleDefinePane(Widget widget, Class<? extends MobileStyleCustomDefinePane> customBeanPaneClass,
                           Class<? extends MobileStyle> mobileStyleClazz) {
@@ -35,7 +37,9 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
     @Override
     public void populateBean(MobileStyle ob) {
         this.customBeanPane.populateBean(ob);
-        colorSelectBox.setSelectObject(ob.getBackground());
+        if(ob.getBackground() != null) {
+            colorSelectBox.setSelectObject(((ColorBackground)ob.getBackground()).getColor());
+        }
     }
 
     @Override
@@ -43,7 +47,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         MobileStyle mobileStyle = Reflect.on(mobileStyleClazz).create().get();
         this.widget.setMobileStyle(mobileStyle);
         this.customBeanPane.updateBean();
-        mobileStyle.setBackground(colorSelectBox.getSelectObject());
+        mobileStyle.setBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject()));
         return mobileStyle;
     }
 
@@ -67,8 +71,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         JPanel mobileStylePreviewPane = this.customBeanPane.createPreviewPane();
         if(mobileStylePreviewPane != null) {
             JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-            TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"), null);
+            TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"));
-            titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, new Color(0x2f8ef100)));
             previewPane.setBorder(titledBorder);
             previewPane.setPreferredSize(new Dimension(500, 83));
             previewPane.add(mobileStylePreviewPane, BorderLayout.CENTER);
@@ -82,8 +85,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         backgroundPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 5));
         backgroundPane.setPreferredSize(new Dimension(500, 65));
 
-        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_Common_Attribute"), null);
+        TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_Common_Attribute"));
-        titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, Color.BLUE));
         backgroundPane.setBorder(titledBorder);
 
         UILabel colorSelectLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Widget_Background"), UILabel.RIGHT);
@@ -104,12 +106,17 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
 
     private void createCustomPane() {
         JPanel configPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"), null);
+        TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Set"));
-        titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, Color.BLUE));
         configPane.setBorder(titledBorder);
 
         configPane.add(this.customBeanPane, BorderLayout.CENTER);
 
         this.add(configPane, BorderLayout.CENTER);
     }
+
+    private TitledBorder createTitledBorder(String title) {
+        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(title, titleColor);
+        titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12));
+        return  titledBorder;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java

@@ -11,6 +11,8 @@ import com.fr.design.web.CustomIconPane;
 import com.fr.form.ui.WidgetInfoConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.stable.StringUtils;
+
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -33,6 +35,7 @@ import java.util.ArrayList;
 
 public class TabIconConfigPane extends JPanel {
     private UIButton editIconButton;
+    private UIButton deleteIconButton;
     private String curIconName;
     private IconButton selectIconButton;
     private ArrayList<IconButton> iconButtons = new ArrayList<IconButton>();
@@ -43,7 +46,7 @@ public class TabIconConfigPane extends JPanel {
 
     public void initComp(int count) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel panel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        JPanel panel = FRGUIPaneFactory.createTinyHGapFlowInnerContainer_M_Pane_First0();
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
         editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
         editIconButton.setFont(FRFont.getInstance("Helvetica", Font.PLAIN, 12, Color.decode("#3A383A")));
@@ -63,12 +66,28 @@ public class TabIconConfigPane extends JPanel {
                         curIconName = cip.update();
                         setShowIconImage();
                         TabIconConfigPane.this.repaint();
+                        deleteIconButton.setEnabled(true);
                     }
                 });
                 editDialog.setVisible(true);
             }
         });
         editIconButton.setEnabled(false);
+
+        deleteIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Delete"));
+        deleteIconButton.setFont(FRFont.getInstance("Helvetica", Font.PLAIN, 12, Color.decode("#3A383A")));
+        deleteIconButton.setPreferredSize(new Dimension(62, 20));
+        panel.add(deleteIconButton);
+        deleteIconButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                curIconName = "";
+                setShowIconImage();
+                TabIconConfigPane.this.repaint();
+                deleteIconButton.setEnabled(false);
+            }
+        });
+        deleteIconButton.setEnabled(false);
+
         this.add(panel, BorderLayout.CENTER);
 
         JPanel northPane = new JPanel();
@@ -163,6 +182,7 @@ public class TabIconConfigPane extends JPanel {
         public void actionPerformed(ActionEvent evt) {
             selectIconButton = this;
             editIconButton.setEnabled(true);
+            deleteIconButton.setEnabled(StringUtils.isNotEmpty(this.getIconName()));
             TabIconConfigPane.this.repaint();// repaint
         }
 

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsLabel.java

@@ -19,12 +19,11 @@ public class VcsLabel extends ActionLabel {
     }
 
     public void paintComponent(Graphics g) {
-        if (ui != null) {
+        if (ui != null && g != null) {
-            Graphics scratchGraphics = (g == null) ? null : g.create();
+            Graphics scratchGraphics = g.create();
             try {
                 ui.update(scratchGraphics, this);
-            }
+            } finally {
-            finally {
                 scratchGraphics.dispose();
             }
         }

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -6,6 +6,8 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.ispinner.UnsignedIntUISpinner;
 import com.fr.design.gui.style.FRFontPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -14,14 +16,18 @@ import com.fr.design.style.color.NewColorSelectPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.SwingConstants;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import java.awt.Dimension;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -37,9 +43,15 @@ public class WatermarkPane extends BasicPane {
     private TinyFormulaPane formulaPane;
     // 字号
     private UIComboBox fontSizeComboBox;
+    //横向间距
+    private UISpinner horizontalGapSpinner;
+    //横向间距
+    private UISpinner verticalGapSpinner;
     // 文字颜色
     private NewColorSelectPane colorPane;
 
+    private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20);
+
     public WatermarkPane() {
         initComponents();
     }
@@ -73,6 +85,7 @@ public class WatermarkPane extends BasicPane {
         }
         populateFourmula(watermark.getText());
         populateFontSize(watermark.getFontSize());
+        populateWatermarkGap(watermark);
         populateColor(watermark.getColor());
         paintPreviewPane();
     }
@@ -81,6 +94,8 @@ public class WatermarkPane extends BasicPane {
         WatermarkAttr watermark = new WatermarkAttr();
         watermark.setText(formulaPane.getUITextField().getText());
         watermark.setFontSize((int)fontSizeComboBox.getSelectedItem());
+        watermark.setHorizontalGap((int) horizontalGapSpinner.getValue());
+        watermark.setVerticalGap((int) verticalGapSpinner.getValue());
         watermark.setColor(colorPane.getColor());
         colorPane.updateUsedColor();
         return watermark;
@@ -98,20 +113,39 @@ public class WatermarkPane extends BasicPane {
         formulaPane = new TinyFormulaPane();
         fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
         fontSizeComboBox.setEditable(true);
+        horizontalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 200);
+        verticalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 100);
+        horizontalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
+        verticalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));
         fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);
 
+        //水印间距面板
+        JPanel watermarkGapPane = new JPanel(new BorderLayout(10, 0));
+        JPanel jp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 0);
+        jp.add(horizontalGapSpinner);
+        jp.add(verticalGapSpinner);
+        watermarkGapPane.add(jp, BorderLayout.CENTER);
+
+        JPanel watermarkGapTipsPane = new JPanel(new BorderLayout());
+        JPanel tipsJp = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 0);
+        tipsJp.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), SwingConstants.CENTER));
+        tipsJp.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"), SwingConstants.CENTER));
+        watermarkGapTipsPane.add(tipsJp, BorderLayout.CENTER);
+
         colorPane = new NewColorSelectPane();
         JPanel colorLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text_Color")), BorderLayout.NORTH);
 
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p,p,p};
+        double[] rowSize = {p, p, p, p, p};
         double[] columnSize = {p, MAX_WIDTH};
 
         JPanel rightContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Watermark_Text")), formulaPane},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Size")), fontSizeTypePane},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Watermark_Gap")),watermarkGapPane },
+                {null,watermarkGapTipsPane },
                 {colorLabelPane, colorPane},
         }, rowSize, columnSize, 10);
         rightContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
@@ -131,6 +165,36 @@ public class WatermarkPane extends BasicPane {
         });
     }
 
+    protected void populateWatermarkGap(WatermarkAttr watermark){
+        this.horizontalGapSpinner.setValue(watermark.getHorizontalGap());
+        this.horizontalGapSpinner.addUISpinnerFocusListenner(new FocusListener() {
+
+            @Override
+            public void focusGained(FocusEvent e) {
+                paintPreviewPane();
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                paintPreviewPane();
+            }
+        });
+
+        this.verticalGapSpinner.setValue(watermark.getVerticalGap());
+        this.verticalGapSpinner.addUISpinnerFocusListenner(new FocusListener() {
+
+            @Override
+            public void focusGained(FocusEvent e) {
+                paintPreviewPane();
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                paintPreviewPane();
+            }
+        });
+    }
+
     protected void paintPreviewPane(){
         watermarkPreviewPane.repaint(update());
     }

designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java

@@ -74,6 +74,7 @@ public class ColorPicker extends JDialog implements ActionListener
                 Thread.sleep(100);  // 等待弹窗关闭
             } catch (InterruptedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                Thread.currentThread().interrupt();
             }
             colorPickerPanel.captureScreen();
         }

designer-base/src/main/java/com/fr/design/update/actions/FileDownloader.java

@@ -65,6 +65,7 @@ public abstract class FileDownloader extends SwingWorker<Boolean, DownloadItem>
             success = get();
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            Thread.currentThread().interrupt();
         } catch (ExecutionException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -385,6 +385,7 @@ public class UpdateMainDialog extends UIDialog {
                     showDownLoadInfo();
                 } catch (InterruptedException e) {
                     stopLoading();
+                    Thread.currentThread().interrupt();
                 } catch (ExecutionException e) {
                     stopLoading();
                 } finally {

designer-base/src/main/java/com/fr/design/utils/DrawRoutines.java

@@ -206,6 +206,7 @@ public class DrawRoutines {
             grabber.grabPixels();
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error("PixelGrabber interrupted waiting for pixels");
+            Thread.currentThread().interrupt();
         }
 
         if ((grabber.getStatus() & ImageObserver.ABORT) != 0) {

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -433,7 +433,7 @@ public class CustomIconPane extends BasicPane {
             JPanel imagePane = new JPanel();
             imagePane.setLayout(new FlowLayout(FlowLayout.LEFT, 30, 0));
             showImageLabel = new UILabel();
-            showImageLabel.setPreferredSize(new Dimension(20, 20));
+            showImageLabel.setPreferredSize(new Dimension(50, 50));
             imagePane.add(showImageLabel);
             imagePane.add(browseButton);
             Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
@@ -450,12 +450,12 @@ public class CustomIconPane extends BasicPane {
 
             if (JFileChooser.APPROVE_OPTION == jf.showOpenDialog(DesignerContext.getDesignerFrame())) {
                 String path = jf.getSelectedFile().getAbsolutePath();
-                // 将图片转化到16 × 16大小
+                // 图片存储有最大值48*48限制，没有超过最大值时，按原图大小存储，超过最大值后，压缩至最大值存储
                 Image image = BaseUtils.readImage(path);
-                BufferedImage bufferedImage = CoreGraphHelper.createBufferedImage(IconManager.DEFAULT_ICONWIDTH,
+                BufferedImage bufferedImage = CoreGraphHelper.createBufferedImage(Math.min(image.getWidth(null), IconManager.MAXSTORAGE_ICONWIDTH),
-                        IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
+                        Math.min(image.getHeight(null), IconManager.MAXSTORAGE_ICONHEIGHT), BufferedImage.TYPE_INT_ARGB);
                 Graphics2D g2d = bufferedImage.createGraphics();
-                g2d.drawImage(image, 0, 0, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null);
+                g2d.drawImage(image, 0, 0, Math.min(image.getWidth(null), IconManager.MAXSTORAGE_ICONWIDTH), Math.min(image.getHeight(null), IconManager.MAXSTORAGE_ICONHEIGHT), null);
                 bufferedImage.flush();
                 g2d.dispose();
                 iconImage = bufferedImage;

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -548,6 +548,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());
                     message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
                     uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+                    Thread.currentThread().interrupt();
                 }
                 dialogDownPane.remove(cancelButton);
                 dialogDownPane.revalidate();

designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

@@ -81,6 +81,7 @@ public class FineEmbedServerMonitor {
                     try {
                         Thread.sleep(STEP_HEARTBEAT);
                     } catch (InterruptedException ignore) {
+                        Thread.currentThread().interrupt();
                     }
                 }
                 DesignerContext.getDesignerFrame().hideProgressDialog();

designer-chart/src/main/java/com/fr/design/chart/ChartIcon.java

@@ -0,0 +1,116 @@
+package com.fr.design.chart;
+
+import com.fr.base.GraphHelper;
+import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLable;
+import com.fr.stable.xml.XMLableReader;
+
+import javax.swing.Icon;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.image.BufferedImage;
+
+/**
+ * 图表的缩略图Icon, 在选择图表类型界面 用到.
+ */
+public class ChartIcon implements Icon, XMLable {
+    private static final int WIDTH = 400;
+    private static final int HEIGHT = 225;
+    /**
+     * 缩略图中的图片路径
+     */
+    private String imagePath;
+
+    private String chartName;
+
+    /**
+     * 构造Chart的缩略图Icon
+     */
+    public ChartIcon(String imagePath, String chartName) {
+        this.imagePath = imagePath;
+        this.chartName = chartName;
+    }
+
+    /**
+     * 画出缩略图Icon
+     *
+     * @param g 图形的上下文
+     * @param c 所在的Component
+     * @param x 缩略图的起始坐标x
+     * @param y 缩略图的起始坐标y
+     */
+    public void paintIcon(Component c, Graphics g, int x, int y) {
+
+        Graphics2D g2d = (Graphics2D) g;
+
+        Paint oldPaint = g2d.getPaint();
+
+        g.translate(x, y);
+        g2d.setPaint(Color.white);
+
+        g2d.fillRect(0, 0, getIconWidth(), getIconHeight());
+        BufferedImage demoImage = IOUtils.readImageWithCache(imagePath);
+        GraphHelper.paintImage(g, getIconWidth(), getIconHeight(), demoImage, Constants.IMAGE_ADJUST, Constants.NULL, Constants.NULL, -1, -1);
+
+        g.translate(-x, -y);
+        g2d.setPaint(oldPaint);
+    }
+
+    /**
+     * 返回缩略图的宽度
+     *
+     * @return int 缩略图宽度
+     */
+    public int getIconWidth() {
+        return WIDTH;
+    }
+
+    /**
+     * 返回缩略图的高度
+     *
+     * @return int 缩略图高度
+     */
+    public int getIconHeight() {
+        return HEIGHT;
+    }
+
+
+    /**
+     * 返回缩略图中的图片路径
+     *
+     * @return 缩略图中的图片路径
+     */
+    public String getImagePath() {
+        return imagePath;
+    }
+
+    public String getChartName() {
+        return chartName;
+    }
+
+
+    public void readXML(XMLableReader reader) {
+
+    }
+
+    public void writeXML(XMLPrintWriter writer) {
+
+    }
+
+    /**
+     * @return 克隆后的对象
+     * @throws CloneNotSupportedException 如果克隆失败则抛出此异常
+     */
+    public Object clone() throws CloneNotSupportedException {
+        ChartIcon cloned = (ChartIcon) super.clone();
+        cloned.imagePath = this.imagePath;
+        cloned.chartName = this.chartName;
+        return cloned;
+    }
+
+}

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

@@ -1,12 +1,10 @@
 package com.fr.design.chart;
 /**
  * the Pane of the Chart
- *
  */
 
 import com.fr.chart.base.ChartInternationalNameContentBean;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.ChartIcon;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.gui.ilable.UILabel;
@@ -120,15 +118,16 @@ public class ChartTypePane extends ChartCommonWizardPane {
             ChartProvider[] sub_charts = ChartTypePane.this.charts4Icon[main_index];
             ChartTypePane.this.iconListModel.clear();
             for (int i = 0; i < sub_charts.length; i++) {
-                ChartTypePane.this.iconListModel.addElement(new ChartIcon(sub_charts[i]));
+                String ImagePath = sub_charts[i].demoImagePath();
+                String chartName = sub_charts[i].getChartName();
+                ChartTypePane.this.iconListModel.addElement(new ChartIcon(ImagePath, chartName));
             }
             iconViewList.setSelectedIndex(0);
         }
     };
 
     public String getChartName(ChartIcon chartIcon) {
-        ChartProvider chart = chartIcon.getChart();
+        return chartIcon.getChartName();
-        return ChartTypeManager.getInstanceWithCheck().getChartName(chart.getID());
     }
 
     public void populate(ChartProvider chart) {

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

@@ -1,97 +0,0 @@
-package com.fr.design.chart.gui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.CategoryAxisGlyph;
-import com.fr.chart.chartglyph.ChartAlertValueGlyph;
-import com.fr.chart.chartglyph.ChartGlyph;
-import com.fr.chart.chartglyph.DataSeries;
-import com.fr.chart.chartglyph.DataSheetGlyph;
-import com.fr.chart.chartglyph.DateAxisGlyph;
-import com.fr.chart.chartglyph.LegendGlyph;
-import com.fr.chart.chartglyph.PlotGlyph;
-import com.fr.chart.chartglyph.RadarAxisGlyph;
-import com.fr.chart.chartglyph.RangeAxisGlyph;
-import com.fr.chart.chartglyph.TextGlyph;
-import com.fr.chart.chartglyph.TitleGlyph;
-import com.fr.chart.chartglyph.TrendLineGlyph;
-import com.fr.chart.chartglyph.ValueAxisGlyph;
-import com.fr.design.chart.gui.active.ActiveGlyph;
-import com.fr.design.chart.gui.active.AlertValueActiveGlyph;
-import com.fr.design.chart.gui.active.CategoryAxisActiveGlyph;
-import com.fr.design.chart.gui.active.ChartActiveGlyph;
-import com.fr.design.chart.gui.active.DataLabelActiveGlyph;
-import com.fr.design.chart.gui.active.DataSeriesActiveGlyph;
-import com.fr.design.chart.gui.active.DataSheetActiveGlyph;
-import com.fr.design.chart.gui.active.DateAxisActiveGlyph;
-import com.fr.design.chart.gui.active.LegendActiveGlyph;
-import com.fr.design.chart.gui.active.PlotActiveGlyph;
-import com.fr.design.chart.gui.active.RadarAxisActiveGlyph;
-import com.fr.design.chart.gui.active.RangeAxisActiveGlyph;
-import com.fr.design.chart.gui.active.TextActiveGlyph;
-import com.fr.design.chart.gui.active.TrendLineActiveGlyph;
-import com.fr.design.chart.gui.active.ValueAxisActiveGlyph;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-23
- * Time   : 上午9:08
- */
-public class ActiveGlyphFactory {
-    private static Map<String, Class> glyphMap = new HashMap<String, Class>();
-
-    static {
-        glyphMap.put(DataSeries.class.getName(), DataSeriesActiveGlyph.class);
-        glyphMap.put(RadarAxisGlyph.class.getName(), RadarAxisActiveGlyph.class);
-        glyphMap.put(RangeAxisGlyph.class.getName(), RangeAxisActiveGlyph.class);
-        glyphMap.put(TitleGlyph.class.getName(), TextActiveGlyph.class);
-        glyphMap.put(DateAxisGlyph.class.getName(), DateAxisActiveGlyph.class);
-        glyphMap.put(ValueAxisGlyph.class.getName(), ValueAxisActiveGlyph.class);
-        glyphMap.put(CategoryAxisGlyph.class.getName(), CategoryAxisActiveGlyph.class);
-        glyphMap.put(ChartGlyph.class.getName(), ChartActiveGlyph.class);
-        glyphMap.put(DataSheetGlyph.class.getName(), DataSheetActiveGlyph.class);
-        glyphMap.put(LegendGlyph.class.getName(), LegendActiveGlyph.class);
-        glyphMap.put(TextGlyph.class.getName(), DataLabelActiveGlyph.class);
-        glyphMap.put(TrendLineGlyph.class.getName(), TrendLineActiveGlyph.class);
-        glyphMap.put(ChartAlertValueGlyph.class.getName(), AlertValueActiveGlyph.class);
-    }
-
-    private ActiveGlyphFactory() {
-
-    }
-
-    public static ActiveGlyph createActiveGlyph(ChartComponent chartComponent, Object glyph) {
-         return createActiveGlyph(chartComponent, glyph, null);
-    }
-
-    public static ActiveGlyph createActiveGlyph(ChartComponent chartComponent, Object glyph, Glyph parentGlyph) {
-        if (glyph == null) {
-            return null;
-        }
-        String clsName = glyph.getClass().getName();
-        Class cls = glyphMap.get(clsName);
-        Class parameterCls = glyph.getClass();
-        if (cls == null) {
-            if (clsName.endsWith("PlotGlyph")) {
-                cls = PlotActiveGlyph.class;
-                parameterCls = PlotGlyph.class;
-            } else if (clsName.endsWith("DataSeries4Area")) {
-            	cls = DataSeriesActiveGlyph.class;
-            	parameterCls = DataSeries.class;
-            } else {
-                cls = ChartActiveGlyph.class;
-                parameterCls = ChartGlyph.class;
-            }
-        }
-        try {
-            Class[] argsClass = new Class[]{ChartComponent.class, parameterCls, Glyph.class};
-            return (ActiveGlyph) cls.getConstructor(argsClass).newInstance(new Object[]{chartComponent, glyph, parentGlyph});
-        } catch (Exception e) {
-            return null;
-        }
-    }
-}

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

@@ -2,36 +2,26 @@ package com.fr.design.chart.gui;
 
 import com.fr.base.ScreenResolution;
 import com.fr.base.chart.BaseChartCollection;
-import com.fr.base.chart.BaseChartGlyph;
 import com.fr.base.chart.chartdata.CallbackEvent;
+import com.fr.chart.ChartWebPara;
 import com.fr.chart.base.ChartConstants;
-import com.fr.chart.chartattr.Axis;
-import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartglyph.AxisGlyph;
 import com.fr.chartx.attr.ChartProvider;
-import com.fr.design.chart.gui.active.ActiveGlyph;
-import com.fr.design.chart.gui.active.ChartActiveGlyph;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.chart.MiddleChartComponent;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeListener;
 
 import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Paint;
-import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,22 +35,12 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
 	private static final long serialVersionUID = 744164838619052097L;
 	private final List<PropertyChangeListener> listeners = new ArrayList<PropertyChangeListener>();
     private ChartCollection chartCollection4Design;
-    private Chart editingChart;
+    private ChartProvider editingChart;
-    private BaseChartGlyph chartGlyph;
     private int chartWidth = -1;
     private int chartHeight = -1;
-    private Point point;
-    private int resolution = ScreenResolution.getScreenResolution();
-    private ActiveGlyph activeGlyph;
 
     private boolean supportEdit = true;
 
-    private final int[] resizeCursors = new int[]{
-            Cursor.NW_RESIZE_CURSOR, Cursor.N_RESIZE_CURSOR, Cursor.NE_RESIZE_CURSOR,
-            Cursor.E_RESIZE_CURSOR, Cursor.W_RESIZE_CURSOR,
-            Cursor.SE_RESIZE_CURSOR, Cursor.S_RESIZE_CURSOR, Cursor.SW_RESIZE_CURSOR
-    };
-
     public ChartComponent() {
         super();
         addMouseListener(this);
@@ -112,15 +92,11 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
         fireStopEditing();
 
         this.editingChart = null;
-        this.chartGlyph = null;
-        this.activeGlyph = null;
-        this.point = null;
         this.chartHeight = this.chartWidth = -1;
 
-        this.editingChart = this.chartCollection4Design.getSelectedChart();
+        this.editingChart = this.chartCollection4Design.getSelectedChartProvider();
 
         refreshChartGlyph();
-        this.activeGlyph = ActiveGlyphFactory.createActiveGlyph(this, chartGlyph);
 
         repaint();
     }
@@ -166,9 +142,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
         return editingChart;
     }
 
-	public BaseChartGlyph getChartGlyph() {
-        return chartGlyph;
-    }
 
     public void paintComponent(Graphics g) {  //
         super.paintComponent(g);
@@ -192,12 +165,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 
         //画图
-        drawChartGlyph(g2d);
+        drawChart(g2d);
-
-        ActiveGlyph ag = this.getActiveGlyph();
-		if (ag != null) {
-			ag.paint4ActiveGlyph(g2d, chartGlyph);
-		}
 
         g2d.translate(-ChartConstants.PREGAP4BOUNDS/2, -ChartConstants.PREGAP4BOUNDS/2);
         if (lastHint == null) {
@@ -212,24 +180,11 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
       */
     private void refreshChartGlyph() {
         Dimension d = getBounds().getSize();
-        this.editingChart = this.chartCollection4Design.getSelectedChart();// kunsnat: 切换选中时 同步切换Plot
+        this.editingChart = this.chartCollection4Design.getSelectedChartProvider();// kunsnat: 切换选中时 同步切换Plot
-        if (editingChart != null) {
-            this.chartGlyph = editingChart.createGlyph(editingChart.defaultChartData());
-            this.activeGlyph = ActiveGlyphFactory.createActiveGlyph(this, chartGlyph);
-        }
         this.chartWidth = d.width - ChartConstants.PREGAP4BOUNDS;
         this.chartHeight = d.height - ChartConstants.PREGAP4BOUNDS;
     }
 
-    private ActiveGlyph getActiveGlyph() {
-        if (point == null) {
-        	this.activeGlyph = new ChartActiveGlyph(this, chartGlyph);
-        } else {
-        	this.activeGlyph = new ChartActiveGlyph(this, chartGlyph).findActionGlyphFromChildren(point.x, point.y);
-        }
-        return this.activeGlyph;
-    }
-
     /**
      * 鼠标点击
      * @param event    鼠标事件
@@ -243,16 +198,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
      * @param e    鼠标事件
      */
     public void mousePressed(MouseEvent e) {
-    	point = new Point(e.getX(),e.getY());
-       if (!ArrayUtils.contains(resizeCursors, this.getCursor().getType())) {
-    	   this.activeGlyph = new ChartActiveGlyph(this, chartGlyph).findActionGlyphFromChildren(point.x, point.y);
-        }
 
-       if (this.activeGlyph == null) {
-            return;
-        }
-
-        repaint();
         
     }
 
@@ -291,45 +237,21 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
      * @param e    鼠标事件
      */
     public void mouseMoved(MouseEvent e) {
-    	ActiveGlyph ag = this.getActiveGlyph();
-		if (ag != null) {
-			ag.onMouseMove(e);
-		}
-    }
-
-    public AxisGlyph getActiveAxisGlyph() {
-        return (AxisGlyph) activeGlyph.getGlyph();
-    }
-
-    public Axis getActiveAxis() {
-        AxisGlyph axisGlyph = getActiveAxisGlyph();
-        if (editingChart.getPlot() != null) {
-            return editingChart.getPlot().getAxis(axisGlyph.getAxisType());
-        }
-        return null;
     }
 
     private boolean needRefreshChartGlyph() {
-        return chartGlyph == null || chartWidth != this.getBounds().width || chartHeight != this.getBounds().height;
+        return editingChart == null || chartWidth != this.getBounds().width || chartHeight != this.getBounds().height;
     }
 
-    public void drawChartGlyph(Graphics2D g2d) {
+    private void drawChart(Graphics2D g2d) {
-        if (chartGlyph != null) {
+        if (editingChart != null) {
-            if (chartGlyph.isRoundBorder()) {
-                chartGlyph.setBounds(new RoundRectangle2D.Double(0, 0, chartWidth, chartHeight, 10, 10));
-            } else {
-                chartGlyph.setBounds(new Rectangle2D.Double(0, 0, chartWidth, chartHeight));
-            }
 
-            //不直接画chartGlyph而画image的原因是表单的柱形图会溢出表单
-            //其他图都ok，其实感觉应该是柱形图画的不对，应该也可以改那边
-            //处理画图事件
 
-            resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
+            int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution();
             if (resolution == 0){
                 resolution = ScreenResolution.getScreenResolution();
             }
-            Image chartImage =  chartGlyph.toImage(chartWidth,chartHeight,resolution, this, null);
+            Image chartImage = editingChart.toImage(chartWidth, chartHeight, resolution, new ChartWebPara());
 
             g2d.drawImage(chartImage, 0, 0,  null);
         }

designer-chart/src/main/java/com/fr/design/chart/gui/active/ActiveGlyph.java

@@ -1,161 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.event.MouseEvent;
-import java.awt.geom.Point2D;
-
-import com.fr.base.ScreenResolution;
-import com.fr.base.chart.BaseChartGlyph;
-import com.fr.base.chart.Glyph;
-import com.fr.design.chart.gui.ActiveGlyphFactory;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:51
- * 选中的Glyph
- */
-public abstract class ActiveGlyph {
-    protected Glyph parentGlyph;
-    protected ChartComponent chartComponent;
-
-    public ActiveGlyph(ChartComponent chartComponent, Glyph parentGlyph) {
-        this.chartComponent = chartComponent;
-        this.parentGlyph = parentGlyph;
-    }
-
-    public abstract Glyph getGlyph();
-    
-    public void drawAllGlyph(Graphics2D g2d, int resolution){
-		Point2D offset4Paint = offset4Paint();
-        g2d.translate(offset4Paint.getX(), offset4Paint.getY());
-		this.getGlyph().draw(g2d, resolution);
-		g2d.translate(-offset4Paint.getX(), -offset4Paint.getY());
-	};
-    
-    /**
-     * 属性表中, 通过点击 展开到对应的界面.
-     */
-    public abstract void goRightPane();
-
-    /**
-     * 画的偏移的
-     * @return 偏移的
-     */
-    public Point2D offset4Paint() {
-        return new Point2D.Double(
-                this.parentGlyph.getShape().getBounds().getX(),
-                this.parentGlyph.getShape().getBounds().getY()
-        );
-    }
-
-    public void paint4ActiveGlyph(Graphics2D g2d, BaseChartGlyph chartGlyph) {
-    	if(this.parentGlyph == null) {
-    		return;
-    	}
-    	
-        Paint oldPaint = g2d.getPaint();
-        Composite oldComposite = g2d.getComposite();
-    	g2d.setPaint(Color.WHITE);
-    	g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
-
-        g2d.fill(chartGlyph.getShape());
-        drawAllGlyph(g2d, ScreenResolution.getScreenResolution());
-
-        g2d.setPaint(oldPaint);
-        g2d.setComposite(oldComposite);
-    }
-    
-    protected void drawSelectedBounds4Active(Graphics2D g2d) {
-    	if (this.getGlyph() != null) {
-    		Shape shape = this.getGlyph().getShape();
-    		if (shape != null) {
-    			g2d.draw(shape);
-    		}
-    	}
-    }
-
-
-    /**
-     *当前的ActiveGlyph是否包含坐标mouseX, mouseY
-     * @param mouseX 坐标X
-     * @param mouseY 坐标Y
-     * @return 包含则返回true
-     */
-    public boolean contains(int mouseX, int mouseY) {
-        if (getGlyph() == null || getGlyph().getShape() == null){
-        	return false;
-        }
-
-        Point2D offset = this.offset4Paint();
-
-        /*
-        * alex:因为Line2D.contains(x, y)必然返回false
-        * 所以用intersect一个区域,这个区域大小用4 * 4的,区域大一些,就灵敏一些
-        */
-        return getGlyph().getShape().intersects(mouseX - offset.getX() - 2, mouseY - offset.getY() - 2, 4, 4);
-    }
-
-    /**
-     * 在当前选中的ActiveGlyph中,仅仅在其Children中找与mouseX, mouseY匹配的ActiveGlyph
-     * @param mouseX 坐标X
-     * @param mouseY 坐标Y
-     * @return 当前ativeGlyph
-     */
-    public ActiveGlyph findActionGlyphFromChildren(int mouseX, int mouseY) {
-        Glyph currentGlyph = getGlyph();
-        // 报错应对.
-        if (currentGlyph == null) {
-            return null;
-        }
-        java.util.Iterator selectableChildren = currentGlyph.selectableChildren();
-
-        ActiveGlyph resAG = null;
-        while (selectableChildren.hasNext() && resAG == null) {
-            ActiveGlyph childActiveGlyph = ActiveGlyphFactory.createActiveGlyph(chartComponent, selectableChildren.next(), currentGlyph);
-
-            // 如果childActiveGlyph不为null,找一下其子辈有没有符合条件
-            if (childActiveGlyph != null) {
-                resAG = childActiveGlyph.findActionGlyphFromChildren(mouseX, mouseY);
-            }
-
-            // 如果childActiveGlyph的子辈没有符合条件的,就看一下这个childGlyph是否符合条件
-            if (resAG == null && childActiveGlyph != null && childActiveGlyph.contains(mouseX, mouseY)) {
-                resAG = childActiveGlyph;
-            }
-        }
-
-        // 如果当前ActiveGlyph的所有子辈都没有与mouseX, mouseY相匹配的,看一下它自己是否匹配
-        if (resAG == null) {
-            if (this.contains(mouseX, mouseY)) {
-                resAG = this;
-            }
-        }
-
-        return resAG;
-    }
-
-    /**
-     * 拖拽
-     * @param e 事件
-     */
-    public void onMouseDragged(MouseEvent e) {
-
-    }
-
-    /**
-     * 移动事件
-     * @param e 事件
-     */
-    public void onMouseMove(MouseEvent e) {
-
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/AlertValueActiveGlyph.java

@@ -1,38 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.ChartAlertValueGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetAnalysisLineStyleAction;
-
-public class AlertValueActiveGlyph extends ActiveGlyph{
-	ChartAlertValueGlyph alertValueGlyph;
-	
-	public AlertValueActiveGlyph(ChartComponent chartComponent,ChartAlertValueGlyph alertLine, Glyph parentGlyph) {
-		super(chartComponent, parentGlyph);
-		this.alertValueGlyph = alertLine;
-	}
-	
-	public Point2D offset4Paint() {
-		Rectangle2D valueAxisBoudns = this.alertValueGlyph.getValueAxisGlyph().getBounds();
-		
-        return new Point2D.Double(
-                this.parentGlyph.getShape().getBounds().getX() + valueAxisBoudns.getX(),
-                this.parentGlyph.getShape().getBounds().getY() + valueAxisBoudns.getY()
-        );
-    }
-	
-	@Override
-	public Glyph getGlyph() {
-		return this.alertValueGlyph;
-	}
-
-	@Override
-	public void goRightPane() {
-		new SetAnalysisLineStyleAction(chartComponent).showAnalysisLineStylePane();
-	}
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/AxisActiveGlyph.java

@@ -1,43 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Point2D;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.AxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetAxisStyleAction;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:00
- */
-public abstract class AxisActiveGlyph extends ActiveGlyph {
-    protected AxisGlyph axis;
-
-    public AxisActiveGlyph(ChartComponent chartComponent, AxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.axis = axis;
-    }
-    
-    public void drawAllGlyph(Graphics2D g2d, int resolution){
-		Point2D offset4Paint = offset4Paint();
-        g2d.translate(offset4Paint.getX(), offset4Paint.getY());
-        this.axis.drawWithOutAlert(g2d, resolution);
-		g2d.translate(-offset4Paint.getX(), -offset4Paint.getY());
-	};
-    
-    public void goRightPane() {
-        new SetAxisStyleAction(chartComponent).showAxisStylePane();
-    }
-
-    /**
-     * 返回 对应的属性Axis
-     */
-    public Glyph getGlyph() {
-        return this.axis;
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/CategoryAxisActiveGlyph.java

@@ -1,19 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.CategoryAxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:01
- */
-public class CategoryAxisActiveGlyph extends AxisActiveGlyph {
-
-    public CategoryAxisActiveGlyph(ChartComponent chartComponent, CategoryAxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, axis, parentGlyph);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/ChartActiveGlyph.java

@@ -1,39 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.geom.Point2D;
-
-import com.fr.base.chart.BaseChartGlyph;
-import com.fr.base.chart.Glyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetChartStyleAciton;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:54
- */
-public class ChartActiveGlyph extends ActiveGlyph {
-    private BaseChartGlyph glyphChart;
-
-    public ChartActiveGlyph(ChartComponent chartComponent, BaseChartGlyph chart) {
-        this(chartComponent, chart, null);
-    }
-    public ChartActiveGlyph(ChartComponent chartComponent, BaseChartGlyph chart, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.glyphChart = chart;
-    }
-
-    public Glyph getGlyph() {
-        return this.glyphChart;
-    }
-
-    public Point2D offset4Paint() {
-        return new java.awt.Point(0, 0);
-    }
-
-    public void goRightPane() {
-        new SetChartStyleAciton(chartComponent).showChartStylePane();
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/DataLabelActiveGlyph.java

@@ -1,44 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.PlotGlyph;
-import com.fr.chart.chartglyph.TextGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetDataLabelStyleAction;
-
-public class DataLabelActiveGlyph extends ActiveGlyph{
-	private TextGlyph dataLabel;
-	
-	public DataLabelActiveGlyph(ChartComponent chartComponent, TextGlyph dataLabel, Glyph parentGlyph) {
-		super(chartComponent, parentGlyph);
-		this.dataLabel = dataLabel;
-	}
-	
-	public void drawAllGlyph(Graphics2D g2d, int resolution){
-		Point2D offset4Paint = offset4Paint();
-        g2d.translate(offset4Paint.getX(), offset4Paint.getY());
-    	
-        ArrayList<TextGlyph> allDataPointLableGlyph = new ArrayList<TextGlyph>();
-        PlotGlyph plotGlyph = (PlotGlyph)(this.parentGlyph);
-        plotGlyph.getAllDataPointGlyph(allDataPointLableGlyph);
-		for(int index = 0; index < allDataPointLableGlyph.size(); index++){
-			allDataPointLableGlyph.get(index).draw(g2d, resolution);
-		}
-		g2d.translate(-offset4Paint.getX(), -offset4Paint.getY());
-	};
-	
-	@Override
-	public Glyph getGlyph() {
-		return this.dataLabel;
-	}
-
-	@Override
-	public void goRightPane() {
-		new SetDataLabelStyleAction(chartComponent).showDataLabelStylePane();
-    }
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/DataSeriesActiveGlyph.java

@@ -1,53 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Point2D;
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.DataSeries;
-import com.fr.chart.chartglyph.PlotGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:59
- */
-public class DataSeriesActiveGlyph extends ActiveGlyph {
-    private DataSeries series;
-
-    public DataSeriesActiveGlyph(ChartComponent chartComponent, DataSeries series, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.series = series;
-    }
-
-    public Glyph getGlyph() {
-        return this.series;
-    }
-
-    /**
-     * 界面条状
-     */
-    public void goRightPane() {
-    	if(chartComponent.getEditingChart() == null) {
-    		return;
-    	}
-
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE);
-    }
-
-	@Override
-	public void drawAllGlyph(Graphics2D g2d, int resolution) {
-		Point2D offset4Paint = offset4Paint();
-        g2d.translate(offset4Paint.getX(), offset4Paint.getY());
-        if(this.parentGlyph != null && this.parentGlyph instanceof PlotGlyph){
-        	PlotGlyph plotGlyph = (PlotGlyph)this.parentGlyph;
-        	plotGlyph.drawShape4Series(g2d, resolution);
-        }
-        g2d.translate(-offset4Paint.getX(), -offset4Paint.getY());
-	}
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/DataSheetActiveGlyph.java

@@ -1,30 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.DataSheetGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetDataSheetAction;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:57
- */
-public class DataSheetActiveGlyph extends ActiveGlyph {
-    private DataSheetGlyph dataSheetGlyph;
-
-    public DataSheetActiveGlyph(ChartComponent chartComponent, DataSheetGlyph dataSheetGlyph, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.dataSheetGlyph = dataSheetGlyph;
-    }
-
-    public Glyph getGlyph() {
-        return this.dataSheetGlyph;
-    }
-    
-    public void goRightPane() {
-        new SetDataSheetAction(chartComponent).showDataSheetStylePane();
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/DateAxisActiveGlyph.java

@@ -1,18 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.DateAxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:03
- */
-public class DateAxisActiveGlyph extends AxisActiveGlyph {
-    public DateAxisActiveGlyph(ChartComponent chartComponent, DateAxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, axis, parentGlyph);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/LegendActiveGlyph.java

@@ -1,30 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.LegendGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetLegendStyleAction;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:58
- */
-public class LegendActiveGlyph extends ActiveGlyph {
-    private LegendGlyph legendGlyph;
-
-    public LegendActiveGlyph(ChartComponent chartComponent, LegendGlyph legendGlyph, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.legendGlyph = legendGlyph;
-    }
-
-    public Glyph getGlyph() {
-        return this.legendGlyph;
-    }
-    
-    public void goRightPane() {
-        new SetLegendStyleAction(chartComponent).showLegendStylePane();
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/PlotActiveGlyph.java

@@ -1,34 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.PlotGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetPlotStyleAction;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:55
- */
-public class PlotActiveGlyph extends ActiveGlyph {
-    private PlotGlyph plotGlyph;
-
-    public PlotActiveGlyph(ChartComponent chartComponent, PlotGlyph plotGlyph, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.plotGlyph = plotGlyph;
-    }
-
-    public Glyph getGlyph() {
-        return this.plotGlyph;
-    }
-    
-    public void goRightPane() {
-        new SetPlotStyleAction(chartComponent).showPlotPane();
-    }
-
-    public java.awt.Point offset4Paint() {
-        return new java.awt.Point(0, 0);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/RadarAxisActiveGlyph.java

@@ -1,18 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.RadarAxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:03
- */
-public class RadarAxisActiveGlyph extends AxisActiveGlyph {
-    public RadarAxisActiveGlyph(ChartComponent chartComponent, RadarAxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, axis, parentGlyph);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/RangeAxisActiveGlyph.java

@@ -1,18 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.ValueAxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:02
- */
-public class RangeAxisActiveGlyph extends AxisActiveGlyph {
-    public RangeAxisActiveGlyph(ChartComponent chartComponent, ValueAxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, axis, parentGlyph);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/TextActiveGlyph.java

@@ -1,35 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.TitleGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetTitleStyleAction;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午3:57
- */
-public class TextActiveGlyph extends ActiveGlyph {
-    private TitleGlyph titleGlyph;
-
-    public TextActiveGlyph(ChartComponent chartComponent, TitleGlyph titleGlyph, Glyph parentGlyph) {
-        super(chartComponent, parentGlyph);
-        this.titleGlyph = titleGlyph;
-    }
-
-    public Glyph getGlyph() {
-        return this.titleGlyph;
-    }
-
-    public java.awt.Point offset4Paint() {
-        return new java.awt.Point(0, 0);
-    }
-    
-    public void goRightPane() {
-        new SetTitleStyleAction(chartComponent).showTitlePane();
-    }
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/TrendLineActiveGlyph.java

@@ -1,43 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import java.awt.Graphics2D;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.PlotGlyph;
-import com.fr.chart.chartglyph.TrendLineGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.chart.gui.active.action.SetAnalysisLineStyleAction;
-
-public class TrendLineActiveGlyph extends ActiveGlyph{
-	private TrendLineGlyph trendLine;
-	public TrendLineActiveGlyph(ChartComponent chartComponent,TrendLineGlyph trendLine, Glyph parentGlyph) {
-		super(chartComponent, parentGlyph);
-		this.trendLine = trendLine;
-	}
-
-	@Override
-	public Glyph getGlyph() {
-		return this.trendLine;
-	}
-	
-	public void drawAllGlyph(Graphics2D g2d, int resolution){
-		Point2D offset4Paint = offset4Paint();
-        g2d.translate(offset4Paint.getX(), offset4Paint.getY());
-        PlotGlyph plotGlyph = (PlotGlyph)this.parentGlyph;
-		List<TrendLineGlyph> list = new ArrayList<TrendLineGlyph>();
-		plotGlyph.getAllTrendLineGlyph(list);
-		for(int index = 0; index < list.size(); index++){
-			list.get(index).draw(g2d, resolution);
-		}
-		g2d.translate(-offset4Paint.getX(), -offset4Paint.getY());
-	};
-
-	@Override
-	public void goRightPane() {
-		new SetAnalysisLineStyleAction(chartComponent).showAnalysisLineStylePane();
-	}
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/ValueAxisActiveGlyph.java

@@ -1,19 +0,0 @@
-package com.fr.design.chart.gui.active;
-
-import com.fr.base.chart.Glyph;
-import com.fr.chart.chartglyph.ValueAxisGlyph;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:02
- */
-public class ValueAxisActiveGlyph extends AxisActiveGlyph {
-
-    public ValueAxisActiveGlyph(ChartComponent chartComponent, ValueAxisGlyph axis, Glyph parentGlyph) {
-        super(chartComponent, axis, parentGlyph);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/ChartComponentAction.java

@@ -1,37 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartglyph.AxisGlyph;
-import com.fr.design.actions.UpdateAction;
-import com.fr.design.chart.gui.ChartComponent;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午5:05
- */
-public abstract class ChartComponentAction extends UpdateAction {
-    protected ChartComponent chartComponent;
-
-    public ChartComponentAction(ChartComponent chartComponent) {
-        this.chartComponent = chartComponent;
-    }
-
-    public void reset() {
-        chartComponent.reset();
-    }
-
-    public void repaint() {
-        chartComponent.repaint();
-    }
-
-    public ChartCollection getChartCollection() {
-        return chartComponent.getChartCollection();
-    }
-
-    public AxisGlyph getActiveAxisGlyph() {
-        return chartComponent.getActiveAxisGlyph();
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java

@@ -1,27 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-public class SetAnalysisLineStyleAction extends ChartComponentAction{
-
-	public SetAnalysisLineStyleAction(ChartComponent chartComponent) {
-		super(chartComponent);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Analysis_Line"));
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent e) {
-		showAnalysisLineStylePane();
-	}
-	
-	public void showAnalysisLineStylePane(){
-		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LINE_TITLE);
-	}
-	
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java

@@ -1,33 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-import com.fr.stable.StringUtils;
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午5:10
- */
-public class SetAxisStyleAction extends ChartComponentAction {
-    public SetAxisStyleAction(ChartComponent chartComponent) {
-        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Axis_Format"));
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        showAxisStylePane();
-    }
-
-    public void showAxisStylePane() {
-        String axisType = getActiveAxisGlyph() == null ? StringUtils.EMPTY : getActiveAxisGlyph().getAxisType();
-
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AXIS_TITLE, axisType);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java

@@ -1,31 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午5:00
- */
-public class SetChartStyleAciton extends ChartComponentAction {
-
-    public SetChartStyleAciton(ChartComponent chartComponent) {
-        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"));
-    }
-
-    public void actionPerformed(ActionEvent e) {
-         showChartStylePane();
-    }
-
-    public void showChartStylePane() {
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_AREA_TITLE);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java

@@ -1,26 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-public class SetDataLabelStyleAction extends ChartComponentAction{
-
-	public SetDataLabelStyleAction(ChartComponent chartComponent) {
-		super(chartComponent);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Data_Label"));
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent e) {
-		showDataLabelStylePane();
-	}
-	
-	public void showDataLabelStylePane() {
-		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LABEL_TITLE);
-    }
-
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java

@@ -1,33 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:49
- */
-public class SetDataSheetAction extends ChartComponentAction {
-
-    private static final long serialVersionUID = -4763886493273213850L;
-
-    public SetDataSheetAction(ChartComponent chartComponent) {
-        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Data_Sheet"));
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        showDataSheetStylePane();
-    }
-
-    public void showDataSheetStylePane() {
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_DATA_TITLE);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java

@@ -1,32 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:56
- */
-public class SetLegendStyleAction extends ChartComponentAction {
-    private static final long serialVersionUID = 3253190503195130478L;
-
-    public SetLegendStyleAction(ChartComponent chartComponent) {
-        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Legend_Sytle"));
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        showLegendStylePane();
-    }
-
-    public void showLegendStylePane() {
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LEGNED_TITLE);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java

@@ -1,32 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:58
- */
-public class SetPlotStyleAction extends ChartComponentAction {
-    private static final long serialVersionUID = 2894127568015714372L;
-
-    public SetPlotStyleAction(ChartComponent chartComponent) {
-        super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Plot"));
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        showPlotPane();
-    }
-
-    public void showPlotPane() {
-        DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_AREA_TITLE, PaneTitleConstants.CHART_STYLE_AREA_PLOT_TITLE);
-    }
-}

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java

@@ -1,32 +0,0 @@
-package com.fr.design.chart.gui.active.action;
-
-import java.awt.event.ActionEvent;
-
-import com.fr.design.chart.gui.ChartComponent;
-import com.fr.design.mainframe.chart.PaneTitleConstants;
-import com.fr.design.module.DesignModuleFactory;
-
-
-/**
- * Created by IntelliJ IDEA.
- * Author : Richer
- * Version: 6.5.6
- * Date   : 11-11-22
- * Time   : 下午4:52
- */
-public class SetTitleStyleAction extends ChartComponentAction {
-	private static final long serialVersionUID = -4763886493273213850L;
-
-	public SetTitleStyleAction(ChartComponent chartComponent) {
-		super(chartComponent);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Title_Style"));
-	}
-
-	public void actionPerformed(ActionEvent e) {
-		showTitlePane();
-	}
-
-	public void showTitlePane() {
-		DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_TITLE_TITLE);
-	}
-}

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java

@@ -245,7 +245,11 @@ public class MapImageEditPane extends BasicBeanPane<String> {
 
 			g2d.translate(moveLeft, moveTop);
 			g2d.setStroke(new BasicStroke(1));
-			if (resultAreaShape != null && !resultAreaShape.isEmpty()) {
+
+			if (resultAreaShape == null) {
+				throw new IllegalArgumentException("resultAreaShape can not be null!");
+			}
+			if (!resultAreaShape.isEmpty()) {
 				for (String key : resultAreaShape.keySet()) {
 
 					GeneralPath selectShape = getSelectedNodePath(key);

designer-chart/src/main/java/com/fr/design/chartx/StructureChartDataPane.java

@@ -0,0 +1,23 @@
+package com.fr.design.chartx;
+
+import com.fr.design.chartx.fields.diff.StructureCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.StructureDataSetFieldsPane;
+import com.fr.design.chartx.single.SingleDataPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2019-09-02
+ */
+public class StructureChartDataPane extends MultiCategoryChartDataPane {
+
+    public StructureChartDataPane(AttributeChangeListener listener) {
+        super(listener);
+    }
+
+    @Override
+    protected SingleDataPane createSingleDataPane() {
+        return new SingleDataPane(new StructureDataSetFieldsPane(), new StructureCellDataFieldsPane());
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/StructureCellDataFieldsPane.java

@@ -0,0 +1,86 @@
+package com.fr.design.chartx.fields.diff;
+
+import com.fr.chartx.data.field.diff.StructureColumnFieldCollection;
+import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
+import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2019-09-02
+ */
+public class StructureCellDataFieldsPane extends AbstractCellDataFieldsPane<StructureColumnFieldCollection> {
+
+    private TinyFormulaPane nodeName;
+    private TinyFormulaPane nodeId;
+    private TinyFormulaPane parentId;
+    private UITextField seriesName;
+    private TinyFormulaPane nodeValue;
+
+    @Override
+    protected void initComponents() {
+        seriesName = new UITextField();
+        nodeName = new TinyFormulaPane();
+        nodeId = new TinyFormulaPane();
+        parentId = new TinyFormulaPane();
+        nodeValue = new TinyFormulaPane();
+
+        super.initComponents();
+    }
+
+    @Override
+    protected String[] fieldLabels() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Node_Name"),
+                "id",
+                Toolkit.i18nText("Fine-Design_Chart_Parent_ID"),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Value"),
+        };
+    }
+
+    @Override
+    protected TinyFormulaPane[] formulaPanes() {
+        return new TinyFormulaPane[]{
+                nodeName,
+                nodeId,
+                parentId,
+                nodeValue
+        };
+    }
+
+    @Override
+    protected Component[] fieldComponents() {
+        return new Component[]{
+                nodeName,
+                nodeId,
+                parentId,
+                nodeValue,
+                nodeValue,
+        };
+    }
+
+    @Override
+    public void populateBean(StructureColumnFieldCollection ob) {
+        seriesName.setText(ob.getSeriesName());
+        populateField(nodeName, ob.getNodeName());
+        populateField(nodeId, ob.getNodeId());
+        populateField(parentId, ob.getParentId());
+        populateField(nodeValue, ob.getNodeValue());
+    }
+
+    @Override
+    public StructureColumnFieldCollection updateBean() {
+        StructureColumnFieldCollection result = new StructureColumnFieldCollection();
+        result.setSeriesName(seriesName.getText());
+        updateField(nodeName, result.getNodeName());
+        updateField(nodeId, result.getNodeId());
+        updateField(parentId, result.getParentId());
+        updateField(nodeValue, result.getNodeValue());
+        return result;
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/StructureDataSetFieldsPane.java

@@ -0,0 +1,91 @@
+package com.fr.design.chartx.fields.diff;
+
+import com.fr.chartx.data.field.diff.StructureColumnFieldCollection;
+import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2019-09-02
+ */
+public class StructureDataSetFieldsPane extends AbstractDataSetFieldsPane<StructureColumnFieldCollection> {
+
+    private UIComboBox nodeName;
+    private UIComboBox nodeId;
+    private UIComboBox parentId;
+    private UITextField seriesName;
+    private UIComboBox nodeValue;
+    private CalculateComboBox calculateCombox;
+
+    @Override
+    protected void initComponents() {
+        nodeName = new UIComboBox();
+        nodeId = new UIComboBox();
+        parentId = new UIComboBox();
+        seriesName = new UITextField();
+        nodeValue = new UIComboBox();
+        calculateCombox = new CalculateComboBox();
+
+        super.initComponents();
+    }
+
+    @Override
+    protected String[] fieldLabels() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Node_Name"),
+                "id",
+                Toolkit.i18nText("Fine-Design_Chart_Parent_ID"),
+                Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"),
+                Toolkit.i18nText("Fine-Design_Chart_Series_Value"),
+                Toolkit.i18nText("Fine-Design_Chart_Summary_Method")
+        };
+    }
+
+    @Override
+    protected UIComboBox[] filedComboBoxes() {
+        return new UIComboBox[]{
+                nodeName,
+                nodeId,
+                parentId,
+                nodeValue
+        };
+    }
+
+    @Override
+    protected Component[] fieldComponents() {
+        return new Component[]{
+                nodeName,
+                nodeId,
+                parentId,
+                nodeValue,
+                nodeValue,
+                calculateCombox
+        };
+    }
+
+    @Override
+    public void populateBean(StructureColumnFieldCollection ob) {
+        seriesName.setText(ob.getSeriesName());
+        populateField(nodeName, ob.getNodeName());
+        populateField(nodeId, ob.getNodeId());
+        populateField(parentId, ob.getParentId());
+        populateFunctionField(nodeValue, calculateCombox, ob.getNodeValue());
+    }
+
+    @Override
+    public StructureColumnFieldCollection updateBean() {
+        StructureColumnFieldCollection result = new StructureColumnFieldCollection();
+        result.setSeriesName(seriesName.getText());
+        updateField(nodeName, result.getNodeName());
+        updateField(nodeId, result.getNodeId());
+        updateField(parentId, result.getParentId());
+        updateFunctionField(nodeValue, calculateCombox, result.getNodeValue());
+        return result;
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/WordCloudCellDataFieldsPane.java

@@ -64,7 +64,7 @@ public class WordCloudCellDataFieldsPane extends AbstractCellDataFieldsPane<Word
         WordCloudColumnFieldCollection result = new WordCloudColumnFieldCollection();
         result.setTargetName(name.getText());
         updateField(wordName, result.getWordName());
-        populateField(wordValue, result.getWordValue());
+        updateField(wordValue, result.getWordValue());
         return result;
     }
 }

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

@@ -96,15 +96,6 @@ public class MapEditPane extends BasicBeanPane<MapSvgAttr>{
 
     }
 
-    /**
-   	 * 再图片面板设置类型和名字
-   	 * @param mapType 地图类型
-   	 */
-    public void dealWidthMap(String mapType){
-        areaPane.setTypeNameAndMapName(mapType,currentMapName);
-//        pointPane.setTypeNameAndMapName(mapType,currentMapName);
-   	}
-
     @Override
     public MapSvgAttr updateBean() {
         MapSvgAttr currentAttr = editingPane.updateCurrentAttr();

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

@@ -56,7 +56,10 @@ public class ChartDataPane extends AbstractChartAttrPane {
 		}
 		
 		this.setLayout(new BorderLayout(0, 0));
-		if (collection != null && collection.getChartCount() <= 0) {
+		if (collection == null) {
+			throw new IllegalArgumentException("ChartCollection can not be null!");
+		}
+		if (collection.getChartCount() <= 0) {
 			contentsPane = new NormalChartDataPane(listener, ChartDataPane.this);
 		} else if (collection.getSelectedChart().getPlot() instanceof MapPlot) {
 			contentsPane = new MapDataPane(listener);

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

@@ -114,7 +114,9 @@ public class AreaPlotPane extends AbstractDeprecatedChartTypePane {
             ((Area3DPlot)plot).setStacked(true);
             ((Area3DPlot)plot).getyAxis().setPercentage(true);
         }
+        if(plot != null) {
 			createAreaCondition(plot);
+		}
         return plot;
     }
 

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

@@ -97,11 +97,13 @@ public class BarPlotPane extends AbstractBarPane{
         }
 
         Plot cloned = null;
+        if(newPlot != null) {
             try {
                 cloned = (Plot) newPlot.clone();
             } catch (CloneNotSupportedException e) {
                 FineLoggerFactory.getLogger().error("Error In ColumnChart");
             }
+        }
         return cloned;
     }