From 0b7a73d83288966ab43abe8b7c11ea5526303408 Mon Sep 17 00:00:00 2001 From: pengda Date: Thu, 12 Sep 2019 10:53:33 +0800 Subject: [PATCH] =?UTF-8?q?sonar=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,?= =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/cell/settingpane/CellStylePane.java | 3 ++- .../mainframe/form/FormReportComponentComposite.java | 3 ++- .../com/fr/grid/AbstractGridHeaderMouseHandler.java | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java index 1487908e7..370677860 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java @@ -102,7 +102,8 @@ public class CellStylePane extends AbstractCellAttrPane { } Style style = cellElement.getStyle(); if (style == null) { - style = style.DEFAULT_STYLE; + style = Style.DEFAULT_STYLE; + } style = stylePane.updateStyle(style); cellElement.setStyle(style); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormReportComponentComposite.java b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormReportComponentComposite.java index 17f4bf348..a31dea5b3 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormReportComponentComposite.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormReportComponentComposite.java @@ -19,6 +19,7 @@ import com.fr.grid.Grid; import com.fr.grid.GridUtils; import com.fr.report.ReportHelper; import com.fr.report.worksheet.FormElementCase; +import com.fr.stable.AssistUtils; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -128,7 +129,7 @@ public class FormReportComponentComposite extends JComponent implements TargetMo int row = reportPane.getSelection().getSelectedRows()[0]; double rowLength = reportPane.getSelection().getSelectedRows().length; double rowExtent = reportPane.getGrid().getVerticalExtent(); - if (columnLength == 0 || rowLength == 0) { + if (AssistUtils.equals(columnLength, 0d) || AssistUtils.equals(rowLength, 0d)) { return ScreenResolution.getScreenResolution(); } double time = (columnExtent / columnLength) < (rowExtent / rowLength) ? (columnExtent / columnLength) : (rowExtent / rowLength); diff --git a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java index 6c9363b9f..3873ae2e7 100644 --- a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java +++ b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java @@ -112,14 +112,18 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter { if (between(evt, tmpSize1, tmpSize2)) { if (index >= dragIndex) { try { - method.invoke(report, dragIndex, FU.valueOfPix(evtOffset(evt, oldEndValueSize), resolution)); + if(method != null) { + method.invoke(report, dragIndex, FU.valueOfPix(evtOffset(evt, oldEndValueSize), resolution)); + } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } //sizeList.set(dragIndex, FU.valueOfPix(evtOffset(evt, oldEndValueSize), resolution)); } else { try { - method.invoke(report, index, FU.valueOfPix(evtOffset(evt, (int) tmpSize1), resolution)); + if(method != null) { + method.invoke(report, index, FU.valueOfPix(evtOffset(evt, (int) tmpSize1), resolution)); + } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } @@ -127,7 +131,9 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter { // from all to do. for (int h = (dragIndex - 1); h > index; h--) { try { - method.invoke(report, h, UNIT.ZERO); + if(method != null) { + method.invoke(report, h, UNIT.ZERO); + } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); }