Merge pull request #1042 in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0

* commit 'eb9e6722de39fa461ddd517361a8c3baa73207ca':
  无JIRA任务 sonar问题修复

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -263,6 +263,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error("Map Save Error");
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -658,9 +659,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      */
     public void saveXMLFile() {
         File xmlFile = this.getDesignerEnvFile();
-        if (xmlFile == null) {
-            return;
-        }
         if (!xmlFile.getParentFile().exists()) {//建立目录.
             StableUtils.mkdirs(xmlFile.getParentFile());
         }

designer-base/src/main/java/com/fr/design/layout/TableLayout.java

@@ -1218,7 +1218,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      * @param z                indicates row or column
      * @param availableSize    amount of space available in the container
      */
-
+    @SuppressWarnings("squid:S3518")
     protected void assignFillSize(int z, int availableSize) {
         // Skip if there is no more space to allocate
         if (availableSize <= 0)
@@ -1290,7 +1290,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      * @return the amount of space available after absolute crs have been assigned
      *         sizes
      */
-
+    @SuppressWarnings("squid:S3518")
     protected int assignPrefMinSize
             (int z, int availableSize, double typeOfSize) {
         // Get variables referring to columns or rows (crs)
@@ -1727,7 +1727,7 @@ public class TableLayout implements LayoutManager2, Serializable {
      *
      * @return a dimension indicating the container's preferred or minimum size
      */
-
+    @SuppressWarnings("squid:S3518")
     protected int calculateLayoutSize
             (Container container, int z, double typeOfSize, Entry entryList[],
              Dimension prefMinSize[]) {