From 93a6487be7dd61747b1c8fd1fe5c167acc003a96 Mon Sep 17 00:00:00 2001 From: Ruslan Diachenko Date: Sat, 8 Aug 2015 22:42:02 +0100 Subject: [PATCH] Issue #1566: WhitespaceAfter, DeclarationOrder, ArrayTrailingComma, ParenPad violations fixed --- .../puppycrawl/tools/checkstyle/gui/FileDrop.java | 15 +++++++-------- .../tools/checkstyle/gui/ParseTreeInfoPanel.java | 2 +- .../tools/checkstyle/gui/ParseTreeModel.java | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java index 1265af54a..41b2b2439 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java @@ -76,13 +76,12 @@ import javax.swing.border.Border; */ class FileDrop { + /* Default border color */ + private static final Color DEFAULT_BORDER_COLOR = new Color(0f, 0f, 1f, 0.25f); + private transient Border normalBorder; private final transient DropTargetListener dropListener; - /* Default border color */ - private static final Color DEFAULT_BORDER_COLOR = - new Color(0f, 0f, 1f, 0.25f); - /** * Constructs a class with a default light-blue border * and, if c is a {@link Container}, recursively @@ -97,10 +96,10 @@ class FileDrop { final Component component, final Listener listener) throws TooManyListenersException { - this( component, // Drop target - BorderFactory.createMatteBorder(2, 2, 2, 2, DEFAULT_BORDER_COLOR), // Drag border - true, // Recursive - listener); + this(component, + BorderFactory.createMatteBorder(2, 2, 2, 2, DEFAULT_BORDER_COLOR), + true, + listener); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java index 3f536fec6..44fb9e268 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java @@ -268,7 +268,7 @@ public class ParseTreeInfoPanel extends JPanel { final JScrollPane sp2 = new JScrollPane(jTextArea); this.add(sp2, BorderLayout.CENTER); - final JPanel p = new JPanel(new GridLayout(1,2)); + final JPanel p = new JPanel(new GridLayout(1, 2)); this.add(p, BorderLayout.SOUTH); p.add(fileSelectionButton); p.add(reloadButton); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java index 41c629fe6..53f9dfa56 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java @@ -35,7 +35,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; */ public class ParseTreeModel extends AbstractTreeTableModel { private static final String[] COLUMN_NAMES = { - "Tree", "Type", "Line", "Column", "Text" + "Tree", "Type", "Line", "Column", "Text", }; public ParseTreeModel(DetailAST parseTree) { @@ -55,7 +55,7 @@ public class ParseTreeModel extends AbstractTreeTableModel { final Object[] path = {root}; // no need to setup remaining info, as the call results in a // table structure changed event anyway - we just pass nulls - fireTreeStructureChanged(this, path, null, (Object[])null); + fireTreeStructureChanged(this, path, null, (Object[]) null); } @Override