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

Prefixes, gui, #512

This commit is contained in:
alexkravin 2015-01-11 14:11:32 +04:00
parent 1d6bf23ccd
commit eddd0de370
5 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
View File

@ -77,7 +77,7 @@ import javax.swing.event.EventListenerList;
*/
public class AbstractCellEditor implements CellEditor
{
private final EventListenerList mListenerList = new EventListenerList();
private final EventListenerList listenerList = new EventListenerList();
/** @see CellEditor */
@Override
@ -117,14 +117,14 @@ public class AbstractCellEditor implements CellEditor
@Override
public void addCellEditorListener(CellEditorListener l)
{
mListenerList.add(CellEditorListener.class, l);
listenerList.add(CellEditorListener.class, l);
}
/** @see CellEditor */
@Override
public void removeCellEditorListener(CellEditorListener l)
{
mListenerList.remove(CellEditorListener.class, l);
listenerList.remove(CellEditorListener.class, l);
}
/*
@ -135,7 +135,7 @@ public class AbstractCellEditor implements CellEditor
protected void fireEditingStopped()
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
// Process the listeners last to first, notifying
// those that are interested in this event
for (int i = listeners.length - 2; i >= 0; i -= 2) {
@ -153,7 +153,7 @@ public class AbstractCellEditor implements CellEditor
protected void fireEditingCanceled()
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
// Process the listeners last to first, notifying
// those that are interested in this event
for (int i = listeners.length - 2; i >= 0; i -= 2) {

22
src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractTreeTableModel.java
View File

@ -74,12 +74,12 @@ import javax.swing.tree.TreePath;
*/
public abstract class AbstractTreeTableModel implements TreeTableModel
{
private final Object mRoot;
private final EventListenerList mListenerList = new EventListenerList();
private final Object root;
private final EventListenerList listenerList = new EventListenerList();
public AbstractTreeTableModel(Object root)
{
mRoot = root;
this.root = root;
}
//
@ -89,7 +89,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
@Override
public Object getRoot()
{
return mRoot;
return root;
}
@Override
@ -118,13 +118,13 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
@Override
public void addTreeModelListener(TreeModelListener l)
{
mListenerList.add(TreeModelListener.class, l);
listenerList.add(TreeModelListener.class, l);
}
@Override
public void removeTreeModelListener(TreeModelListener l)
{
mListenerList.remove(TreeModelListener.class, l);
listenerList.remove(TreeModelListener.class, l);
}
/*
@ -139,7 +139,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
Object[] children)
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
TreeModelEvent e = null;
// Process the listeners last to first, notifying
// those that are interested in this event
@ -167,7 +167,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
Object[] children)
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
TreeModelEvent e = null;
// Process the listeners last to first, notifying
// those that are interested in this event
@ -195,7 +195,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
Object[] children)
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
TreeModelEvent e = null;
// Process the listeners last to first, notifying
// those that are interested in this event
@ -223,7 +223,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
Object[] children)
{
// Guaranteed to return a non-null array
final Object[] listeners = mListenerList.getListenerList();
final Object[] listeners = listenerList.getListenerList();
TreeModelEvent e = null;
// Process the listeners last to first, notifying
// those that are interested in this event
@ -260,7 +260,7 @@ public abstract class AbstractTreeTableModel implements TreeTableModel
}
@Override
public void setValueAt(Object aValue, Object node, int column)
public void setValueAt(Object value, Object node, int column)
{
}

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

@ -253,18 +253,18 @@ class FileDrop
private class FileDropTargetListener implements DropTargetListener
{
private final Component mC;
private final Border mDragBorder;
private final Listener mListener;
private final Component component;
private final Border dragBorder;
private final Listener listener;
@Override
public void dragEnter(DropTargetDragEvent evt)
{
if (isDragOk(evt)) {
if (mC instanceof JComponent) {
final JComponent jc = (JComponent) mC;
if (component instanceof JComponent) {
final JComponent jc = (JComponent) component;
normalBorder = jc.getBorder();
jc.setBorder(mDragBorder);
jc.setBorder(dragBorder);
}
evt.acceptDrag(DnDConstants.ACTION_COPY);
}
@ -288,8 +288,8 @@ class FileDrop
final File[] files = new File[fileList.size()];
fileList.toArray(files);
if (mListener != null) {
mListener.filesDropped(files);
if (listener != null) {
listener.filesDropped(files);
}
evt.getDropTargetContext().dropComplete(true);
@ -305,8 +305,8 @@ class FileDrop
evt.rejectDrop();
}
finally {
if (mC instanceof JComponent) {
final JComponent jc = (JComponent) mC;
if (component instanceof JComponent) {
final JComponent jc = (JComponent) component;
jc.setBorder(normalBorder);
}
}
@ -315,8 +315,8 @@ class FileDrop
@Override
public void dragExit(DropTargetEvent evt)
{
if (mC instanceof JComponent) {
final JComponent jc = (JComponent) mC;
if (component instanceof JComponent) {
final JComponent jc = (JComponent) component;
jc.setBorder(normalBorder);
}
}
@ -337,11 +337,11 @@ class FileDrop
{
}
public FileDropTargetListener(Component aC, Border aDragBorder, Listener aListener)
public FileDropTargetListener(Component component, Border dragBorder, Listener listener)
{
mC = aC;
mDragBorder = aDragBorder;
mListener = aListener;
this.component = component;
this.dragBorder = dragBorder;
this.listener = listener;
}
}

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

@ -59,11 +59,11 @@ public class ParseTreeInfoPanel extends JPanel
{
/** For Serialisation that will never happen. */
private static final long serialVersionUID = -4243405131202059043L;
private final JTreeTable mTreeTable;
private final ParseTreeModel mParseTreeModel;
private final JTextArea mJTextArea;
private File mLastDirectory = null;
private File mCurrentFile = null;
private final JTreeTable treeTable;
private final ParseTreeModel parseTreeModel;
private final JTextArea jTextArea;
private File lastDirectory = null;
private File currentFile = null;
private final Action reloadAction;
private final List<Integer> lines2position = new ArrayList<Integer>();
@ -85,9 +85,9 @@ public class ParseTreeInfoPanel extends JPanel
}
}
public void openAst(DetailAST parseTree, final Component aParent)
public void openAst(DetailAST parseTree, final Component parent)
{
mParseTreeModel.setParseTree(parseTree);
parseTreeModel.setParseTree(parseTree);
reloadAction.setEnabled(true);
// clear for each new file
@ -97,12 +97,12 @@ public class ParseTreeInfoPanel extends JPanel
// insert the contents of the file to the text area
// clean the text area before inserting the lines of the new file
if (mJTextArea.getText().length() != 0) {
mJTextArea.replaceRange("", 0, mJTextArea.getText().length());
if (jTextArea.getText().length() != 0) {
jTextArea.replaceRange("", 0, jTextArea.getText().length());
}
// move back to the top of the file
mJTextArea.moveCaretPosition(0);
jTextArea.moveCaretPosition(0);
}
private class FileSelectionAction extends AbstractAction
@ -121,7 +121,7 @@ public class ParseTreeInfoPanel extends JPanel
@Override
public void actionPerformed(ActionEvent e)
{
final JFileChooser fc = new JFileChooser( mLastDirectory );
final JFileChooser fc = new JFileChooser( lastDirectory );
final FileFilter filter = new JavaFileFilter();
fc.setFileFilter(filter);
final Component parent =
@ -151,7 +151,7 @@ public class ParseTreeInfoPanel extends JPanel
{
final Component parent =
SwingUtilities.getRoot(ParseTreeInfoPanel.this);
openFile(mCurrentFile, parent);
openFile(currentFile, parent);
}
}
@ -177,17 +177,17 @@ public class ParseTreeInfoPanel extends JPanel
}
public void openFile(File aFile, final Component aParent)
public void openFile(File file, final Component parent)
{
if (aFile != null) {
if (file != null) {
try {
Main.frame.setTitle("Checkstyle : " + aFile.getName());
final FileText text = new FileText(aFile.getAbsoluteFile(),
Main.frame.setTitle("Checkstyle : " + file.getName());
final FileText text = new FileText(file.getAbsoluteFile(),
getEncoding());
final DetailAST parseTree = parseFile(text);
mParseTreeModel.setParseTree(parseTree);
mCurrentFile = aFile;
mLastDirectory = aFile.getParentFile();
parseTreeModel.setParseTree(parseTree);
currentFile = file;
lastDirectory = file.getParentFile();
reloadAction.setEnabled(true);
final String[] sourceLines = text.toLinesArray();
@ -199,62 +199,62 @@ public class ParseTreeInfoPanel extends JPanel
// insert the contents of the file to the text area
for (String element : sourceLines)
{
getLines2position().add(mJTextArea.getText().length());
mJTextArea.append(element + "\n");
getLines2position().add(jTextArea.getText().length());
jTextArea.append(element + "\n");
}
//clean the text area before inserting the lines of the new file
if (mJTextArea.getText().length() != 0) {
mJTextArea.replaceRange("", 0, mJTextArea.getText()
if (jTextArea.getText().length() != 0) {
jTextArea.replaceRange("", 0, jTextArea.getText()
.length());
}
// insert the contents of the file to the text area
for (final String element : sourceLines) {
mJTextArea.append(element + "\n");
jTextArea.append(element + "\n");
}
// move back to the top of the file
mJTextArea.moveCaretPosition(0);
jTextArea.moveCaretPosition(0);
}
catch (final IOException ex) {
showErrorDialog(
aParent,
"Could not open " + aFile + ": " + ex.getMessage());
parent,
"Could not open " + file + ": " + ex.getMessage());
}
catch (final ANTLRException ex) {
showErrorDialog(
aParent,
"Could not parse " + aFile + ": " + ex.getMessage());
parent,
"Could not parse " + file + ": " + ex.getMessage());
}
}
}
/**
* Parses a file and returns the parse tree.
* @param aFileName the file to parse
* @param fileName the file to parse
* @return the root node of the parse tree
* @throws IOException if the file cannot be opened
* @throws ANTLRException if the file is not a Java source
* @deprecated Use {@link #parseFile(FileText)} instead
*/
@Deprecated
public static DetailAST parseFile(String aFileName)
public static DetailAST parseFile(String fileName)
throws IOException, ANTLRException
{
return parseFile(new FileText(new File(aFileName), getEncoding()));
return parseFile(new FileText(new File(fileName), getEncoding()));
}
/**
* Parses a file and returns the parse tree.
* @param aText the file to parse
* @param text the file to parse
* @return the root node of the parse tree
* @throws ANTLRException if the file is not a Java source
*/
public static DetailAST parseFile(FileText aText)
public static DetailAST parseFile(FileText text)
throws ANTLRException
{
final FileContents contents = new FileContents(aText);
final FileContents contents = new FileContents(text);
return TreeWalker.parse(contents);
}
@ -277,9 +277,9 @@ public class ParseTreeInfoPanel extends JPanel
setLayout(new BorderLayout());
final DetailAST treeRoot = null;
mParseTreeModel = new ParseTreeModel(treeRoot);
mTreeTable = new JTreeTable(mParseTreeModel);
final JScrollPane sp = new JScrollPane(mTreeTable);
parseTreeModel = new ParseTreeModel(treeRoot);
treeTable = new JTreeTable(parseTreeModel);
final JScrollPane sp = new JScrollPane(treeTable);
this.add(sp, BorderLayout.NORTH);
final JButton fileSelectionButton =
@ -289,12 +289,12 @@ public class ParseTreeInfoPanel extends JPanel
reloadAction.setEnabled(false);
final JButton reloadButton = new JButton(reloadAction);
mJTextArea = new JTextArea(20, 15);
mJTextArea.setEditable(false);
mTreeTable.setEditor(mJTextArea);
mTreeTable.setLinePositionMap(lines2position);
jTextArea = new JTextArea(20, 15);
jTextArea.setEditable(false);
treeTable.setEditor(jTextArea);
treeTable.setLinePositionMap(lines2position);
final JScrollPane sp2 = new JScrollPane(mJTextArea);
final JScrollPane sp2 = new JScrollPane(jTextArea);
this.add(sp2, BorderLayout.CENTER);
final JPanel p = new JPanel(new GridLayout(1,2));

30
src/main/java/com/puppycrawl/tools/checkstyle/gui/TreeTableModelAdapter.java
View File

@ -83,15 +83,15 @@ public class TreeTableModelAdapter extends AbstractTableModel
{
/** For Serialisation that will never happen. */
private static final long serialVersionUID = 8269213416115369275L;
private final JTree mTree;
private final TreeTableModel mTreeTableModel;
private final JTree tree;
private final TreeTableModel treeTableModel;
public TreeTableModelAdapter(TreeTableModel aTreeTableModel, JTree aTree)
public TreeTableModelAdapter(TreeTableModel treeTableModel, JTree tree)
{
this.mTree = aTree;
this.mTreeTableModel = aTreeTableModel;
this.tree = tree;
this.treeTableModel = treeTableModel;
aTree.addTreeExpansionListener(new TreeExpansionListener()
tree.addTreeExpansionListener(new TreeExpansionListener()
{
// Don't use fireTableRowsInserted() here; the selection model
// would get updated twice.
@ -112,7 +112,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
// mTree changes. We use delayedFireTableDataChanged as we can
// not be guaranteed the mTree will have finished processing
// the event before us.
aTreeTableModel.addTreeModelListener(new TreeModelListener()
treeTableModel.addTreeModelListener(new TreeModelListener()
{
@Override
public void treeNodesChanged(TreeModelEvent e)
@ -145,7 +145,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
@Override
public int getColumnCount()
{
return mTreeTableModel.getColumnCount();
return treeTableModel.getColumnCount();
}
/**
@ -154,7 +154,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
@Override
public String getColumnName(int column)
{
return mTreeTableModel.getColumnName(column);
return treeTableModel.getColumnName(column);
}
/**
@ -163,25 +163,25 @@ public class TreeTableModelAdapter extends AbstractTableModel
@Override
public Class<?> getColumnClass(int column)
{
return mTreeTableModel.getColumnClass(column);
return treeTableModel.getColumnClass(column);
}
@Override
public int getRowCount()
{
return mTree.getRowCount();
return tree.getRowCount();
}
protected Object nodeForRow(int row)
{
final TreePath treePath = mTree.getPathForRow(row);
final TreePath treePath = tree.getPathForRow(row);
return treePath.getLastPathComponent();
}
@Override
public Object getValueAt(int row, int column)
{
return mTreeTableModel.getValueAt(nodeForRow(row), column);
return treeTableModel.getValueAt(nodeForRow(row), column);
}
/**
@ -190,7 +190,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
@Override
public boolean isCellEditable(int row, int column)
{
return mTreeTableModel.isCellEditable(nodeForRow(row), column);
return treeTableModel.isCellEditable(nodeForRow(row), column);
}
/**
@ -199,7 +199,7 @@ public class TreeTableModelAdapter extends AbstractTableModel
@Override
public void setValueAt(Object value, int row, int column)
{
mTreeTableModel.setValueAt(value, nodeForRow(row), column);
treeTableModel.setValueAt(value, nodeForRow(row), column);
}
/**