1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-13 07:54:20 +01:00

7 Commits

Author SHA1 Message Date
Matthijs Kooijman
8e0d007ce2 Rename SketchCode to SketchFile
That name more accurately reflects its purpose: It represents a single
file within a sketch. This just updates the class name and variable
names referring to these objects and some comments, so no behaviour
should change.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
dfa60dacc1 Store a SketchCode instance in RunnerException
Previously, the index of the SketchCode instance in the list kept by
Sketch was kept, which isn't really robust.

With this change, Sketch.indexOfCode is no longer needed and is removed.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
a07a9ff895 Move SketchController.prepareDataFolder() to Sketch 2016-08-26 16:42:44 +02:00
Matthijs Kooijman
a4e2e80c1c Let importLibrary use Sketch.SKETCH_EXTENSIONS
For determining if the current file was a sketch file, it previously
(indirectly) used a hardcoded "ino" comparison. Now, it uses
`SKETCH_EXTENSIONS` so it also applies to .pde files and the hardcoded
"ino" (and the methods leading up to it) can be removed.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
5e68b66c5e Clean up SketchController.nameCode a bit
This lets it use FileUtils.splitFilename and reference Sketch.EXTENSIONS
and the new Sketch.DEFAULT_SKETCH_EXTENSION directly, allowing to remove
a few helper functions.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
dd5c1787fd Move isModified() from SketchController to Sketch
Also, update any code that uses it, removing the dependency on
SketchController entirely if possible.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
629953e20d Rename Sketch and SketchData classes
Sketch is now called SketchController, since it didn't really represent
a sketch, but just handled the GUI-related stuff for a given sketch
(note that it is not strictly a controller in the MVC-sense, but it does
have a similar function). SketchData more accurately represented the
actual sketch, so it is now called Sketch. Below, the new names are
used.

Editor now keeps both a current Sketch and SketchController object, and
the Sketch object is created by Editor and passed to SketchController,
instead passing a File and letting SketchController create the Sketch.
Wherever possible, code now uses the Sketch directly (or indirectly,
through the new `SketchController.getSketch()`) and the accessors in
SketchController that merely forwarded to Sketch have been removed.
There are few things that now live in SketchController but should be
moved to Sketch (`isModified()`, `isUntitled()`), so some of the code
still has a dependency on SketchController that should be removed later.

This commit mostly renames classes, methods and variables, it should not
change the behaviour in any way.
2016-08-26 16:42:44 +02:00