From 2601845c3b3a4697de67c0937bc06df524d94bd1 Mon Sep 17 00:00:00 2001
From: "Link.Zhao" <Link.Zhao@fanruan.com>
Date: Sat, 3 Sep 2022 16:14:59 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-12366=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=9B=BE=E6=A0=87=E6=94=AF=E6=8C=81SVG=201?=
 =?UTF-8?q?=E3=80=81=E6=94=B9=E4=B8=8B=E6=8E=A7=E4=BB=B6=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=AF=BBicon=E6=97=B6=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/ExtraDesignClassManager.java    | 4 ++--
 .../java/com/fr/design/gui/core/WidgetOptionFactory.java    | 2 +-
 .../java/com/fr/design/designer/creator/XCreatorUtils.java  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java b/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
index 4d1493e01..11634c590 100644
--- a/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
+++ b/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
@@ -114,7 +114,7 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         for (ParameterWidgetOptionProvider provider : set) {
             WidgetOption option = WidgetOptionFactory.createByWidgetClass(
                     provider.nameForWidget(),
-                    IOUtils.readIcon(provider.iconPathForWidget()),
+                    provider.iconPathForWidget(),
                     provider.classForWidget()
             );
             result.add(option);
@@ -186,7 +186,7 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
             if (provider.isContainer() == isContainer) {
                 WidgetOption option = WidgetOptionFactory.createByWidgetClass(
                         provider.nameForWidget(),
-                        BaseUtils.readIcon(provider.iconPathForWidget()),
+                        provider.iconPathForWidget(),
                         provider.classForWidget()
                 );
                 result.add(option);
diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java
index e9ba42788..8d290ac2a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java
+++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOptionFactory.java
@@ -4,7 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.svg.IconUtils;
 import com.fr.form.ui.Widget;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 public class WidgetOptionFactory {
 
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
index e52233e0e..10a8fbfb1 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
@@ -4,6 +4,7 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.chart.BaseChartCollection;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.theme.FineColorSynchronizer;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.TemplateTheme;
@@ -72,7 +73,6 @@ import com.fr.form.ui.container.cardlayout.WCardTitleLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
-import com.fr.general.IOUtils;
 import com.fr.invoke.Reflect;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
@@ -85,13 +85,13 @@ import com.fr.report.fit.ReportFitAttr;
 import com.fr.report.fit.ReportFitConfig;
 import com.fr.stable.StringUtils;
 import com.fr.third.javax.annotation.Nonnull;
-import java.util.Set;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.util.List;
+import java.util.Set;
 
 /**
  * XCreator的相关处理
@@ -363,7 +363,7 @@ public class XCreatorUtils {
         if (StringUtils.isEmpty(iconPath)) {
             return null;
         }
-        return IOUtils.readIcon(iconPath);
+        return IconUtils.readIcon(iconPath);
     }
 
     public static boolean containComponent(Container ancestor, Container xCreator) {