Merge pull request #1176 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0

* commit '228010dbe7ff2953f3b6c9ecabb99bdd44dbf3ee':
  REPORT-22291 撤销
  REPORT-20329 sonar问题修复
  REPORT-22291 模版版本控制，远程设计刚升级到10.0.4的工程，默认配置项开启

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -310,7 +310,6 @@ public class PreferencePane extends BasicPane {
                 gcButton.setEnabled(gcEnableCheckBox.isSelected());
             }
         });
-
         //集群下禁用
         if (ClusterBridge.isClusterMode()) {
             gcEnableCheckBox.setEnabled(false);

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java

@@ -374,7 +374,7 @@ public class SyntaxView extends View implements TabExpander,
 				if (host.isCodeFoldingEnabled()) {
 					visibleLineCount -= host.getFoldManager().getHiddenLineCount();
 				}
-				return visibleLineCount * lineHeight;
+				return (float) visibleLineCount * lineHeight;
 			default:
 				throw new IllegalArgumentException("Invalid axis: " + axis);
 		}