From b7732143ca3b458a676e44c3a5a15d1df1006d77 Mon Sep 17 00:00:00 2001 From: bryantzzz Date: Mon, 4 Sep 2023 16:53:34 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-104638=20=E6=97=A5=E5=BF=97=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/utils/ImageUtils.java | 6 +++--- .../java/com/fr/design/designer/creator/XWFitLayout.java | 4 ++-- .../design/designer/creator/cardlayout/TabMoveAction.java | 4 ++-- .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/utils/ImageUtils.java b/designer-base/src/main/java/com/fr/design/utils/ImageUtils.java index 7bd2d406ec..1531d60a57 100644 --- a/designer-base/src/main/java/com/fr/design/utils/ImageUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/ImageUtils.java @@ -3,8 +3,8 @@ package com.fr.design.utils; import com.fr.base.BaseUtils; import com.fr.base.frpx.util.ImageIOHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.FRLogger; import com.fr.general.ImageWithSuffix; +import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreGraphHelper; import com.fr.stable.StringUtils; @@ -54,7 +54,7 @@ public class ImageUtils { return scale(srcImg, 0.5f, true); } } catch (IOException e) { - FRLogger.getLogger().info("image compress failed!"); + FineLoggerFactory.getLogger().info("image compress failed!"); } return BaseUtils.readImage(imageFile.getPath()); @@ -81,7 +81,7 @@ public class ImageUtils { desImg = scale(srcImg, 0.5f, true); } } catch (IOException e) { - FRLogger.getLogger().info("image compress failed!"); + FineLoggerFactory.getLogger().info("image compress failed!"); } return new ImageWithSuffix(desImg, TYPE_PNG); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java index 886089a0be..9d5d5dad01 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java @@ -19,7 +19,7 @@ import com.fr.form.ui.container.WBodyLayoutType; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.FRLogger; +import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import javax.swing.JOptionPane; import java.awt.Component; @@ -1245,7 +1245,7 @@ public class XWFitLayout extends XLayoutContainer { formDesigner.switchBodyLayout(this); return true; } catch (Exception e) { - FRLogger.getLogger().error(e.getMessage()); + FineLoggerFactory.getLogger().error(e.getMessage()); return false; } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveAction.java index 31d8d30654..3285dfc915 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveAction.java @@ -5,7 +5,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormHierarchyTreePane; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; -import com.fr.general.FRLogger; +import com.fr.log.FineLoggerFactory; /** * Created by zhouping on 2017/2/17. @@ -40,7 +40,7 @@ public class TabMoveAction extends FormUndoableAction { FormHierarchyTreePane.getInstance().refreshDockingView(); }catch (Exception e){ xwCardTagLayout.setSwitchingTab(false); - FRLogger.getLogger().error(e.getMessage(), e); + FineLoggerFactory.getLogger().error(e.getMessage(), e); return false; } return true; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 24ed004fff..27f6237269 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -85,7 +85,6 @@ import com.fr.form.ui.WidgetValue; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.FRLogger; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -1732,7 +1731,7 @@ public class FormDesigner extends TargetComponent
implements TreeSelection try { Thread.sleep(1500); } catch (InterruptedException e) { - FRLogger.getLogger().error(e.getMessage(), e); + FineLoggerFactory.getLogger().error(e.getMessage(), e); Thread.currentThread().interrupt(); }