Skip to content

Commit 300b1d7

Browse files
committed
Fix rebase errors
1 parent 29e79c8 commit 300b1d7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

app/src/processing/app/Editor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ public void actionPerformed(ActionEvent e) {
14251425
menu.addMenuListener(new MenuListener() {
14261426
@Override
14271427
public void menuSelected(MenuEvent e) {
1428-
boolean enabled = textarea.getSelectedText() != null;
1428+
boolean enabled = getCurrentTab().getSelectedText() != null;
14291429
cutItem.setEnabled(enabled);
14301430
copyItem.setEnabled(enabled);
14311431
}

app/src/processing/app/SketchController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.nio.file.Files;
4343
import java.nio.file.Paths;
4444
import java.util.ArrayList;
45+
import java.util.Arrays;
4546
import java.util.LinkedList;
4647
import java.util.List;
4748
import java.util.Optional;

0 commit comments

Comments
 (0)