Merge pull request #1409 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit '2f94480cc22fccc8cc4f422ab7c28342e777d485':
  删除多余class
  REPORT-5387 [9.0三轮回归]设计器按钮控件的图标设置无效

designer_base/src/com/fr/design/web/CustomIconPane.java

@@ -232,6 +232,9 @@ public class CustomIconPane extends BasicPane {
 	}
 
 	private void updateButtonPane() {
+		if (editButton == null || removeButton == null){
+			return;
+		}
 		if (iconManager.isSystemIcon(selectedIconName)) {
 			editButton.setEnabled(false);
             removeButton.setEnabled(false);
@@ -298,7 +301,7 @@ public class CustomIconPane extends BasicPane {
 		} catch (RuntimeException re) {
             return;
 		}
-        updateButtonPane();
+		updateButtonPane();
 	}
 	
 	private class IconButton extends JToggleButton implements ActionListener{