Merge pull request #1045 in DESIGN/design from ~VITO/d-design:feature/10.0 to feature/10.0

* commit '518cd187764bd83d2b9786dc57ca172b0197c452':
  REPORT-20320 sonar问题修复

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/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");
     }