From a52695fea6daafec8e46c06d96f7765f0af0a638 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 2 Aug 2017 16:04:36 +0800
Subject: [PATCH] format

---
 .../design/gui/ibutton/UIBasicButtonUI.java   |  2 +-
 .../com/fr/design/gui/itoolbar/UIToolbar.java | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIBasicButtonUI.java b/designer_base/src/com/fr/design/gui/ibutton/UIBasicButtonUI.java
index 52b20cd3d..3386f44f3 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIBasicButtonUI.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIBasicButtonUI.java
@@ -5,9 +5,9 @@
 package com.fr.design.gui.ibutton;
 
 import com.fr.design.gui.itoolbar.UIToolBarUI;
-import com.fr.general.ComparatorUtils;
 import com.fr.design.utils.ColorRoutines;
 import com.fr.design.utils.ThemeUtils;
+import com.fr.general.ComparatorUtils;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
diff --git a/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java b/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
index 4d91bb1cb..76be04705 100644
--- a/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
+++ b/designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
@@ -1,35 +1,38 @@
 package com.fr.design.gui.itoolbar;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.ArrayList;
 
-import javax.swing.JToolBar;
+public class UIToolbar extends JToolBar {
+    private static final int TOOLBAR_HEIGNT = 26;
 
-public class UIToolbar extends JToolBar{
-	private static final int TOOLBAR_HEIGNT = 26;
-	public UIToolbar() {
-		this(FlowLayout.LEFT);
-	}
+    public UIToolbar() {
+        this(FlowLayout.LEFT);
+    }
+
+    public UIToolbar(int align, UIToolBarUI uiToolBarUI) {
+        super();
+        setFloatable(false);
+        setRollover(true);
+        setLayout(new FlowLayout(align, 4, 0));
+        setUI(uiToolBarUI);
+        setBorderPainted(false);
+    }
 
-	public UIToolbar(int align) {
-		super();
-		setFloatable(false);
-	    setRollover(true);
-	    setLayout(new FlowLayout(align, 4, 0));
-	    setUI(new UIToolBarUI());
-	    setBorderPainted(false);
-	    setBackground(Color.RED);
-	}
-	
-	@Override
-	public Dimension getPreferredSize() {
-		Dimension dim = super.getPreferredSize();
-		dim.height = TOOLBAR_HEIGNT;
-		return dim;
-	}
+    public UIToolbar(int align) {
+        this(align, new UIToolBarUI());
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        Dimension dim = super.getPreferredSize();
+        dim.height = TOOLBAR_HEIGNT;
+        return dim;
+    }
 
-    public void checkComponentsByNames (boolean flag, ArrayList<String> names) {
-        for (int i = 0; i < getComponentCount(); i ++) {
+    public void checkComponentsByNames(boolean flag, ArrayList<String> names) {
+        for (int i = 0; i < getComponentCount(); i++) {
             Component component = getComponents()[i];
             if (names.contains(component.getName())) {
                 component.setEnabled(flag);