TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1566: Constructor definition in wrong order fixed

This commit is contained in:
Ruslan Diachenko 2015-08-08 23:15:41 +01:00
parent 9e90fceb77
commit 39e6f8e86c
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
View File

@ -243,6 +243,12 @@ class FileDrop {
private final Border dragBorder;
private final Listener listener;
public FileDropTargetListener(Component component, Border dragBorder, Listener listener) {
this.component = component;
this.dragBorder = dragBorder;
this.listener = listener;
}
@Override
public void dragEnter(DropTargetDragEvent evt) {
if (isDragOk(evt)) {
@ -310,12 +316,6 @@ class FileDrop {
evt.rejectDrag();
}
}
public FileDropTargetListener(Component component, Border dragBorder, Listener listener) {
this.component = component;
this.dragBorder = dragBorder;
this.listener = listener;
}
}
}

80
src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeInfoPanel.java
View File

@ -66,6 +66,46 @@ public class ParseTreeInfoPanel extends JPanel {
private final Action reloadAction;
private final List<Integer> lines2position = new ArrayList<>();
/**
* Create a new ParseTreeInfoPanel instance.
*/
public ParseTreeInfoPanel() {
setLayout(new BorderLayout());
parseTreeModel = new ParseTreeModel(null);
final JTreeTable treeTable = new JTreeTable(parseTreeModel);
final JScrollPane sp = new JScrollPane(treeTable);
this.add(sp, BorderLayout.NORTH);
final JButton fileSelectionButton =
new JButton(new FileSelectionAction());
reloadAction = new ReloadAction();
reloadAction.setEnabled(false);
final JButton reloadButton = new JButton(reloadAction);
jTextArea = new JTextArea(20, 15);
jTextArea.setEditable(false);
treeTable.setEditor(jTextArea);
treeTable.setLinePositionMap(lines2position);
final JScrollPane sp2 = new JScrollPane(jTextArea);
this.add(sp2, BorderLayout.CENTER);
final JPanel p = new JPanel(new GridLayout(1, 2));
this.add(p, BorderLayout.SOUTH);
p.add(fileSelectionButton);
p.add(reloadButton);
try {
new FileDrop(sp, new FileDropListener(sp));
}
catch (final TooManyListenersException ignored) {
showErrorDialog(null, "Cannot initialize Drag and Drop support");
}
}
public void openAst(DetailAST parseTree, final Component parent) {
parseTreeModel.setParseTree(parseTree);
reloadAction.setEnabled(true);
@ -167,46 +207,6 @@ public class ParseTreeInfoPanel extends JPanel {
return System.getProperty("file.encoding", "UTF-8");
}
/**
* Create a new ParseTreeInfoPanel instance.
*/
public ParseTreeInfoPanel() {
setLayout(new BorderLayout());
parseTreeModel = new ParseTreeModel(null);
final JTreeTable treeTable = new JTreeTable(parseTreeModel);
final JScrollPane sp = new JScrollPane(treeTable);
this.add(sp, BorderLayout.NORTH);
final JButton fileSelectionButton =
new JButton(new FileSelectionAction());
reloadAction = new ReloadAction();
reloadAction.setEnabled(false);
final JButton reloadButton = new JButton(reloadAction);
jTextArea = new JTextArea(20, 15);
jTextArea.setEditable(false);
treeTable.setEditor(jTextArea);
treeTable.setLinePositionMap(lines2position);
final JScrollPane sp2 = new JScrollPane(jTextArea);
this.add(sp2, BorderLayout.CENTER);
final JPanel p = new JPanel(new GridLayout(1, 2));
this.add(p, BorderLayout.SOUTH);
p.add(fileSelectionButton);
p.add(reloadButton);
try {
new FileDrop(sp, new FileDropListener(sp));
}
catch (final TooManyListenersException ignored) {
showErrorDialog(null, "Cannot initialize Drag and Drop support");
}
}
private static void showErrorDialog(final Component parent, final String msg) {
final Runnable showError = new FrameShower(parent, msg);
SwingUtilities.invokeLater(showError);