Browse Source

Pull request #12669: REPORT-104638 日志模块

Merge in DESIGN/design from ~BRYANT/design:research/11.0 to research/11.0

* commit 'b7732143ca3b458a676e44c3a5a15d1df1006d77':
  REPORT-104638 日志模块
research/11.0
Bryant-赵东升 1 year ago
parent
commit
1c63f52a1a
  1. 6
      designer-base/src/main/java/com/fr/design/utils/ImageUtils.java
  2. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
  3. 4
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveAction.java
  4. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

6
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.BaseUtils;
import com.fr.base.frpx.util.ImageIOHelper; import com.fr.base.frpx.util.ImageIOHelper;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.general.ImageWithSuffix; import com.fr.general.ImageWithSuffix;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CoreGraphHelper; import com.fr.stable.CoreGraphHelper;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -54,7 +54,7 @@ public class ImageUtils {
return scale(srcImg, 0.5f, true); return scale(srcImg, 0.5f, true);
} }
} catch (IOException e) { } catch (IOException e) {
FRLogger.getLogger().info("image compress failed!"); FineLoggerFactory.getLogger().info("image compress failed!");
} }
return BaseUtils.readImage(imageFile.getPath()); return BaseUtils.readImage(imageFile.getPath());
@ -81,7 +81,7 @@ public class ImageUtils {
desImg = scale(srcImg, 0.5f, true); desImg = scale(srcImg, 0.5f, true);
} }
} catch (IOException e) { } catch (IOException e) {
FRLogger.getLogger().info("image compress failed!"); FineLoggerFactory.getLogger().info("image compress failed!");
} }
return new ImageWithSuffix(desImg, TYPE_PNG); return new ImageWithSuffix(desImg, TYPE_PNG);

4
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.WFitLayout;
import com.fr.form.ui.container.WLayout; import com.fr.form.ui.container.WLayout;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import java.awt.Component; import java.awt.Component;
@ -1245,7 +1245,7 @@ public class XWFitLayout extends XLayoutContainer {
formDesigner.switchBodyLayout(this); formDesigner.switchBodyLayout(this);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
FRLogger.getLogger().error(e.getMessage()); FineLoggerFactory.getLogger().error(e.getMessage());
return false; return false;
} }
} }

4
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.design.mainframe.FormHierarchyTreePane;
import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.CardSwitchButton;
import com.fr.form.ui.container.cardlayout.WTabFitLayout; 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. * Created by zhouping on 2017/2/17.
@ -40,7 +40,7 @@ public class TabMoveAction extends FormUndoableAction {
FormHierarchyTreePane.getInstance().refreshDockingView(); FormHierarchyTreePane.getInstance().refreshDockingView();
}catch (Exception e){ }catch (Exception e){
xwCardTagLayout.setSwitchingTab(false); xwCardTagLayout.setSwitchingTab(false);
FRLogger.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
return false; return false;
} }
return true; return true;

3
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.WBorderLayout;
import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WFitLayout;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogger;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -1732,7 +1731,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
try { try {
Thread.sleep(1500); Thread.sleep(1500);
} catch (InterruptedException e) { } catch (InterruptedException e) {
FRLogger.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }

Loading…
Cancel
Save