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

Issue #2609: Refactor MainFrame

This commit is contained in:
Vladislav Lisetskiy 2016-02-09 00:05:47 +03:00
parent 07523b8de2
commit e02ffc5681
2 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrame.java
View File

@ -113,17 +113,15 @@ public class MainFrame extends JFrame {
* @param sourceFile the file to open.
*/
public void openFile(File sourceFile) {
if (sourceFile != null) {
try {
setTitle("Checkstyle GUI : " + sourceFile.getName());
model.openFile(sourceFile);
reloadAction.setEnabled(true);
textArea.setText(model.getText());
treeTable.setLinePositionMap(model.getLinesToPosition());
}
catch (final CheckstyleException ex) {
JOptionPane.showMessageDialog(this, ex.getMessage());
}
try {
model.openFile(sourceFile);
setTitle(model.getTitle());
reloadAction.setEnabled(model.isReloadActionEnabled());
textArea.setText(model.getText());
treeTable.setLinePositionMap(model.getLinesToPosition());
}
catch (final CheckstyleException ex) {
JOptionPane.showMessageDialog(this, ex.getMessage());
}
}

66
src/main/java/com/puppycrawl/tools/checkstyle/gui/MainFrameModel.java
View File

@ -52,6 +52,12 @@ public class MainFrameModel {
/** Text for a frame's text area. */
private String text;
/** Title for the main frame. */
private String title = "Checkstyle GUI";
/** Whether the reload action is enabled. */
private boolean reloadActionEnabled;
/** Instantiate the model. */
public MainFrameModel() {
parseTreeTableModel = new ParseTreeTableModel(null);
@ -73,6 +79,20 @@ public class MainFrameModel {
return text;
}
/**
* @return title for the main frame.
*/
public String getTitle() {
return title;
}
/**
* @return true if the reload action is enabled.
*/
public boolean isReloadActionEnabled() {
return reloadActionEnabled;
}
/**
* Whether a file chooser should accept the file as a source file.
* @param file the file to check.
@ -116,30 +136,34 @@ public class MainFrameModel {
* @throws CheckstyleException if the file can not be parsed.
*/
public void openFile(File file) throws CheckstyleException {
try {
currentFile = file;
final DetailAST parseTree = parseFile(file);
parseTreeTableModel.setParseTree(parseTree);
final String[] sourceLines = getFileText(file).toLinesArray();
if (file != null) {
try {
currentFile = file;
title = "Checkstyle GUI : " + file.getName();
reloadActionEnabled = true;
final DetailAST parseTree = parseFile(file);
parseTreeTableModel.setParseTree(parseTree);
final String[] sourceLines = getFileText(file).toLinesArray();
// clear for each new file
linesToPosition.clear();
// starts line counting at 1
linesToPosition.add(0);
// clear for each new file
linesToPosition.clear();
// starts line counting at 1
linesToPosition.add(0);
final StringBuilder sb = new StringBuilder();
// insert the contents of the file to the text area
for (final String element : sourceLines) {
linesToPosition.add(sb.length());
sb.append(element).append(System.lineSeparator());
final StringBuilder sb = new StringBuilder();
// insert the contents of the file to the text area
for (final String element : sourceLines) {
linesToPosition.add(sb.length());
sb.append(element).append(System.lineSeparator());
}
text = sb.toString();
}
catch (IOException | ANTLRException ex) {
final String exceptionMsg = String.format(Locale.ROOT,
"%s occurred while opening file %s.",
ex.getClass().getSimpleName(), file.getPath());
throw new CheckstyleException(exceptionMsg, ex);
}
text = sb.toString();
}
catch (IOException | ANTLRException ex) {
final String exceptionMsg = String.format(Locale.ROOT,
"%s occurred while opening file %s.",
ex.getClass().getSimpleName(), file.getPath());
throw new CheckstyleException(exceptionMsg, ex);
}
}