找回处理冲突过程中丢失的代码

designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java

@@ -92,22 +92,22 @@ public class SelectedDataColumnPane extends BasicPane {
         };
         columnNameComboBox.setEditable(true);
         double p = TableLayout.PREFERRED;
-        UILabel label1 = new UILabel(Inter.getLocText("TableData") + ":");
-        UILabel label2 = new UILabel(Inter.getLocText("DataColumn") + ":");
+        UILabel dsLabel = new UILabel(Inter.getLocText("TableData") + ":");
+        UILabel dcLabel = new UILabel(Inter.getLocText("DataColumn") + ":");
         if (showParameterButton) {
-            label1.setPreferredSize(new Dimension(200, 25));
-            label2.setPreferredSize(new Dimension(200, 25));
+            dsLabel.setPreferredSize(new Dimension(200, 25));
+            dcLabel.setPreferredSize(new Dimension(200, 25));
         }
         if (showParameterButton) {
-            Component[][] comps = {{label1, null, label2}, {tableNameComboBox, paramButton, columnNameComboBox}};
+            Component[][] comps = {{dsLabel, null, dcLabel}, {tableNameComboBox, paramButton, columnNameComboBox}};
             this.add(TableLayoutHelper.createTableLayoutPane(comps, new double[]{p, p}, new double[]{p, p, p}));
         } else {
             double f = TableLayout.FILL;
             double[] columnSize = {p, f};
             double[] rowSize = {p, p};
             Component[][] components = new Component[][]{
-                    new Component[]{label1, tableNameComboBox},
-                    new Component[]{label2, columnNameComboBox}
+                    new Component[]{dsLabel, tableNameComboBox},
+                    new Component[]{dcLabel, columnNameComboBox}
             };
             JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
             this.setLayout(new BorderLayout());

designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -410,10 +410,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
         /**
          * 创建内容
+         * @return 内容面板
          */
-
         private JPanel createContentPane() {
-            this.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             //结果集排序
             sortPane = new ResultSetSortConfigPane();