Merge pull request #1143 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0

* commit '9008df794c1981c7cef83c562ff7b9d6e8ab6146':
  无jira任务，sonar问题修复

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -42,7 +42,7 @@ import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_M
 
 public class DesignerLogHandler {
     
-    private static final SimpleDateFormat LOG_SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private final SimpleDateFormat LOG_SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     
     private static final int GAP_X = -150;
     

designer-base/src/main/java/com/fr/design/update/ui/dialog/EncodingDetect.java

@@ -447,11 +447,7 @@ class BytesEncodingDetect extends Encoding {
 	          bfchars++;
 	          totalfreq += 500;
 	          row = rawtext[i] - 0x81;
-	          if (0x40 <= rawtext[i + 1] && rawtext[i + 1] <= 0x7E) {
+	          column = rawtext[i + 1] - 0x40;
-	            column = rawtext[i + 1] - 0x40;
-	          } else {
-	            column = rawtext[i + 1] - 0x40;
-	          }
 	          // System.out.println("extended row " + row + " column " + column + " rawtext[i] " + rawtext[i]);
 	          if (Big5PFreq[row][column] != 0) {
 	            bffreq += Big5PFreq[row][column];

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -91,8 +91,8 @@ public class UpdateMainDialog extends UIDialog {
     private static final String UPDATE_CACHE_STATE_FAIL = "fail";
     private static final String UPDATE_CACHE_STATE_SUCCESS = "success";
 
-    private static final SimpleDateFormat CHANGELOG_FORMAT = new SimpleDateFormat("M/d/y, h:m:s a", Locale.ENGLISH);
+    private final SimpleDateFormat CHANGELOG_FORMAT = new SimpleDateFormat("M/d/y, h:m:s a", Locale.ENGLISH);
-    private static final SimpleDateFormat UPDATE_INFO_TABLE_FORMAT = new SimpleDateFormat("yyyy.MM.dd");
+    private final SimpleDateFormat UPDATE_INFO_TABLE_FORMAT = new SimpleDateFormat("yyyy.MM.dd");
 
     private JSONObject downloadFileConfig;
     //最新版本标签

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -56,7 +56,7 @@ public class DesignUtils {
         DesignUtils.port = port;
     }
 
-    public static int getPort() {
+    public synchronized static int getPort() {
         return port;
     }