Merge pull request #1392 in BA/design from ~HZZZ/design:release/9.0 to release/9.0

* commit '4e945a165808de1f9ec635a7200530d8e319e311':
  sonarqube
  sonarqube
  REPORT-4892
  REPORT-4892

designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -54,6 +54,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
+	private static final int BOTTOM = 6;
 	private static final String PREVIEW_BUTTON = Inter.getLocText("FR-Designer_Preview");
     private static final String REFRESH_BUTTON = Inter.getLocText("FR-Designer_Refresh");
 	private ConnectionTableProcedurePane connectionTableProcedurePane;
@@ -66,29 +67,11 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 	private String pageQuery = null;
 	private DBTableData dbTableData;
 
-
+	private void init() {
-
-	public DBTableDataPane() {
 		this.setLayout(new BorderLayout(4, 4));
 
-		Box box = new Box(BoxLayout.Y_AXIS);
-
 		sqlTextPane = new SQLEditPane();
 		sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);
-		JPanel northPane = new JPanel(new BorderLayout(4, 4));
-		JToolBar editToolBar = createToolBar();
-		northPane.add(editToolBar, BorderLayout.CENTER);
-		northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 6, 0));
-
-		RTextScrollPane sqlTextScrollPane = new RTextScrollPane(sqlTextPane);
-		sqlTextScrollPane.setLineNumbersEnabled(true);
-		sqlTextScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
-		sqlTextScrollPane.setPreferredSize(new Dimension(680, 600));
-
-		JPanel paraMeanPane = new JPanel(new BorderLayout());
-		paraMeanPane.setPreferredSize(new Dimension(680, 90));
-		UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES"));
-		paraMeanPane.add(paraMean, BorderLayout.CENTER);
 
 		ParameterTableModel model = new ParameterTableModel() {
 			@Override
@@ -98,14 +81,6 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		};
 		editorPane = new UITableEditorPane<ParameterProvider>(model);
 
-		box.add(northPane);
-		box.add(sqlTextScrollPane);
-		box.add(paraMeanPane);
-		box.add(editorPane);
-
-		JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4));
-		sqlSplitPane.add(box, BorderLayout.CENTER);
-
 		// 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table
 		connectionTableProcedurePane = new ConnectionTableProcedurePane() {
 			@Override
@@ -131,7 +106,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		});
 		sqlTextPane.addFocusListener(new FocusListener() {
 			public void focusGained(FocusEvent e) {
-
+				// unsupport
 			}
 
 			public void focusLost(FocusEvent e) {
@@ -140,6 +115,38 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 				}
 			}
 		});
+	}
+
+
+	private void initMainSplitPane() {
+		Box box = new Box(BoxLayout.Y_AXIS);
+
+
+		JPanel northPane = new JPanel(new BorderLayout(4, 4));
+		JToolBar editToolBar = createToolBar();
+		northPane.add(editToolBar, BorderLayout.CENTER);
+		northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, BOTTOM, 0));
+
+		RTextScrollPane sqlTextScrollPane = new RTextScrollPane(sqlTextPane);
+		sqlTextScrollPane.setLineNumbersEnabled(true);
+		sqlTextScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+		sqlTextScrollPane.setPreferredSize(new Dimension(680, 600));
+
+		JPanel paraMeanPane = new JPanel(new BorderLayout());
+		paraMeanPane.setPreferredSize(new Dimension(680, 90));
+		UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES"));
+		paraMeanPane.add(paraMean, BorderLayout.CENTER);
+
+
+		box.add(northPane);
+		box.add(sqlTextScrollPane);
+		box.add(paraMeanPane);
+		box.add(editorPane);
+
+		JPanel sqlSplitPane = new JPanel(new BorderLayout(4, 4));
+		sqlSplitPane.add(box, BorderLayout.CENTER);
+
+
 		box.setMinimumSize(new Dimension(310, 400));
 		// 使用SplitPane
 		JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane);
@@ -148,6 +155,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 		this.add(mainSplitPane, BorderLayout.CENTER);
 	}
 
+	public DBTableDataPane() {
+		init();
+		initMainSplitPane();
+	}
+
+
 
 	private boolean isPreviewOrRefreshButton (FocusEvent e) {
 		if (e.getOppositeComponent() != null) {
@@ -184,6 +197,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 			toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction());
 		}
 		isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData"));
+		isShareCheckBox.setBackground(Color.WHITE);
 		maxPanel = new MaxMemRowCountPanel();
 		maxPanel.setBorder(null);
 		UIToolbar editToolBar = ToolBarDef.createJToolBar();
@@ -296,6 +310,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
 		@Override
 		public void checkEnabled() {
+			// unsupport
 		}
 	}