rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-31 20:52:13 +01:00
Code Issues Releases Activity

Merge SketchData.sortCodes() into addCode()

Browse Source 
By now, all calls to `addCode()` were followed by a call to
`sortCodes()`, and it seems like a task for SketchData to keep its list
sorted. Previously, this separation made some sense, since `addCode()`
was also used while loading a sketch, and you would only want to sort
once. Now, sketch loading uses a SortedSet, so this is no longer a
requirement.
This commit is contained in:
Matthijs Kooijman 2015-12-11 19:14:09 +01:00 committed by Martino Facchin
parent f7fdd08695
commit 31284feb9b
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/Sketch.java
View File

@ -374,9 +374,6 @@ public class Sketch {
data.addCode(code); data.addCode(code);
} }
// sort the entries
data.sortCode();
// set the new guy as current // set the new guy as current
editor.selectTab(editor.findTabIndex(newName)); editor.selectTab(editor.findTabIndex(newName));
@ -828,7 +825,6 @@ public class Sketch {
} else { } else {
ensureExistence(); ensureExistence();
data.addCode(newCode); data.addCode(newCode);
data.sortCode();
} }
editor.selectTab(editor.findTabIndex(filename)); editor.selectTab(editor.findTabIndex(filename));
} }

5
arduino-core/src/processing/app/SketchData.java
View File

@ -181,6 +181,7 @@ public class SketchData {
public void addCode(SketchCode sketchCode) { public void addCode(SketchCode sketchCode) {
codes.add(sketchCode); codes.add(sketchCode);
Collections.sort(codes, CODE_DOCS_COMPARATOR);
} }
protected void replaceCode(SketchCode newCode) { protected void replaceCode(SketchCode newCode) {
@ -192,10 +193,6 @@ public class SketchData {
} }
} }
protected void sortCode() {
Collections.sort(codes, CODE_DOCS_COMPARATOR);
}
public SketchCode getCode(int i) { public SketchCode getCode(int i) {
return codes.get(i); return codes.get(i);
} }