Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zhouping/design into dev

designer/src/com/fr/design/webattr/EditToolBar.java

@@ -63,16 +63,8 @@ public class EditToolBar extends BasicPane {
 
 	private ListSelectionListener listSelectionListener = new ListSelectionListener() {
 		public void valueChanged(ListSelectionEvent evt) {
-			if (lastButton != null && lastButton.getWidget() instanceof Button) {
+			if (lastButton != null) {
-				if (!((list.getSelectedValue() instanceof ToolBarButton)
+				lastButton.setWidget(bp.update());
-						&& ((ToolBarButton)(list.getSelectedValue())).getWidget() instanceof CustomToolBarButton)) {
-					lastButton.setWidget(bp.update());
-				} else {
-					((Button) lastButton.getWidget()).setShowIcon(bp.icon.isSelected());
-					((Button) lastButton.getWidget()).setShowText(bp.text.isSelected());
-					((Button) lastButton.getWidget()).setText(bp.nameField.getText());
-					((Button) lastButton.getWidget()).setIconName(bp.iconPane.update());
-				}
 			}
 			if (list.getSelectedValue() instanceof ToolBarButton) {
 				lastButton = (ToolBarButton) list.getSelectedValue();