diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 2ec213faf..17d411706 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -228,7 +228,7 @@ public class EditToolBar extends BasicPane { this.defaultCheckBox.setSelected(ftoolbar.isDefault() ? true : false); if (bgColorButtonGroup != null) { - this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorType().getCode()); + this.bgColorButtonGroup.setSelectedIndex(ftoolbar.getButtonBgColorMode().getCode()); } } @@ -264,7 +264,7 @@ public class EditToolBar extends BasicPane { ftoolBar.setBackground(this.background); } if (bgColorButtonGroup != null) { - ftoolBar.setButtonBgColorType(ColorMode.getTypeByCode(bgColorButtonGroup.getSelectedIndex())); + ftoolBar.setButtonBgColorMode(ColorMode.getModeByCode(bgColorButtonGroup.getSelectedIndex())); } return ftoolBar; } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index 9af8849ce..d48b466f1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -13,7 +13,7 @@ public class FToolBar { private Background background = null; private boolean isDefault = true; - private ColorMode buttonBgColorType = ColorMode.AUTO; + private ColorMode buttonBgColorMode = ColorMode.AUTO; public List getButtonlist() { return buttonlist; } @@ -54,12 +54,12 @@ public class FToolBar { this.isDefault = isDefault; } - public ColorMode getButtonBgColorType() { - return buttonBgColorType; + public ColorMode getButtonBgColorMode() { + return buttonBgColorMode; } - public void setButtonBgColorType(ColorMode buttonBgColorType) { - this.buttonBgColorType = buttonBgColorType; + public void setButtonBgColorMode(ColorMode buttonBgColorMode) { + this.buttonBgColorMode = buttonBgColorMode; } public ToolBar getToolBar() { @@ -70,7 +70,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColorType(this.buttonBgColorType); + toolBar.setButtonBgColorMode(this.buttonBgColorMode); return toolBar; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 8cfed8799..389612522 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -157,7 +157,7 @@ public class ToolBarPane extends BasicBeanPane { } this.getFToolBar().setBackground(toolbar.getBackground()); this.getFToolBar().setDefault(toolbar.isDefault()); - this.getFToolBar().setButtonBgColorType(toolbar.getButtonBgColorType()); + this.getFToolBar().setButtonBgColorMode(toolbar.getButtonBgColorMode()); setPopulateFinished(true); }