rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Fix rebase errors

Browse Source
This commit is contained in:
Martino Facchin 2016-08-26 16:40:05 +02:00
parent 29e79c8157
commit 300b1d7290
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/Editor.java
View File

@ -1425,7 +1425,7 @@ public class Editor extends JFrame implements RunnerListener {
menu.addMenuListener(new MenuListener() { menu.addMenuListener(new MenuListener() {
@Override @Override
public void menuSelected(MenuEvent e) { public void menuSelected(MenuEvent e) {
boolean enabled = textarea.getSelectedText() != null; boolean enabled = getCurrentTab().getSelectedText() != null;
cutItem.setEnabled(enabled); cutItem.setEnabled(enabled);
copyItem.setEnabled(enabled); copyItem.setEnabled(enabled);
} }

1
app/src/processing/app/SketchController.java
View File

@ -42,6 +42,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;