phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unneeded recompilation causing loss of node focus

Browse Source
This commit is contained in:
Clément Fournier
2017-09-08 00:26:03 +02:00
parent 61c98d25cb
commit dfb6bd4d50
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerWindowPresenter.java
View File

@ -89,7 +89,13 @@ public class DesignerWindowPresenter {
});
view.getRefreshASTButton().setOnAction(this::onRefreshASTClicked);
view.sourceCodeProperty().addListener((observable, oldValue, newValue) -> view.notifyOutdatedAST());
view.sourceCodeProperty().addListener((observable, oldValue, newValue) -> {
if (model.isRecompilationNeeded(newValue)) {
view.notifyOutdatedAST();
} else {
view.acknowledgeUpdatedAST();
}
});
onRefreshASTClicked(null); // Restore AST and XPath results
}
@ -205,7 +211,10 @@ public class DesignerWindowPresenter {
private void onRefreshASTClicked(ActionEvent event) {
refreshAST();
String source = view.getCodeEditorArea().getText();
if (model.isRecompilationNeeded(source)) {
refreshAST(source);
}
if (StringUtils.isNotBlank(view.getXpathExpressionArea().getText())) {
evaluateXPath();
} else {
@ -215,10 +224,10 @@ public class DesignerWindowPresenter {
/** Refresh the AST view with the updated code. */
private void refreshAST() {
private void refreshAST(String source) {
Node n = null;
try {
n = model.getCompilationUnit(view.getCodeEditorArea().getText());
n = model.getCompilationUnit(source);
} catch (ParseTimeException e) {
notifyParseTimeException(e);
}

8
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ASTManager.java
View File

@ -97,9 +97,17 @@ public class ASTManager {
}
public boolean isRecompilationNeeded(String source) {
return !StringUtils.equals(source, lastValidSource)
|| !languageVersion.get().equals(lastLanguageVersion);
}
/**
* Refreshes the compilation unit given the current parameters of the model.
*
* @param source Source code
*
* @throws ParseTimeException if parsing or one of the visitors fails. The cause is preserved.
*/
public Node getCompilationUnit(String source) throws ParseTimeException {