1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00

Moving Library.SOURCE_CONTROL_FOLDERS into FileUtils.isSCCSOrHiddenFile #1619

This commit is contained in:
Federico Fissore
2013-10-14 14:48:41 +02:00
parent 2ada52623d
commit 6378c8c647
4 changed files with 35 additions and 20 deletions

View File

@ -38,6 +38,7 @@ import processing.app.I18n;
import processing.app.Preferences;
import processing.app.Sketch;
import processing.app.SketchCode;
import processing.app.helpers.FileUtils;
import processing.app.helpers.PreferencesMap;
import processing.app.helpers.ProcessUtils;
import processing.app.helpers.StringReplacer;
@ -575,16 +576,19 @@ public class Compiler implements MessageConsumer {
boolean recurse) {
List<File> files = new ArrayList<File>();
if (Library.SOURCE_CONTROL_FOLDERS.contains(folder.getName())) {
if (FileUtils.isSCCSOrHiddenFile(folder)) {
return files;
}
if (folder.listFiles() == null)
File[] listFiles = folder.listFiles();
if (listFiles == null) {
return files;
}
for (File file : folder.listFiles()) {
if (file.getName().startsWith("."))
for (File file : listFiles) {
if (FileUtils.isSCCSOrHiddenFile(file)) {
continue; // skip hidden files
}
if (file.getName().endsWith("." + extension))
files.add(file);