hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Fix tooltip

Browse Source
This commit is contained in:
Clément Fournier
2019-01-24 00:09:31 +01:00
parent ec4ff88fd5
commit 70ab933d2c
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import net.sourceforge.pmd.lang.Parser;
import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.util.fxdesigner.DesignerRoot; import net.sourceforge.pmd.util.fxdesigner.DesignerRoot;
import net.sourceforge.pmd.util.fxdesigner.model.LogEntry.Category; import net.sourceforge.pmd.util.fxdesigner.model.LogEntry.Category;
import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
/** /**
@ -28,15 +29,6 @@ import net.sourceforge.pmd.util.fxdesigner.model.LogEntry.Category;
public class ASTManager { public class ASTManager {
private final DesignerRoot designerRoot; private final DesignerRoot designerRoot;
/**
* Last valid source that was compiled, corresponds to {@link #compilationUnit}.
*/
private String lastValidSource;
/**
* Last language version used.
*/
private LanguageVersion lastLanguageVersion;
/** /**
* Most up-to-date compilation unit. Is null if the current source cannot be parsed. * Most up-to-date compilation unit. Is null if the current source cannot be parsed.
*/ */
@ -45,6 +37,14 @@ public class ASTManager {
* Selected language version. * Selected language version.
*/ */
private final Var<LanguageVersion> languageVersion = Var.newSimpleVar(LanguageRegistry.getDefaultLanguage().getDefaultVersion()); private final Var<LanguageVersion> languageVersion = Var.newSimpleVar(LanguageRegistry.getDefaultLanguage().getDefaultVersion());
/**
* Last valid source that was compiled, corresponds to {@link #compilationUnit}.
*/
private String lastValidSource;
/**
* Last language version used.
*/
private LanguageVersion lastLanguageVersion;
public ASTManager(DesignerRoot owner) { public ASTManager(DesignerRoot owner) {
@ -53,7 +53,8 @@ public class ASTManager {
public LanguageVersion getLanguageVersion() { public LanguageVersion getLanguageVersion() {
return languageVersion.getValue(); LanguageVersion ver = languageVersion.getValue();
return ver == null ? DesignerUtil.defaultLanguageVersion() : ver;
} }
@ -81,8 +82,8 @@ public class ASTManager {
*/ */
public Optional<Node> updateIfChanged(String source, ClassLoader classLoader) throws ParseAbortedException { public Optional<Node> updateIfChanged(String source, ClassLoader classLoader) throws ParseAbortedException {
if (compilationUnit.isPresent() if (compilationUnit.isPresent()
&& getLanguageVersion().equals(lastLanguageVersion) && getLanguageVersion().equals(lastLanguageVersion)
&& StringUtils.equals(source, lastValidSource)) { && StringUtils.equals(source, lastValidSource)) {
return getCompilationUnit(); return getCompilationUnit();
} }
LanguageVersionHandler languageVersionHandler = getLanguageVersion().getLanguageVersionHandler(); LanguageVersionHandler languageVersionHandler = getLanguageVersion().getLanguageVersionHandler();

2
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/NodeParentageCrumbBar.java
View File

@ -53,7 +53,7 @@ public class NodeParentageCrumbBar extends BreadCrumbBar<Node> {
Button button = originalCrumbFactory.call(item); Button button = originalCrumbFactory.call(item);
if (item == ellipsisCrumb) { if (item == ellipsisCrumb) {
button.setText("... (" + numElidedNodes + ")"); button.setText("... (" + numElidedNodes + ")");
button.setTooltip(new Tooltip(numElidedNodes + " parents are not shown")); button.setTooltip(new Tooltip(numElidedNodes + " ancestors are not shown"));
} }
// we use that to communicate the node later on // we use that to communicate the node later on
button.setUserData(item); button.setUserData(item);