mirror of
https://github.com/arduino/Arduino.git
synced 2024-11-29 10:24:12 +01:00
Fix rebase errors
This commit is contained in:
parent
29e79c8157
commit
300b1d7290
@ -1425,7 +1425,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
menu.addMenuListener(new MenuListener() {
|
||||
@Override
|
||||
public void menuSelected(MenuEvent e) {
|
||||
boolean enabled = textarea.getSelectedText() != null;
|
||||
boolean enabled = getCurrentTab().getSelectedText() != null;
|
||||
cutItem.setEnabled(enabled);
|
||||
copyItem.setEnabled(enabled);
|
||||
}
|
||||
|
@ -42,6 +42,7 @@ import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
Loading…
Reference in New Issue
Block a user