From 20c4524cab35dce2761a565d3006d96d2951d40c Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Wed, 19 Jul 2017 18:47:53 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20PMD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/ReportComponentComposite.java | 3 ++-
 designer_form/src/com/fr/design/mainframe/FormArea.java   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
index b3ab87a28..d51db1770 100644
--- a/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
+++ b/designer/src/com/fr/design/mainframe/ReportComponentComposite.java
@@ -30,6 +30,7 @@ import com.fr.report.report.TemplateReport;
 public class ReportComponentComposite extends JComponent {
 
     private static final int MAX = 400;
+    private static final int HUND = 100;
     private static final int MIN = 10;
     private JWorkBook parent;
     private UIModeControlContainer parentContainer = null;
@@ -68,7 +69,7 @@ public class ReportComponentComposite extends JComponent {
             double value = Integer.parseInt(jSliderContainer.getShowVal().getText().substring(0, jSliderContainer.getShowVal().getText().indexOf("%")));
             value = value>MAX ? MAX : value;
             value = value<MIN ? MIN : value;
-            int resolution =  (int) (ScreenResolution.getScreenResolution()*value/100);
+            int resolution =  (int) (ScreenResolution.getScreenResolution()*value/HUND);
             HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setScale(resolution);
         }
 
diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java
index 2a321cd32..0d0e05f04 100644
--- a/designer_form/src/com/fr/design/mainframe/FormArea.java
+++ b/designer_form/src/com/fr/design/mainframe/FormArea.java
@@ -51,8 +51,8 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 	private static final double SLIDER_MIN = 10.0;
 	public static final double DEFAULT_SLIDER = 100.0;
 	private static final int ROTATIONS = 50;
-	private static final int showValMax = 400;
-	private static final int showValMin = 10;
+	private static final int SHOWVALMAX = 400;
+	private static final int SHOWVALMIN = 10;
 	private FormDesigner designer;
 	private int horizontalValue = 0;
 	private int verticalValue = 0;
@@ -158,8 +158,8 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 			public void insertUpdate(DocumentEvent e) {
 //				slidePane.getShowVal().getDocument()
 				double value = Integer.parseInt(slidePane.getShowVal().getText().substring(0, slidePane.getShowVal().getText().indexOf("%")));
-				value = value>showValMax ? showValMax : value;
-				value = value<showValMin ? showValMin : value;
+				value = value>SHOWVALMAX ? SHOWVALMAX : value;
+				value = value<SHOWVALMIN ? SHOWVALMIN : value;
 				reCalculateRoot(value, true);
 				JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
 				if(form != null){