Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into feature/10.0

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);
-            templateDataMap = this.init().get(0);
+        serverDataMap = this.init().get(1);
-            serverDataMap = this.init().get(1);
+        storeProcedureMap = this.init().get(2);
-            storeProcedureMap = this.init().get(2);
+
-        } else {
+        //所有的数据集
-            templateDataMap = Collections.emptyMap();
+        List<ExpandMutableTreeNode> list = new ArrayList<>();
-            serverDataMap = Collections.emptyMap();
+        //模板数据集
-            storeProcedureMap = Collections.emptyMap();
+        List<ExpandMutableTreeNode> templist = new ArrayList<>();
-        }
+        //服务器数据集
-        List<ExpandMutableTreeNode> list = new ArrayList<ExpandMutableTreeNode>(); //所有的数据集
+        List<ExpandMutableTreeNode> serverlist = new ArrayList<>();
-        List<ExpandMutableTreeNode> templist = new ArrayList<ExpandMutableTreeNode>(); //模板数据集
-        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;
@@ -126,12 +127,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     private static final int GAP = 23;
 
 
-    public FileTableDataPane(){
+    public FileTableDataPane() {
-        this(SETPANELWIDTH,WIDTH,HEIGHT,GAP);
+        this(SETPANELWIDTH, WIDTH, HEIGHT, GAP);
     }
 
-    public FileTableDataPane(int setPanelWidth,int width,int height,int gap) {
+    public FileTableDataPane(int setPanelWidth, int width, int height, int gap) {
-        this.setLayout(new BorderLayout(gap,0));
+        this.setLayout(new BorderLayout(gap, 0));
         JPanel northPanel = new JPanel(new BorderLayout());
         JPanel type = new JPanel();
         type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"));
@@ -163,16 +164,16 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         southPanel.add(setPanel, BorderLayout.CENTER);
         setPanel.setPreferredSize(new Dimension(setPanelWidth, 460));
         setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
-        JPanel controlPane = textSetPanel(width,height);
+        JPanel controlPane = textSetPanel(width, height);
         setPanel.add(controlPane, BorderLayout.NORTH);
-        fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height));
+        fileTypeComboBox.addActionListener(getFileTypeListener(setPanel, width, height));
 
         this.add(northPanel, BorderLayout.NORTH);
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(southPanel, BorderLayout.EAST);
     }
 
