Browse Source

REPORT-56855 优化方法命名

persist/11.0
方磊 3 years ago
parent
commit
2b1ac0869c
  1. 11
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
  2. 25
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java

11
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -160,16 +160,15 @@ public abstract class DesignTableDataManager {
return dsNameChangedMap.containsKey(oldDsName); return dsNameChangedMap.containsKey(oldDsName);
} }
private static String getChangedDsNameFromMap(String oldDsName) { public static String getChangedDsNameByOldDsName(String oldDsName) {
String changeName;
if (isDsNameChanged(oldDsName)) { if (isDsNameChanged(oldDsName)) {
return dsNameChangedMap.get(oldDsName); changeName = dsNameChangedMap.get(oldDsName);
} else { } else {
return StringUtils.EMPTY; changeName = StringUtils.EMPTY;
}
} }
public static String getChangedDsNameByOldDsName(String oldDsName) {
String changeName = getChangedDsNameFromMap(oldDsName);
if (StringUtils.isNotEmpty(changeName)) { if (StringUtils.isNotEmpty(changeName)) {
return getChangedDsNameByOldDsName(changeName); return getChangedDsNameByOldDsName(changeName);
} else { } else {

25
designer-base/src/main/java/com/fr/design/data/datapane/TableDataComboBox.java

@ -1,26 +1,27 @@
package com.fr.design.data.datapane; 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.constants.UIConstants;
import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.DesignTableDataManager;
import com.fr.data.TableDataSource;
import com.fr.design.data.tabledata.Prepare4DataSourceChange; 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.TemplateTableDataWrapper;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.stable.StringUtils; 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;
/** /**
* 包含所有数据集的下拉框 * 包含所有数据集的下拉框
* *

Loading…
Cancel
Save