REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化

No.14: 将SVGIconUtils的名字修改为IconUtils

designer-base/src/main/java/com/fr/base/svg/IconUtils.java

@@ -12,7 +12,7 @@ import javax.swing.ImageIcon;
  * @version 10.0
  * Created by Yvan on 2020/12/23
  */
-public class SVGIconUtils {
+public class IconUtils {
 
     private static final String ICON_SUFFIX_SVG = ".svg";
     private static final String ICON_SUFFIX_PNG = ".png";

designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.menu.KeySetUtils;
@@ -22,7 +22,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction {
         this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

@@ -1,7 +1,6 @@
 package com.fr.design.actions;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
-import com.fr.base.svg.SVGIconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.DesignModelAdapter;
@@ -20,7 +19,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
 	public ExitAuthorityEditAction(TargetComponent t) {
 		super(t);
 		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit_normal.svg"));
 	}
 
 

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions;
 
 import javax.swing.SwingUtilities;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.TableDataSource;
 import com.fr.design.data.datapane.ReportTableDataPane;
@@ -26,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
         this.setMenuKeySet(KeySetUtils.TEMPLATE_TABLE_DATA_SOURCE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -7,7 +7,7 @@ import com.fr.base.NameStyle;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
 import com.fr.base.svg.SVGIcon;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
@@ -183,8 +183,8 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 * @param resource
 	 */
 	public void setSmallIcon(String resource) {
-		this.putValue(Action.SMALL_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		this.putValue(Action.SMALL_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL));
-		this.putValue(UpdateAction.DISABLED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+		this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
 	}
 
 	/**
@@ -194,9 +194,9 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 * @param needPressedIcon
 	 */
 	public void setSmallIcon(String resource, boolean needPressedIcon) {
-		this.putValue(Action.SMALL_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		this.putValue(Action.SMALL_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL));
-		this.putValue(UpdateAction.DISABLED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+		this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
-		this.putValue(UpdateAction.PRESSED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_PRESSED));
+		this.putValue(UpdateAction.PRESSED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_PRESSED));
 	}
 
 	public void setSmallIcon(Icon[] smallIcon, boolean white) {

designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 
@@ -20,7 +20,7 @@ public class BBSAction extends UpdateAction
 		 this.setMenuKeySet(BBS);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/bbs_normal.svg"));
+	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/bbs_normal.svg"));
 
 	}
 

designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
@@ -17,7 +17,7 @@ public class BugAction extends UpdateAction
 	{ this.setMenuKeySet(BUG);
     this.setName(getMenuKeySet().getMenuName());
     this.setMnemonic(getMenuKeySet().getMnemonic());
-    this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/bug_normal.svg"));
+    this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/bug_normal.svg"));
 }
 
 @Override

designer-base/src/main/java/com/fr/design/actions/community/BugNeedAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.locale.impl.BugNeedMark;
 import com.fr.design.menu.MenuKeySet;
@@ -20,7 +20,7 @@ public class BugNeedAction extends UpdateAction {
         this.setMenuKeySet(BugAndNeed);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
     }
 
     @Override

designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.CloudCenter;
@@ -17,7 +17,7 @@ public class CenterAction extends UpAction{
         this.setMenuKeySet(CENTER);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/center_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/center_normal.svg"));
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/FacebookFansAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.general.CloudCenter;
@@ -13,7 +13,7 @@ public class FacebookFansAction extends UpAction {
         this.setMenuKeySet(FACEBOOKFANS);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/facebook_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/facebook_normal.svg"));
     }
 
     @Override

designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
@@ -18,7 +18,7 @@ public class NeedAction extends UpdateAction
 		 this.setMenuKeySet(NEED);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
+	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/need_normal.svg"));
 
 	}
 

designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
@@ -16,7 +16,7 @@ public class QuestionAction extends UpdateAction {
         this.setMenuKeySet(QUESTIONS);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/question_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/question_normal.svg"));
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/SignAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 
@@ -19,7 +19,7 @@ public class SignAction extends UpdateAction
 		 this.setMenuKeySet(SIGN);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-	     this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/sign_normal.svg"));
+	     this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/sign_normal.svg"));
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
@@ -21,7 +21,7 @@ public class TechSolutionAction extends UpdateAction{
         this.setMenuKeySet(TSO);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/solution_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/solution_normal.svg"));
 
     }
 

designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.locale.impl.VideoMark;
 import com.fr.design.menu.MenuKeySet;
@@ -20,7 +20,7 @@ public class VideoAction extends UpdateAction
 		 this.setMenuKeySet(VIDEO);
 	     this.setName(getMenuKeySet().getMenuName());
 	     this.setMnemonic(getMenuKeySet().getMnemonic());
-		 this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/video_normal.svg"));
+		 this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/video_normal.svg"));
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.KeySetUtils;
@@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
@@ -20,7 +20,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.file;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.actions.UpdateAction;
@@ -42,11 +42,11 @@ public class SwitchExistEnv extends MenuDef {
             DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
             switch (env.getType()) {
                 case Local: {
-                    this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/data/bind/localconnect_normal.svg"));
+                    this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/data/bind/localconnect_normal.svg"));
                     break;
                 }
                 case Remote: {
-                    this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/data/bind/distanceconnect_normal.svg"));
+                    this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/data/bind/distanceconnect_normal.svg"));
                     break;
                 }
             }

designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.help;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
@@ -28,7 +28,7 @@ public class TutorialAction extends UpdateAction {
         this.setMenuKeySet(HELP_TUTORIAL);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/bbs/help_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/bbs/help_normal.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.help;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
@@ -16,7 +16,7 @@ public class WebDemoAction extends UpdateAction {
         this.setMenuKeySet(PRODUCT_DEMO);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_help/demo_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_help/demo_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.Connection;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionShowPane;
@@ -26,7 +26,7 @@ public class ConnectionListAction extends UpdateAction {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/connection_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/connection_normal.svg"));
         this.generateAndSetSearchText(DatabaseConnectionPane.JDBC.class.getName());
     }
 

designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.server;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.config.Configuration;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
@@ -29,7 +29,7 @@ public class FunctionManagerAction extends UpdateAction {
         this.setMenuKeySet(FUNCTION_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/function_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/function_normal.svg"));
         this.generateAndSetSearchText(FunctionManagerPane.class.getName());
     }
 

designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.server;
 
 import com.fr.base.ParameterConfig;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
@@ -31,7 +31,7 @@ public class GlobalParameterAction extends UpdateAction {
         this.setMenuKeySet(GLOBAL_PARAMETER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.server;
 
 import com.fr.base.TableData;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
@@ -40,7 +40,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
         this.setMenuKeySet(SERVER_TABLEDATA);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase_normal.svg"));
     }
 
     public static final MenuKeySet SERVER_TABLEDATA = new MenuKeySet() {

designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.DesignUtils;
@@ -14,7 +14,7 @@ public class PlatformManagerAction extends UpdateAction {
         this.setMenuKeySet(PLATEFORM_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/server/platform_16_16_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/server/platform_16_16_normal.svg"));
 	}
 
     /**

designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.os.impl.PMDialogAction;
@@ -20,7 +20,7 @@ public class PluginManagerAction extends UpdateAction {
         this.setMenuKeySet(PLUGIN_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/server/plugin_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/server/plugin_normal.svg"));
     }
     @Override
     public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.constants;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 
@@ -180,7 +180,7 @@ public interface UIConstants {
     public static final Icon YES_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/yes.png");
     public static final Icon CHOOSEN_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/select_item.png");
     public static final Icon PRE_WIDGET_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/prewidget.png");
-    public static final Icon PRE_WIDGET_NORMAL_ICON = SVGIconUtils.readIcon("com/fr/design/images/buttonicon/prewidget_normal.svg");
+    public static final Icon PRE_WIDGET_NORMAL_ICON = IconUtils.readIcon("com/fr/design/images/buttonicon/prewidget_normal.svg");
     public static final Icon EDIT_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editn.png");
     public static final Icon EDIT_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editp.png");
     public static final Icon HIDE_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hiden.png");

designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.form.ui.*;
 import com.fr.general.ComparatorUtils;
 
@@ -128,27 +128,27 @@ public abstract class WidgetOption implements Serializable {
     }
 
     public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
-            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
+            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
             DateEditor.class);
 
     public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
-            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
+            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
 
-    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg"),
+    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg"),
             TreeComboBoxEditor.class);
 
     public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
 
     public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
             RadioGroup.class);
 
     public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
 
     public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
             Label.class);
 
     public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@@ -156,23 +156,23 @@ public abstract class WidgetOption implements Serializable {
             Button.class);
 
     public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
             FreeButton.class);
 
     public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up_normal.svg"),
             MultiFileEditor.class);
 
     public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
             ComboBox.class);
 
     public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
             ComboCheckBox.class);
 
     public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
             CheckBox.class);
 
     public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@@ -182,16 +182,16 @@ public abstract class WidgetOption implements Serializable {
 
     public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
-            , SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
+            , IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
             TextEditor.class);
 
     public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
             TextArea.class);
 
     public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
-            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
+            IconUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
 
     public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
             IframeEditor.class);

designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java

@@ -3,7 +3,7 @@ package com.fr.design.gui.ibutton;
 import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.GraphHelper;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -99,9 +99,9 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 	}
 
 	public UIButton(String resource, boolean needSetDisabledIcon) {
-		super(SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		super(IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_NORMAL));
 		if (needSetDisabledIcon) {
-			this.setDisabledIcon(SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+			this.setDisabledIcon(IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
 		}
 		init();
 	}

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -2,7 +2,7 @@ package com.fr.design.mainframe;
 
 import com.fr.base.FRContext;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -891,7 +891,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void resetButtonIcon() {
             if (iconSuffix.equals(ICON_SUFFIX_SELECTED)) {
                 iconSuffix = ICON_SUFFIX_NORMAL;
-                button.setIcon(SVGIconUtils.readIcon(getBtnIconUrl()));
+                button.setIcon(IconUtils.readIcon(getBtnIconUrl()));
                 button.setBackground(originBtnBackground);
                 button.setOpaque(false);
             }
@@ -900,7 +900,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void setTabButtonSelected() {
             resetPropertyIcons();
             iconSuffix = ICON_SUFFIX_SELECTED;
-            button.setIcon(SVGIconUtils.readIcon(getBtnIconUrl()));
+            button.setIcon(IconUtils.readIcon(getBtnIconUrl()));
             button.setBackground(selectedBtnBackground);
             button.setOpaque(true);
             selectedItem = this;
@@ -911,7 +911,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
 
         private void initButton() {
-            button = new UIButton(SVGIconUtils.readIcon(getBtnIconUrl())) {
+            button = new UIButton(IconUtils.readIcon(getBtnIconUrl())) {
                 public Dimension getPreferredSize() {
                     return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_HEIGHT);
                 }
@@ -924,7 +924,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     }
                 }
             };
-            button.setDisabledIcon(SVGIconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED));
+            button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED));
             button.set4LargeToolbarButton();
             button.setUI(new UIButtonUI() {
                 @Override

designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@@ -1,6 +1,6 @@
 package com.fr.design.menu;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.*;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
@@ -166,7 +166,7 @@ public class MenuDef extends ShortCut {
     public UIButton createUIButton() {
         if (createdButton == null) {
             if (iconPath != null) {
-                createdButton = new UIButton(SVGIconUtils.readIcon(iconPath));
+                createdButton = new UIButton(IconUtils.readIcon(iconPath));
                 createdButton.set4ToolbarButton();
             } else {
                 createdButton = new UIButton(name);
@@ -194,7 +194,7 @@ public class MenuDef extends ShortCut {
             createdJMenu = createJMenu0();
             createdJMenu.setMnemonic(this.getMnemonic());
             if (this.iconPath != null) {
-                createdJMenu.setIcon(SVGIconUtils.readIcon(iconPath));
+                createdJMenu.setIcon(IconUtils.readIcon(iconPath));
             }
             MenuListener menuListener = createMenuListener();
             createdJMenu.addMenuListener(menuListener);

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.remote.action;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -27,7 +27,7 @@ public class RemoteDesignAuthManagerAction extends UpdateAction {
     public RemoteDesignAuthManagerAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"));
         // 远程设计权限管理
-        this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Auth_Manager_normal@1x_normal.svg"));
     }
 
 

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.report.fit.menupane;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -9,7 +9,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.IOUtils;
 import com.fr.report.fit.FitProvider;
 import com.fr.report.fit.ReportFitAttr;
 
@@ -67,7 +66,7 @@ public class ReportFitAttrAction extends JTemplateAction {
         }
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/reportfit/fit_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/reportfit/fit_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java

@@ -4,7 +4,7 @@
 package com.fr.design.style.color;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
@@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
+        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 

designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.update.actions;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.os.impl.UpdateDialogAction;
 import com.fr.stable.os.support.OSBasedAction;
@@ -15,7 +15,7 @@ public class SoftwareUpdateAction extends UpdateAction {
 
     public SoftwareUpdateAction() {
         setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade"));
-        setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/update/update_new_normal.svg"));
+        setSmallIcon(IconUtils.readIcon("/com/fr/design/images/update/update_new_normal.svg"));
 
     }
 

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.module;
 
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
@@ -33,7 +33,7 @@ public class ChartPreStyleAction extends UpdateAction {
         this.setMenuKeySet(CHART_DEFAULT_STYLE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/chart/ChartType_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("com/fr/design/images/chart/ChartType_normal.svg"));
 		this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName());
 	}
 

designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java

@@ -1,7 +1,7 @@
 package com.fr.van.chart.map.server;
 
 import com.fr.base.ServerConfig;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.general.GeneralContext;
@@ -17,7 +17,7 @@ import java.awt.event.ActionEvent;
 public class ChartMapEditorAction extends UpdateAction {
 
     public ChartMapEditorAction(){
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/van/chart/map/images/mapData_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/van/chart/map/images/mapData_normal.svg"));
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data"));
     }
 

designer-form/src/main/java/com/fr/design/actions/NewFormAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.mainframe.BaseJForm;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -21,7 +21,7 @@ public class NewFormAction extends UpdateAction {
         this.setMenuKeySet(NEW_FORM);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java

@@ -1,7 +1,7 @@
 package com.fr.design.form.parameter;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.properties.WidgetPropertyTable;
 import com.fr.design.gui.core.WidgetOption;
@@ -28,7 +28,7 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial<FormParaDesig
     public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        SVGIconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        IconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
     }
 
     @Override

designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.i18n.Toolkit;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
@@ -75,13 +75,13 @@ public class FormWidgetOption extends WidgetOption {
         return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
     }
 
-	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
+	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), IconUtils.readIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
 			WAbsoluteLayout.class);
 
 	public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
 			WBorderLayout.class);
 
-	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
+	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), IconUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
 			WCardLayout.class);
 
 	public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
@@ -94,9 +94,9 @@ public class FormWidgetOption extends WidgetOption {
 			BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
 			WFitLayout.class);
 
-	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), SVGIconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_normal.svg"),
+	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), IconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_normal.svg"),
 			WParameterLayout.class);
 
-	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
+	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), IconUtils.readIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
 			ElementCaseEditor.class);
 }

designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.events.DesignerEditListener;
@@ -374,7 +374,7 @@ public class FormParaWidgetPane extends JPanel {
     private class paraButton extends ToolBarButton {
         public paraButton(WidgetOption no) {
             super(no);
-            this.setDisabledIcon(SVGIconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_disabled.svg"));
+            this.setDisabledIcon(IconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_disabled.svg"));
             if (designer != null) {
                 this.setEnabled(designer.getParaComponent() == null);
             }

designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java

@@ -3,7 +3,7 @@ package com.fr.design.mainframe;
 import java.util.ArrayList;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.core.WidgetOptionFactory;
 import com.fr.design.gui.itable.PropertyGroup;
@@ -23,7 +23,7 @@ public class FormTargetMode extends FormDesignerModeForSpecial<FormDesigner> {
 	public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        SVGIconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        IconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
     }
 
 	public ArrayList<PropertyGroup> createRootDesignerPropertyGroup() {

designer-realize/src/main/java/com/fr/design/actions/cell/CellAttributeAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.menu.KeySetUtils;
 
 
@@ -12,7 +12,7 @@ public class CellAttributeAction extends CellAttributeTableAction {
         this.setMenuKeySet(KeySetUtils.CELL_OTHER_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellAttr_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/cellAttr_normal.svg"));
 	}
 
 	@Override

designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.menu.KeySetUtils;
 
 
@@ -11,7 +11,7 @@ public class CellExpandAttrAction extends  CellAttributeTableAction{
         this.setMenuKeySet(KeySetUtils.CELL_EXPAND_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/expand/cellAttr_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/expand/cellAttr_normal.svg"));
 	}
 
 

designer-realize/src/main/java/com/fr/design/actions/cell/CellWidgetAttrAction.java

@@ -1,7 +1,6 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
-import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -17,7 +16,7 @@ public class CellWidgetAttrAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CELL_WIDGET_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/ConditionAttributesAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.cell;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -18,7 +18,7 @@ public class ConditionAttributesAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CONDITION_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/highlight_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/highlight_normal.svg"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/EditCellAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.cell;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.mainframe.ElementCasePane;
 
@@ -20,7 +20,7 @@ public class EditCellAction extends ElementCaseAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
         this.setMnemonic('I');
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/control/edit_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/control/edit_normal.svg"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java

@@ -2,7 +2,7 @@ package com.fr.design.actions.cell;
 
 import com.fr.base.CellBorderStyle;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -47,7 +47,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 	private JPopupMenu popupWin;
 
 	public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
-		super(new UIButton(icon), new UIButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
+		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
 		this.reportPane = reportPane;
 	}
 

designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java

@@ -4,7 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ButtonGroupAction;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.constants.UIConstants;
@@ -23,9 +23,9 @@ import javax.swing.*;
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
     private static final Icon[][] ICONS = new Icon[][]{
-            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
-            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
-            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
+            {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
 
 
     private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ToggleButtonUpdateAction;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,7 +21,7 @@ import javax.swing.*;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
-    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java

@@ -6,7 +6,7 @@ package com.fr.design.actions.cell.style;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.color.UIToolbarColorButton;
@@ -51,7 +51,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
 	public JComponent createToolBarComponent() {
 		Object object = this.getValue(UIToolbarColorButton.class.getName());
 		if (object == null || !(object instanceof UIToolbarColorButton)) {
-			UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -17,7 +17,7 @@ import javax.swing.*;
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
 
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -18,7 +18,7 @@ import javax.swing.*;
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
+    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), IconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
 
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java

@@ -12,7 +12,7 @@ import javax.swing.event.ChangeListener;
 import com.fr.base.Style;
 import com.fr.base.background.ColorBackground;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.general.ComparatorUtils;
 
@@ -60,7 +60,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
         public JComponent createToolBarComponent() {
             Object object = this.getValue(UIToolbarColorButton.class.getName());
             if (object == null || !(object instanceof UIToolbarColorButton)) {
-                UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/color/background_normal.svg"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/background_normal.svg"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java

@@ -3,8 +3,7 @@
  */
 package com.fr.design.actions.columnrow;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
-import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.CellSelectionAction;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -28,7 +27,7 @@ public class InsertColumnAction extends CellSelectionAction {
 
         this.setName(name);
         this.setMnemonic(INSERT_COLUMN.getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/insertColumn_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/insertColumn_normal.svg"));
     }
 
     public static final MenuKeySet INSERT_COLUMN = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.columnrow;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.CellSelectionAction;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -26,7 +26,7 @@ public class InsertRowAction extends CellSelectionAction {
 		super(t);
         this.setName(name);
         this.setMnemonic(INSERT_ROW.getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/insertRow_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/insertRow_normal.svg"));
 	}
 
 	public static final MenuKeySet INSERT_ROW = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/edit/HyperlinkAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -19,7 +19,7 @@ public class HyperlinkAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.HYPER_LINK);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/hyperLink_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_insert/hyperLink_normal.svg"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java

@@ -6,7 +6,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.KeyStroke;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JPolyWorkBook;
@@ -19,7 +19,7 @@ public class NewPolyReportAction extends UpdateAction {
     public NewPolyReportAction() {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report"));
         this.setMnemonic('F');
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER));
     }
 

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.file.newReport;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JWorkBook;
@@ -26,7 +26,7 @@ public class NewWorkBookAction extends UpdateAction {
     }
 
     protected Icon icon() {
-        return SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
+        return IconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ReportComponent;
@@ -23,7 +23,7 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         this.setMenuKeySet(KeySetUtils.REPORT_BACKGROUND);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/background_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/background_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportColumnsAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.WorkSheetDesigner;
@@ -17,7 +17,7 @@ public class ReportColumnsAction extends ReportComponentAction<WorkSheetDesigner
         this.setMenuKeySet(KeySetUtils.REPORT_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/linearAttr_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/linearAttr_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -18,7 +18,7 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         this.setMenuKeySet(KeySetUtils.REPORT_ENGINE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/reportEngineAttr_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/reportEngineAttr_normal.svg"));
         this.generateAndSetSearchText(LayerReportPane.class.getName());
 
     }

designer-realize/src/main/java/com/fr/design/actions/report/ReportExportAttrAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -19,7 +19,7 @@ public class ReportExportAttrAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_EXPORT_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/export_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/export_normal.svg"));
         this.generateAndSetSearchText(ReportExportAttrPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportFooterAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditFooterPane;
@@ -30,7 +30,7 @@ public class ReportFooterAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_FOOTER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/footer_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/footer_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditHeaderPane;
@@ -33,7 +33,7 @@ public class ReportHeaderAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_HEADER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/header_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/header_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java

@@ -2,7 +2,7 @@ package com.fr.design.actions.report;
 
 import com.fr.base.PaperSize;
 import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -11,7 +11,6 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.report.mobile.ReportMobileAttrPane;
 import com.fr.file.FILE;
-import com.fr.general.IOUtils;
 
 import com.fr.intelli.record.Focus;
 import com.fr.main.TemplateWorkBook;
@@ -36,7 +35,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{
         this.setMenuKeySet(REPORT_APP_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/mobile_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/mobile_normal.svg"));
         this.generateAndSetSearchText(ReportMobileAttrPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java

@@ -3,14 +3,13 @@
  */
 package com.fr.design.actions.report;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.WorkSheetDesigner;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.freeze.RepeatAndFreezeSettingPane;
-import com.fr.general.IOUtils;
 import com.fr.report.worksheet.WorkSheet;
 
 import javax.swing.SwingUtilities;
@@ -28,7 +27,7 @@ public class ReportPageAttrAction extends ReportComponentAction<WorkSheetDesigne
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/repeatAndFrozen_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/repeatAndFrozen_normal.svg"));
         this.generateAndSetSearchText(RepeatAndFreezeSettingPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
@@ -28,7 +28,7 @@ public class ReportPageSetupAction extends ReportComponentAction<ReportComponent
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE_SETUP);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/pageSetup_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_file/pageSetup_normal.svg"));
         this.generateAndSetSearchText(PageSetupPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 import com.fr.base.Parameter;
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
@@ -28,7 +28,7 @@ public class ReportParameterAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/p_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportPrintSettingAction.java

@@ -2,7 +2,7 @@ package com.fr.design.actions.report;
 
 import com.fr.base.print.PrintSettingsAttrMark;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -27,7 +27,7 @@ public class ReportPrintSettingAction extends JWorkBookAction {
         this.setMenuKeySet(REPORT_APP_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("com/fr/web/images/print_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("com/fr/web/images/print_normal.svg"));
         this.setSearchText(ReportPrintSettingPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -2,7 +2,7 @@ package com.fr.design.actions.report;
 
 import com.fr.base.iofile.attr.WatermarkAttr;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -28,7 +28,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_WATERMARK);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/watermark_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/watermark_normal.svg"));
         this.generateAndSetSearchText(WatermarkPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWebAttrAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -30,7 +30,7 @@ public class ReportWebAttrAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_WEB_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/webreportattribute_normal.svg"));
+		this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/webreportattribute_normal.svg"));
 		this.generateAndSetSearchText(ReportWebAttrPane.class.getName());
 	}
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -27,7 +27,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
         this.setMenuKeySet(KeySetUtils.REPORT_WRITE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/reportWriteAttr_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_report/reportWriteAttr_normal.svg"));
         this.generateAndSetSearchText(ReportWriteAttrPane.class.getName());
 
     }

designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.config.Configuration;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
@@ -31,7 +31,7 @@ public class ServerConfigManagerAction extends UpdateAction {
         this.setMenuKeySet(SERVER_CONFIG_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/edit_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/edit_normal.svg"));
         this.generateAndSetSearchText(EditReportServerParameterPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java

@@ -1,7 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
-import com.fr.config.Configuration;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
@@ -9,12 +8,9 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.IOUtils;
 
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
-import com.fr.transaction.Worker;
-import com.fr.transaction.WorkerCallBack;
 import com.fr.transaction.WorkerFacade;
 
 import javax.swing.*;
@@ -32,7 +28,7 @@ public class StyleListAction extends UpdateAction {
         this.setMenuKeySet(PREDEFINED_STYLES);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/style_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_web/style_normal.svg"));
         this.generateAndSetSearchText(StyleManagerPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicDialog;
@@ -23,7 +23,7 @@ public class WidgetManagerAction extends UpdateAction {
         this.setMenuKeySet(WIDGET_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
+        this.setSmallIcon(IconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

@@ -25,7 +25,7 @@ import javax.swing.UIManager;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 
-import com.fr.base.svg.SVGIconUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
@@ -59,14 +59,14 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
 
     private static final Color LINE_COLOR = new Color(0xababab);
 
-    private static final Icon ADD_WORK_SHEET = SVGIconUtils.readIcon("com/fr/base/images/oem/add_worksheet_normal.svg");
+    private static final Icon ADD_WORK_SHEET = IconUtils.readIcon("com/fr/base/images/oem/add_worksheet_normal.svg");
-    protected static final Icon ADD_POLY_SHEET = SVGIconUtils.readIcon("com/fr/design/images/sheet/add_polysheet_normal.svg");
+    protected static final Icon ADD_POLY_SHEET = IconUtils.readIcon("com/fr/design/images/sheet/add_polysheet_normal.svg");
-    private static final Icon WORK_SHEET_ICON = SVGIconUtils.readIcon("com/fr/base/images/oem/worksheet_normal.svg");
+    private static final Icon WORK_SHEET_ICON = IconUtils.readIcon("com/fr/base/images/oem/worksheet_normal.svg");
-    private static final Icon POLY_SHEET_ICON = SVGIconUtils.readIcon("com/fr/design/images/sheet/polysheet_normal.svg");
+    private static final Icon POLY_SHEET_ICON = IconUtils.readIcon("com/fr/design/images/sheet/polysheet_normal.svg");
-    private static final Icon LEFT_ICON = SVGIconUtils.readIcon("com/fr/design/images/sheet/pre_page_normal.svg");
+    private static final Icon LEFT_ICON = IconUtils.readIcon("com/fr/design/images/sheet/pre_page_normal.svg");
-    private static final Icon RIGHT_ICON = SVGIconUtils.readIcon("com/fr/design/images/sheet/next_page_normal.svg");
+    private static final Icon RIGHT_ICON = IconUtils.readIcon("com/fr/design/images/sheet/next_page_normal.svg");
-    private static final Icon DISABLED_LEFT_ICON = SVGIconUtils.readIcon("com/fr/design/images/sheet/pre_page_disabled.svg");
+    private static final Icon DISABLED_LEFT_ICON = IconUtils.readIcon("com/fr/design/images/sheet/pre_page_disabled.svg");
-    private static final Icon DISABLED_RIGHT_ICON = SVGIconUtils.readIcon("com/fr/design/images/sheet/next_page_disabled.svg");
+    private static final Icon DISABLED_RIGHT_ICON = IconUtils.readIcon("com/fr/design/images/sheet/next_page_disabled.svg");
     private static final int NUM = 10;
 
     private static final int ICON_SEP_DISTANCE = 8;