Merge remote-tracking branch 'origin/release/9.0' into release/9.0

designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleDictionaryEditor.java

@@ -1,14 +1,12 @@
 package com.fr.design.mainframe.widget.accessibles;
 
-import javax.swing.*;
-
 import com.fr.data.Dictionary;
-import com.fr.design.mainframe.widget.wrappers.DictionaryWrapper;
-import com.fr.design.present.dict.DictionaryPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.mainframe.widget.wrappers.DictionaryWrapper;
+import com.fr.design.present.dict.DictionaryPane;
 
-import java.awt.*;
+import javax.swing.SwingUtilities;
 
 public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
 
@@ -38,4 +36,26 @@ public class AccessibleDictionaryEditor extends UneditableAccessibleEditor {
         dictPane.populateBean((Dictionary) getValue());
         dlg.setVisible(true);
     }
+
+
+    /**
+     * @param dictionary dictionary
+     * @deprecated 这个方法只用于兼容8.0下拉框类型控件的插件，
+     * 推荐使用{@link UneditableAccessibleEditor#setValue(java.lang.Object)}
+     */
+    @Deprecated
+    public void populateBean(Dictionary dictionary) {
+        this.setValue(dictionary);
+    }
+
+
+    /**
+     * @return Dictionary dictionary
+     * @deprecated 这个方法只用于兼容8.0下拉框类型控件的插件，
+     * 推荐使用{@link UneditableAccessibleEditor#getValue()}
+     */
+    @Deprecated
+    public Dictionary updateBean() {
+        return (Dictionary) this.getValue();
+    }
 }