Skip to content

Commit 7daf13e

Browse files
author
Federico Fissore
committed
Serial methods reference is located into a different folder. Work around this difference in order to make in editor help work as expected
1 parent ae857ef commit 7daf13e

File tree

1 file changed

+15
-22
lines changed

1 file changed

+15
-22
lines changed

app/src/processing/app/Editor.java

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,14 +1328,7 @@ public void actionPerformed(ActionEvent e) {
13281328
menu.addSeparator();
13291329

13301330
item = newJMenuItemShift(tr("Find in Reference"), 'F');
1331-
item.addActionListener(new ActionListener() {
1332-
public void actionPerformed(ActionEvent e) {
1333-
// if (textarea.isSelectionActive()) {
1334-
// handleFindReference();
1335-
// }
1336-
handleFindReference();
1337-
}
1338-
});
1331+
item.addActionListener(this::handleFindReference);
13391332
menu.add(item);
13401333

13411334
item = new JMenuItem(tr("Frequently Asked Questions"));
@@ -1920,16 +1913,20 @@ private String getCurrentKeyword() {
19201913
return text;
19211914
}
19221915

1923-
private void handleFindReference() {
1924-
String text = getCurrentKeyword();
1916+
private void handleFindReference(ActionEvent e) {
1917+
String text = getCurrentKeyword();
19251918

1926-
String referenceFile = base.getPdeKeywords().getReference(text);
1927-
if (referenceFile == null) {
1928-
statusNotice(I18n.format(tr("No reference available for \"{0}\""), text));
1929-
} else {
1930-
Base.showReference("Reference/" + referenceFile);
1931-
}
1932-
}
1919+
String referenceFile = base.getPdeKeywords().getReference(text);
1920+
if (referenceFile == null) {
1921+
statusNotice(I18n.format(tr("No reference available for \"{0}\""), text));
1922+
} else {
1923+
if (referenceFile.startsWith("Serial_")) {
1924+
Base.showReference("Serial/" + referenceFile.substring("Serial_".length()));
1925+
} else {
1926+
Base.showReference("Reference/" + referenceFile);
1927+
}
1928+
}
1929+
}
19331930

19341931

19351932
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -2969,11 +2966,7 @@ public void actionPerformed(ActionEvent e) {
29692966
menu.add(item);
29702967

29712968
final JMenuItem referenceItem = new JMenuItem(tr("Find in Reference"));
2972-
referenceItem.addActionListener(new ActionListener() {
2973-
public void actionPerformed(ActionEvent e) {
2974-
handleFindReference();
2975-
}
2976-
});
2969+
referenceItem.addActionListener(this::handleFindReference);
29772970
menu.add(referenceItem);
29782971

29792972
final JMenuItem openURLItem = new JMenuItem(tr("Open URL"));

0 commit comments

Comments
 (0)