diff --git a/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java
index 2a63a5b862..1bebaf90c8 100644
--- a/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java
@@ -55,14 +55,14 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
 
 	@Override
 	protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-		treeSettingPane.setValue(e.getDictionary());
+		treeSettingPane.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 	}
 
 	@Override
 	protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() {
 		TreeComboBoxEditor editor = new TreeComboBoxEditor();
-		editor.setDictionary((Dictionary)treeSettingPane.getValue());
+		editor.setNodeOrDict(treeSettingPane.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		return editor;
 	}
diff --git a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
index 96d83b7b62..f98eea391a 100644
--- a/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
@@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 
 	@Override
 	protected void populateSubFieldEditorBean(TreeEditor e) {
-		this.accessibleTreeModelEditor.setValue(e.getDictionary());
+		this.accessibleTreeModelEditor.setValue(e.getNodeOrDict());
 		treeRootPane.populate(e.getTreeAttr());
 		if (this.removeRepeatCheckBox != null) {
 			this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat());
@@ -40,7 +40,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	@Override
 	protected TreeEditor updateSubFieldEditorBean() {
 		TreeEditor editor = new TreeEditor();
-		editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+		editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
 		editor.setTreeAttr(treeRootPane.update());
 		if (this.removeRepeatCheckBox != null) {
 			editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected());
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java
index 100fb2800e..bb48d586a8 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java
@@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
 
     @Override
     protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
-        accessibleTreeModelEditor.setValue(e.getDictionary());
+        accessibleTreeModelEditor.setValue(e.getNodeOrDict());
         formWidgetValuePane.populate(e);
         treeRootPane.populate(e.getTreeAttr());
         mutiSelect.setSelected(e.isMultipleSelection());
@@ -88,7 +88,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
         editor.setAjax(loadAsync.isSelected());
         editor.setSelectLeafOnly(returnLeaf.isSelected());
         editor.setReturnFullPath(returnPath.isSelected());
-        editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
+        editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
         return editor;
     }