Merge pull request #1039 in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0

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

designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java

@@ -125,60 +125,58 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser
 
     private class UICheckBoxUI extends MetalCheckBoxUI {
         @Override
-        public void paint(Graphics g, JComponent c) {
-            synchronized (this) {
-                AbstractButton b = (AbstractButton) c;
-                ButtonModel model = b.getModel();
-                Dimension size = c.getSize();
-                Font f = c.getFont();
-                g.setFont(f);
-                FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f);
-
-                Rectangle viewRect = new Rectangle(size);
-                Rectangle iconRect = new Rectangle();
-                Rectangle textRect = new Rectangle();
-
-                Insets i = c.getInsets();
-                viewRect.x += i.left;
-                viewRect.y += i.top;
-                viewRect.width -= (i.right + viewRect.x);
-                viewRect.height -= (i.bottom + viewRect.y);
-
-                Icon altIcon = b.getIcon();
-
-                String text = SwingUtilities.layoutCompoundLabel(
-                        c, fm, b.getText(), altIcon != null ? altIcon : getDefaultIcon(),
-                        b.getVerticalAlignment(), b.getHorizontalAlignment(),
-                        b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
-                        viewRect, iconRect, textRect, b.getIconTextGap());
-
-                // fill background
-                if (c.isOpaque()) {
-                    g.setColor(b.getBackground());
-                    g.fillRect(0, 0, size.width, size.height);
-                }
-
-                Graphics2D g2d = (Graphics2D) g;
-                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                if (model.isSelected()) {
-                    GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL,
-                            model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0);
-                } else if (model.isRollover() && !model.isSelected()) {
-                    g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED);
-                    g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
-                } else {
-                    g.setColor(UIConstants.LINE_COLOR);
-                    g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
-                }
+        public synchronized void paint(Graphics g, JComponent c) {
+            AbstractButton b = (AbstractButton) c;
+            ButtonModel model = b.getModel();
+            Dimension size = c.getSize();
+            Font f = c.getFont();
+            g.setFont(f);
+            FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f);
+
+            Rectangle viewRect = new Rectangle(size);
+            Rectangle iconRect = new Rectangle();
+            Rectangle textRect = new Rectangle();
+
+            Insets i = c.getInsets();
+            viewRect.x += i.left;
+            viewRect.y += i.top;
+            viewRect.width -= (i.right + viewRect.x);
+            viewRect.height -= (i.bottom + viewRect.y);
+
+            Icon altIcon = b.getIcon();
+
+            String text = SwingUtilities.layoutCompoundLabel(
+                    c, fm, b.getText(), altIcon != null ? altIcon : getDefaultIcon(),
+                    b.getVerticalAlignment(), b.getHorizontalAlignment(),
+                    b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
+                    viewRect, iconRect, textRect, b.getIconTextGap());
+
+            // fill background
+            if (c.isOpaque()) {
+                g.setColor(b.getBackground());
+                g.fillRect(0, 0, size.width, size.height);
+            }
 
-                if (model.isSelected()) {
-                    UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2);
-                }
-                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+            Graphics2D g2d = (Graphics2D) g;
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            if (model.isSelected()) {
+                GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL,
+                        model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0);
+            } else if (model.isRollover() && !model.isSelected()) {
+                g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED);
+                g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
+            } else {
+                g.setColor(UIConstants.LINE_COLOR);
+                g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC);
+            }
 
-                // Draw the Text
-                drawLine(text, g, b, c, textRect, fm);
+            if (model.isSelected()) {
+                UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2);
             }
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+
+            // Draw the Text
+            drawLine(text, g, b, c, textRect, fm);
         }
 
         private void drawLine(String text, Graphics g, AbstractButton b, JComponent c, Rectangle textRect, FontMetrics fm) {

designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBoxUI.java

@@ -64,7 +64,7 @@ public class UICheckBoxUI extends MetalCheckBoxUI {
         }
     }
 
-    static BasicStroke focusStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 1.0f, new float[]{1.0f / 1.0f}, 1.0f);
+    static BasicStroke focusStroke = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 1.0f, new float[]{1.0f}, 1.0f);
 
     protected void paintFocus(Graphics g, Rectangle t, Dimension arg2) {
         if (!ThemeUtils.BUTTON_FOCUS) {

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@@ -84,6 +84,7 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
                     LazyComboBox.this.loadList(get());
                 } catch (InterruptedException | ExecutionException exception) {
                     FineLoggerFactory.getLogger().debug(exception.getMessage());
+                    Thread.currentThread().interrupt();
                 }
                 LazyComboBox.this.showPopup();
             }

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBoxTest.java

@@ -40,6 +40,7 @@ public class LazyComboBoxTest {
 					Thread.sleep(3000);
 				} catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
+					Thread.currentThread().interrupt();
 				}
 				return m;
 			}