From a5d6d35a8fc93b4109b1c2eeb91d7b1e880b0585 Mon Sep 17 00:00:00 2001 From: Lanlan Date: Sun, 1 Sep 2019 11:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20sonar?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/itableeditorpane/UITableModelAdapter.java | 2 +- .../java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java | 3 ++- .../src/main/java/com/fr/design/gui/style/NumberDragBar.java | 1 + .../design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index acea8dcc5..0ec8fe90c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -244,7 +244,7 @@ public abstract class UITableModelAdapter extends AbstractTabl FineLoggerFactory.getLogger().error(ee.getMessage(), ee); } } - if (getRowCount() < 1 || selectedRow.length < 0) { + if (getRowCount() < 1) { return; } diff --git a/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java b/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java index 1c3f004f9..45db9b8a6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itabpane/UITabsHeaderIconPane.java @@ -153,6 +153,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent { try { Thread.sleep(3); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } } if (currentPanel != panel) { @@ -202,7 +203,7 @@ public class UITabsHeaderIconPane extends JPanel implements UITabComponent { } @Override - public int getSelectedIndex() { + public synchronized int getSelectedIndex() { return selectedIndex; } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java b/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java index 5ab5c1698..dce3dc86d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/NumberDragBar.java @@ -127,6 +127,7 @@ public class NumberDragBar extends JComponent { revalidate(); } catch (InterruptedException e) { FineLoggerFactory.getLogger().error(e.toString()); + Thread.currentThread().interrupt(); } } }); diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java index d0c3ba93b..d606bef26 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxDocument.java @@ -366,7 +366,9 @@ public class RSyntaxDocument extends RDocument implements Iterable, */ public boolean getShouldIndentNextLine(int line) { Token t = getTokenListForLine(line); - t = t.getLastNonCommentNonWhitespaceToken(); + if (t != null) { + t = t.getLastNonCommentNonWhitespaceToken(); + } return tokenMaker.getShouldIndentNextLineAfter(t); }