From 2b1ac0869c58761749fca3dd19790f269fd60e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Tue, 24 Aug 2021 10:22:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-56855=20=E4=BC=98=E5=8C=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/data/DesignTableDataManager.java   | 11 ++++----
 .../data/datapane/TableDataComboBox.java      | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index ee8214297f..ab86a0d6f2 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -160,16 +160,15 @@ public abstract class DesignTableDataManager {
         return dsNameChangedMap.containsKey(oldDsName);
     }
 
-    private static String getChangedDsNameFromMap(String oldDsName) {
+    public static String getChangedDsNameByOldDsName(String oldDsName) {
+        String changeName;
+
         if (isDsNameChanged(oldDsName)) {
-            return dsNameChangedMap.get(oldDsName);
+            changeName = dsNameChangedMap.get(oldDsName);
         } else {
-            return StringUtils.EMPTY;
+            changeName = StringUtils.EMPTY;
         }
-    }
 
-    public static String getChangedDsNameByOldDsName(String oldDsName) {
-        String changeName = getChangedDsNameFromMap(oldDsName);
         if (StringUtils.isNotEmpty(changeName)) {
             return getChangedDsNameByOldDsName(changeName);
         } else {
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java
index cda0fd084e..ebbdbf0f35 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java
@@ -1,26 +1,27 @@
 package com.fr.design.data.datapane;
 
-import com.fr.data.TableDataSource;
+import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.data.TableDataSource;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
-import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TemplateTableDataWrapper;
+import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import java.awt.Component;
-import java.awt.event.ItemEvent;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
 /**
  * 包含所有数据集的下拉框
  *