From c252a560ad3e406c3fe2502bb439363cc21e21f4 Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Tue, 17 Jul 2018 12:45:13 +0800
Subject: [PATCH] REPORT-97399

---
 .../main/java/com/fr/design/gui/icombobox/LazyComboBox.java  | 1 -
 .../java/com/fr/design/dscolumn/SelectedDataColumnPane.java  | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
index 095d3f302b..575ab630ba 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java
@@ -5,7 +5,6 @@ package com.fr.design.gui.icombobox;
 
 import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
-import com.fr.stable.StringUtils;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.SwingWorker;
diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
index 54aa686b04..fbe7d228a6 100644
--- a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
+++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
@@ -9,7 +9,6 @@ import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.LazyComboBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -234,9 +233,7 @@ public class SelectedDataColumnPane extends BasicPane {
         DSColumn dsColumn = (DSColumn) value;
         String dsName = dsColumn.getDSName();
         tableNameComboBox.setSelectedTableDataByName(dsName);
-        //数据列名称
-        String dsColumnName = TableDataColumn.getColumnName(dsColumn.getColumn());
-        columnNameComboBox.setSelectedItem(dsColumnName);
+        columnNameComboBox.setSelectedItem(TableDataColumn.getColumnName(dsColumn.getColumn()));
         ps = dsColumn.getParameters();
 
         addListener();