-    private void addToCenterPanel(JPanel centerPanel){
+    private void addToCenterPanel(JPanel centerPanel) {
         localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_File") + ":", true);
         urlFileRadioButton = new UIRadioButton("URL:", false);
         ButtonGroup bg = new ButtonGroup();
@@ -217,8 +218,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private ActionListener testConnectionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent arg0) {
-            String uri = ParameterHelper.analyze4Templatee( urlText.getText(), params);
+            String uri = ParameterHelper.analyze4Templatee(urlText.getText(), params);
             if (!checkURL(uri)) {
                 JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning"));
                 return;
@@ -245,10 +247,11 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
     };
 
-    private void previewPanel(JPanel jPanel){
+    private void previewPanel(JPanel jPanel) {
         JPanel previewPanel = new JPanel(new BorderLayout());
         UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
         preview.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 preview();
             }
@@ -257,48 +260,47 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         jPanel.add(previewPanel, BorderLayout.SOUTH);
     }
 
-    private JPanel xmlSetPanel(int width,int height) {
+    private JPanel xmlSetPanel(int width, int height) {
         // xml设置pane
         JPanel controlPane = new JPanel();
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
-        JPanel northTopPane = new JPanel(new BorderLayout(8,8));
+        JPanel northTopPane = new JPanel(new BorderLayout(8, 8));
-        JPanel southPane = new JPanel(new BorderLayout(8,8));
+        JPanel southPane = new JPanel(new BorderLayout(8, 8));
-        JPanel southTopPane = 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.setLayout(new BorderLayout(8,8));
         controlPane.setPreferredSize(new Dimension(width, height));
-        JPanel comboboxPanel = new JPanel(new BorderLayout(8,8));
+        JPanel comboboxPanel = new JPanel(new BorderLayout(8, 8));
         encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         encodingComboBox.setSelectedIndex(4);
         encodingComboBox.setPreferredSize(new Dimension(90, 20));
 
         JPanel treeContainerPane = new JPanel();
-        treeContainerPane.setLayout(new BorderLayout(8,8));
+        treeContainerPane.setLayout(new BorderLayout(8, 8));
         nodeTreePane = new XMLNodeTreePane();
-        treeContainerPane.add(nodeTreePane,BorderLayout.CENTER);
+        treeContainerPane.add(nodeTreePane, BorderLayout.CENTER);
 
 
         comboboxPanel.add(encodeLabel, BorderLayout.WEST);
         comboboxPanel.add(encodingComboBox, BorderLayout.CENTER);
 
-        northPane.add(comboboxPanel,BorderLayout.EAST);
+        northPane.add(comboboxPanel, BorderLayout.EAST);
-        northTopPane.add(northPane,BorderLayout.WEST);
+        northTopPane.add(northPane, BorderLayout.WEST);
-        southTopPane.add(southPane,BorderLayout.WEST);
+        southTopPane.add(southPane, BorderLayout.WEST);
-        southTopPane.add(treeContainerPane,BorderLayout.CENTER);
+        southTopPane.add(treeContainerPane, BorderLayout.CENTER);
         controlPane.add(northTopPane, BorderLayout.NORTH);
-        controlPane.add(southTopPane,BorderLayout.CENTER);
+        controlPane.add(southTopPane, BorderLayout.CENTER);
         previewPanel(controlPane);
         return controlPane;
     }
 
-    private JPanel excelSetPanel(int width,int height) {
+    private JPanel excelSetPanel(int width, int height) {
         // excel设置pane
         int checkBoxWidth = width - EIGHT;
         JPanel controlPane = new JPanel();
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
         controlPane.setLayout(new BorderLayout());
-        controlPane.setPreferredSize(new Dimension(width,height));
+        controlPane.setPreferredSize(new Dimension(width, height));
         needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), false);
         needColumnNameCheckBox.setPreferredSize(new Dimension(checkBoxWidth, 20));
         northPane.add(needColumnNameCheckBox, BorderLayout.EAST);
@@ -321,6 +323,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
      *
      * @throws Exception
      */
+    @Override
     public void checkValid() throws Exception {
         if (urlFileRadioButton.isSelected()) {
             String url = urlText.getText().trim();
@@ -331,33 +334,33 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     }
 
-    private boolean checkURL(String uri){
+    private boolean checkURL(String uri) {
         try {
             new URL(uri);
             return true;
         } catch (MalformedURLException e) {
             return false;
         }
-       // return (uri.matches("https*://.+|\\$\\{.+\\}.*"));
+        // return (uri.matches("https*://.+|\\$\\{.+\\}.*"));
     }
 
-    private JPanel textSetPanel(int width,int height) {
+    private JPanel textSetPanel(int width, int height) {
         // text设置pane
         JPanel controlPane = new JPanel();
         controlPane.setLayout(new BorderLayout());
-        controlPane.setPreferredSize(new Dimension(width,height));
+        controlPane.setPreferredSize(new Dimension(width, height));
-        JPanel northPane = new JPanel(new BorderLayout(8,8));
+        JPanel northPane = new JPanel(new BorderLayout(8, 8));
         addToNorthPane(northPane);
-        controlPane.add(northPane,BorderLayout.WEST);
+        controlPane.add(northPane, BorderLayout.WEST);
         previewPanel(controlPane);
         return controlPane;
     }
 
-    private void addToNorthPane(JPanel northPane){
+    private void addToNorthPane(JPanel northPane) {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double columnSize[] = {f, p, p};
+        double[] 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);
@@ -390,18 +393,19 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Encoding_Type") + ":");
         charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         Component[][] comps = {
-                {encodeLabel,charsetComboBox,null},
+                {encodeLabel, charsetComboBox, null},
-                {needColumnNameCheckBox,null,null},
+                {needColumnNameCheckBox, null, null},
-                {dismenberLabel,tableDismemberRadioButton,null},
+                {dismenberLabel, tableDismemberRadioButton, null},
-                {null,spaceDismenberRadioButton,null},
+                {null, spaceDismenberRadioButton, null},
-                {null,commaDismenberRadioButton,null},
+                {null, commaDismenberRadioButton, null},
-                {null,otherDismenberRadioButton,otherDismenberTextField},
+                {null, otherDismenberRadioButton, otherDismenberTextField},
-                {ignoreOneMoreDelimiterCheckBox,null,null}
+                {ignoreOneMoreDelimiterCheckBox, null, null}
         };
-        northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize),BorderLayout.EAST);
+        northPane.add(TableLayoutHelper.createTableLayoutPane(comps, rowSize, columnSize), BorderLayout.EAST);
     }
 
     private ActionListener radioActionListener = new ActionListener() {
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (localFileRadioButton.isSelected()) {
                 localRadioSelectAction();
@@ -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,16 +480,17 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     private ActionListener getFileTypeListener(final JPanel setPanel, final int width, final int height) {
         ActionListener fileTypeListener = new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 setPanel.removeAll();
                 localText.setText("");
                 urlText.setText("");
                 if (fileTypeComboBox.getSelectedIndex() == XML) {
-                    setPanel.add(xmlSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(xmlSetPanel(width, height), BorderLayout.NORTH);
                 } else if (fileTypeComboBox.getSelectedIndex() == EXCEL) {
-                    setPanel.add(excelSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(excelSetPanel(width, height), BorderLayout.NORTH);
                 } else {
-                    setPanel.add(textSetPanel(width,height), BorderLayout.NORTH);
+                    setPanel.add(textSetPanel(width, height), BorderLayout.NORTH);
                 }
                 String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "<br>"
                         + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp<br>" + "&nbsp</body> </html> ";
@@ -503,6 +508,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             String[] paramTexts = new String[1];
             paramTexts[0] = getFilePathFromUrlOrLocal();
@@ -545,25 +551,25 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         setTextField(xtd);
         editorPane.populate(xtd.getParams());
         encodingComboBox.setSelectedItem(xtd.getCharSet());
-        if (!ComparatorUtils.equals(xtd,new XMLTableData())) {
+        if (!ComparatorUtils.equals(xtd, new XMLTableData())) {
             xmlNodeTree.initData();
             String[] path = xtd.getXPath();
             String[] paths;
             if (path != null && path.length > 0) {
-                DefaultTreeModel treeModel = (DefaultTreeModel)xmlNodeTree.getModel();
+                DefaultTreeModel treeModel = (DefaultTreeModel) xmlNodeTree.getModel();
                 ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
                 if (treeModel != null) {
-                    if(!ComparatorUtils.equals(treeModel.getRoot().toString(),"")){
+                    if (!ComparatorUtils.equals(treeModel.getRoot().toString(), "")) {
-                       paths = new String[path.length - 1];
+                        paths = new String[path.length - 1];
-                       for(int i = 1;i< path.length;i++){
+                        for (int i = 1; i < path.length; i++) {
-                           paths[i -1] = path[i];
+                            paths[i - 1] = path[i];
-                       }
+                        }
-                    }else{
+                    } else {
                         paths = path;
                         root.setUserObject(ROOTTAG);
                     }
                     if (treeModel.getRoot() instanceof ExpandMutableTreeNode) {
-                        selectNode((ExpandMutableTreeNode)treeModel.getRoot(), 0, paths);
+                        selectNode((ExpandMutableTreeNode) treeModel.getRoot(), 0, paths);
                         if (selectedNode != null) {
                             TreePath treepath = new TreePath(treeModel.getPathToRoot(selectedNode));
                             xmlNodeTree.setSelectionPath(treepath);
@@ -571,8 +577,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                         }
                     }
                     //防止某种操作导致添加的tag作为root出现。
-                    if(ComparatorUtils.equals(root.toString(),ROOTTAG)){
+                    if (ComparatorUtils.equals(root.toString(), ROOTTAG)) {
-                            root.setUserObject(StringUtils.EMPTY);
+                        root.setUserObject(StringUtils.EMPTY);
                     }
                 }
             }
@@ -638,7 +644,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         ttd.setDelimiter(this.showDelimiter());
         ttd.setIgnoreOneMoreDelimiter(ignoreOneMoreDelimiterCheckBox.isSelected());
         ttd.setNeedColumnName(needColumnNameCheckBox.isSelected());
-        ttd.setCharset((String)charsetComboBox.getSelectedItem());
+        ttd.setCharset((String) charsetComboBox.getSelectedItem());
         fileTableData = ttd;
         return ttd;
     }
@@ -667,12 +673,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             xmlColumnsList.clear();
             ExpandMutableTreeNode treeNode;
             boolean flag = true;
-            for(int i = 0;i < selectedNode.getChildCount();i++){
+            for (int i = 0; i < selectedNode.getChildCount(); i++) {
                 treeNode = (ExpandMutableTreeNode) selectedNode.getChildAt(i);
-                if(treeNode.isLeaf()){
+                if (treeNode.isLeaf()) {
                     xmlColumnsList.add(treeNode.toString());
-                }else{
+                } else {
-                    if(flag){
+                    if (flag) {
                         flag = false;
                         finalSelectedNode = treeNode;
                         leafNode(treeNode);
@@ -692,34 +698,34 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     //wikky:构建树时为了美观把添加的根节点值赋为空显示，现在还得该回去使得预览时能够顺利取到数据。
-    private String[] getPaths(){
+    private String[] getPaths() {
         TreePath treePath = GUICoreUtils.getTreePath(finalSelectedNode);
         String path = StringUtils.EMPTY;
         if (treePath != null) {
             Object[] paths = treePath.getPath();
             for (int i = 0; i < paths.length; i++) {
-                path+="/" + paths[i];
+                path += "/" + paths[i];
             }
         }
         if (path.startsWith("/")) {
             path = path.substring(1);
         }
         String[] paths = path.split("/");
-        if(ComparatorUtils.equals(paths[0],StringUtils.EMPTY)){
+        if (ComparatorUtils.equals(paths[0], StringUtils.EMPTY)) {
             paths[0] = ROOTTAG;
         }
         return paths;
     }
 
-    private void leafNode(ExpandMutableTreeNode treeNode){
+    private void leafNode(ExpandMutableTreeNode treeNode) {
         boolean flag = true;
         ExpandMutableTreeNode firstNode;
-        for(int i = 0;i < treeNode.getChildCount();i++){
+        for (int i = 0; i < treeNode.getChildCount(); i++) {
             firstNode = (ExpandMutableTreeNode) treeNode.getChildAt(i);
-            if(firstNode.isLeaf()){
+            if (firstNode.isLeaf()) {
                 xmlColumnsList.add(firstNode.toString());
-            }else{
+            } else {
-                if(flag){
+                if (flag) {
                     flag = false;
                     finalSelectedNode = treeNode;
                     leafNode(firstNode);
@@ -729,16 +735,16 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
     }
 
     private void selectNode(ExpandMutableTreeNode node, int layer, String[] paths) {
-        if (selectedNode != null || node == null){
+        if (selectedNode != null || node == null) {
             return;
         }
-        if (layer < paths.length && paths[layer] != null && ComparatorUtils.equals(paths[layer],node.getUserObject())) {
+        if (layer < paths.length && paths[layer] != null && ComparatorUtils.equals(paths[layer], node.getUserObject())) {
-            if (layer == paths.length -1) {
+            if (layer == paths.length - 1) {
                 selectedNode = node;
                 return;
             }
             for (int i = 0; i < node.getChildCount(); i++) {
-                selectNode((ExpandMutableTreeNode)node.getChildAt(i), layer + 1, paths);
+                selectNode((ExpandMutableTreeNode) node.getChildAt(i), layer + 1, paths);
             }
         }
     }
@@ -800,8 +806,8 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             toolbarDef.addShortCut(refreshAction);
             UIToolbar toolBar = ToolBarDef.createJToolBar();
             toolbarDef.updateToolBar(toolBar);
-            toolbarPanel.add(keyPointLaber,BorderLayout.WEST);
+            toolbarPanel.add(keyPointLaber, BorderLayout.WEST);
-            toolbarPanel.add(toolBar,BorderLayout.EAST);
+            toolbarPanel.add(toolBar, BorderLayout.EAST);
             this.add(toolbarPanel, BorderLayout.NORTH);
         }
 
@@ -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,8 +852,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
         }
 
         private MouseListener treeMouseListener = new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent e) {
-                if (XMLNodeTree.this.getModel() != treeModel){
+                if (XMLNodeTree.this.getModel() != treeModel) {
                     return;
                 }
                 int selRow = XMLNodeTree.this.getRowForLocation(e.getX(), e.getY());
@@ -858,12 +866,12 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                     return;//没有选中某个树节点，就直接返回啦
                 }
                 Object selObject = selPath.getLastPathComponent();
-                if (selObject instanceof ExpandMutableTreeNode ) {
+                if (selObject instanceof ExpandMutableTreeNode) {
                     ExpandMutableTreeNode expandMutableTreeNode = (ExpandMutableTreeNode) selObject;
                     if (!expandMutableTreeNode.isLeaf()) {
                         selectedNode = expandMutableTreeNode;
                     } else {
-                        selectedNode = (ExpandMutableTreeNode)expandMutableTreeNode.getParent();
+                        selectedNode = (ExpandMutableTreeNode) expandMutableTreeNode.getParent();
                     }
                 }
             }
@@ -906,7 +914,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             DataSource dataSource = null;
             if (localFileRadioButton.isSelected()) {
                 String localTextString = StringUtils.trimToNull(localText.getText());
-                if(StringUtils.isEmpty(localTextString)){
+                if (StringUtils.isEmpty(localTextString)) {
                     FineLoggerFactory.getLogger().info("The file path is empty.");
                     loadedTreeModel();
                     return;
@@ -914,7 +922,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 dataSource = new FileDataSource(localTextString, params);
             } else {
                 String urlTextString = StringUtils.trimToNull(urlText.getText());
-                if (StringUtils.isEmpty(urlTextString)){
+                if (StringUtils.isEmpty(urlTextString)) {
                     FineLoggerFactory.getLogger().info("The url path is empty.");
                     loadedTreeModel();
                     return;
@@ -922,7 +930,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 dataSource = new URLDataSource(urlTextString, params);
             }
             try {
-                InputStream in,input;
+                InputStream in, input;
                 if ((in = dataSource.getSourceStream(params)) != null) {
                     String xmlString = Utils.inputStream2String(in, (String) encodingComboBox.getSelectedItem());
                     String stringXml = addTag(xmlString);
@@ -941,16 +949,20 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 loadedTreeModel();
             }
-            if(treeModel.getChildCount(treeModel.getRoot()) == 1){
+            if (treeModel == null) {
-                treeModel = new DefaultTreeModel((ExpandMutableTreeNode) treeModel.getChild(treeModel.getRoot(),0));
+                FineLoggerFactory.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
-            }else{
+                return;
+            }
+            if (treeModel.getChildCount(treeModel.getRoot()) == 1) {
+                treeModel = new DefaultTreeModel((ExpandMutableTreeNode) treeModel.getChild(treeModel.getRoot(), 0));
+            } else {
                 ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot();
                 root.setUserObject(StringUtils.EMPTY);
             }
             this.setModel(treeModel);
         }
 
-        private void loadedTreeModel(){
+        private void loadedTreeModel() {
             ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loaded_Tree_Model"));
             rootTreeNode.setExpanded(false);
             rootTreeNode.setAllowsChildren(false);
@@ -958,14 +970,14 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             XMLNodeTree.this.setModel(loadedTreeModel);
         }
 
-        private String addTag(String string){
+        private String addTag(String string) {
             String stringWithTag;
             int beginIndex = 0;
             int firstIndex = string.indexOf(">");
             int endIndex = string.length();
-            String firstPart = string.substring(beginIndex,firstIndex + 1);
+            String firstPart = string.substring(beginIndex, firstIndex + 1);
             String secondPart = STARTTAG;
-            String thirdPart = string.substring(firstIndex + 1,endIndex);
+            String thirdPart = string.substring(firstIndex + 1, endIndex);
             String lastPart = ENDTAG;
             stringWithTag = firstPart + secondPart + thirdPart + lastPart;
             return stringWithTag;
@@ -986,6 +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/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/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/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/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);
-            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) {
+                return false;
-                if (column == 0) {
-                    return false;
-                } else {
-                    return false;
-                }
-            } else {
-                return column == 1 && group.getModel().isEditable(pIndex.y - 1);
             }
+            PropertyGroup group = groups.get(pIndex.x);
+            return pIndex.y != 0 && (column == 1 && group.getModel().isEditable(pIndex.y - 1));
         }
     }
 }

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

@@ -1351,6 +1351,11 @@ System.err.println(">>> >>> calculated number of lines for this view (line " + l
 
 							// Start at alloc.x since this chunk starts
 							// at the beginning of a physical line.
+							if (tlist == null) {
+								p0 = (p == p0) ? p1 : p;
+								alloc.y += alloc.height;
+								continue;
+							}
 							int n = tlist.getListOffset(textArea,
 										WrappedSyntaxView.this,
 										alloc.x, x);

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/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/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/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/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);
         }
-        createAreaCondition(plot);
+        if(plot != null) {
+			createAreaCondition(plot);
+		}
         return plot;
     }
 

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

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

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

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

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

@@ -66,10 +66,12 @@ public class MeterPlotPane extends AbstractDeprecatedChartTypePane {
         }
 
         Plot cloned = null;
-        try {
+        if(newPlot != null) {
-            cloned = (Plot)newPlot.clone();
+            try {
-        } catch (CloneNotSupportedException e) {
+                cloned = (Plot) newPlot.clone();
-            FineLoggerFactory.getLogger().error("Error In ColumnChart");
+            } catch (CloneNotSupportedException e) {
+                FineLoggerFactory.getLogger().error("Error In ColumnChart");
+            }
         }
         return cloned;
     }

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java

@@ -68,10 +68,12 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
             }
         }
         Plot cloned = null;
-        try {
+        if(newPlot != null) {
-            cloned = (Plot) newPlot.clone();
+            try {
-        } catch (CloneNotSupportedException e) {
+                cloned = (Plot) newPlot.clone();
-            FineLoggerFactory.getLogger().error("Error In AreaChart");
+            } catch (CloneNotSupportedException e) {
+                FineLoggerFactory.getLogger().error("Error In AreaChart");
+            }
         }
         return cloned;
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@@ -168,6 +168,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
                 break;
             case "allowFullCheckBox":
                 ((ElementCaseEditor) xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected());
+                break;
             case "functionalWhenUnactivatedCheckBox":
                 ((ElementCaseEditor) xCreator.toData()).setFunctionalWhenUnactivated(functionalWhenUnactivatedCheckBox.isSelected());
         }