arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Fixed wrong sketch structure check.

Browse Source
This commit is contained in:
Claudio Indellicati
2014-09-18 12:35:25 +02:00
committed by Cristian Maglie
parent 2702ccef0c
commit c2223107b1
1 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2131,7 +2131,10 @@ public class Editor extends JFrame implements RunnerListener {
File file = SketchData.checkSketchFile(sketchFile); File file = SketchData.checkSketchFile(sketchFile);
if ((file == null) && !fileName.endsWith(".ino") && !fileName.endsWith(".pde")) { if (file == null)
{
if (!fileName.endsWith(".ino") && !fileName.endsWith(".pde")) {
Base.showWarning(_("Bad file selected"), Base.showWarning(_("Bad file selected"),
_("Arduino can only open its own sketches\n" + _("Arduino can only open its own sketches\n" +
"and other files ending in .ino or .pde"), null); "and other files ending in .ino or .pde"), null);
@ -2159,7 +2162,7 @@ public class Editor extends JFrame implements RunnerListener {
if (result == JOptionPane.YES_OPTION) { if (result == JOptionPane.YES_OPTION) {
// create properly named folder // create properly named folder
File properFolder = new File(file.getParent(), properParent); File properFolder = new File(sketchFile.getParent(), properParent);
if (properFolder.exists()) { if (properFolder.exists()) {
Base.showWarning(_("Error"), Base.showWarning(_("Error"),
I18n.format( I18n.format(
@ -2177,7 +2180,7 @@ public class Editor extends JFrame implements RunnerListener {
return false; return false;
} }
// copy the sketch inside // copy the sketch inside
File properPdeFile = new File(properFolder, file.getName()); File properPdeFile = new File(properFolder, sketchFile.getName());
try { try {
Base.copyFile(file, properPdeFile); Base.copyFile(file, properPdeFile);
} catch (IOException e) { } catch (IOException e) {
@ -2186,7 +2189,7 @@ public class Editor extends JFrame implements RunnerListener {
} }
// remove the original file, so user doesn't get confused // remove the original file, so user doesn't get confused
file.delete(); sketchFile.delete();
// update with the new path // update with the new path
file = properPdeFile; file = properPdeFile;
@ -2195,6 +2198,7 @@ public class Editor extends JFrame implements RunnerListener {
return false; return false;
} }
} }
}
try { try {
sketch = new Sketch(this, file); sketch = new Sketch(this, file);