Merge pull request #556 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0

* commit '80279fe9539c4dc8012a9a13062aec1abe22a45b':
  REPORT-11690 【集群】【远程设计】添加服务器数据集异常

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

@@ -1,7 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.data.core.db.TableProcedure;
@@ -35,17 +34,25 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.general.sql.SqlUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JToolBar;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -75,7 +82,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         ParameterTableModel model = new ParameterTableModel() {
             @Override
             public UITableEditAction[] createAction() {
-				return (UITableEditAction[]) ArrayUtils.add(super.createDBTableAction(), new RefreshAction());
+                return ArrayUtils.add(super.createDBTableAction(), new RefreshAction());
             }
         };
         editorPane = new UITableEditorPane<ParameterProvider>(model);
@@ -84,6 +91,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         connectionTableProcedurePane = new ConnectionTableProcedurePane() {
             @Override
             protected void filter(Connection connection, String conName, List<String> nameList) {
+
                 connection.addConnection(nameList, conName, new Class[]{JDBCDatabaseConnection.class, JNDIDatabaseConnection.class});
             }
         };
@@ -95,7 +103,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 try {
                     document.insertString(sqlTextPane.getCaretPosition(), target.toString(), null);
                 } catch (BadLocationException e) {
-					FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
                 // 这里开始作色,本来可以给sqlTextPane添加DocumentListener来实现的，
                 // 后来发现insertString的时候，锁定了JTextPane,不能调用setXXX来作色,先这样了.
@@ -104,10 +112,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             }
         });
         sqlTextPane.addFocusListener(new FocusListener() {
+            @Override
             public void focusGained(FocusEvent e) {
-				// unsupport
+                // do nothing
             }
 
+            @Override
             public void focusLost(FocusEvent e) {
                 if (isPreviewOrRefreshButton(e)) {
                     checkParameter();
@@ -146,7 +156,10 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         sqlSplitPane.add(box, BorderLayout.CENTER);
 
 
-		box.setMinimumSize(new Dimension(310, 400));
+        box.setMinimumSize(new Dimension(300, 400));
+        // 防止数据连接名过长时影响 split pane 分割效果
+        connectionTableProcedurePane.setMinimumSize(new Dimension(250, 400));
+        connectionTableProcedurePane.setMaximumSize(new Dimension(500, 400));
         // 使用SplitPane
         JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane);
         mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
@@ -160,7 +173,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
     }
 
 
-
     private boolean isPreviewOrRefreshButton(FocusEvent e) {
         if (e.getOppositeComponent() != null) {
             String name = e.getOppositeComponent().getName();
@@ -272,7 +284,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         if (StringUtils.isBlank(dbName) || StringUtils.isBlank(this.sqlTextPane.getText())) {
             try {
                 throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
-			} catch (Exception e) {
+            } catch (Exception ignore) {
                 // JOptionPane.showMessageDialog(DBTableDataPane.this,
                 // com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
             }
@@ -303,13 +315,14 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             refresh();
         }
 
         @Override
         public void checkEnabled() {
-			// unsupport
+            // do nothing
         }
     }
 
@@ -320,6 +333,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent evt) {
             checkParameter();
             PreviewTablePane.previewTableData(DBTableDataPane.this.updateBean());
@@ -333,11 +347,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL"));
             pane.populate(pageQuery);
             BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame());
             dialog.addDialogActionListener(new DialogActionAdapter() {
+                @Override
                 public void doOk() {
                     pageQuery = pane.update();
                     checkParameter();