Introduce constants for file extensions

This prevents duplicating these lists in multiple places.

As a side-effect, .S files are now handled in sketches as well (instead
of just in libraries), fixing arduino#1616.

Author: matthijskooijman

Diff for: app/src/processing/app/Base.java

@@ -67,6 +67,11 @@ public class Base {
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
+  // These should remain lowercase, they are matched against lowercased strings
+  public static final String[] SOURCE_EXTENSIONS = {"s", "c", "cpp"};
+  public static final String[] HEADER_EXTENSIONS = {"h"};
+  public static final String[] SKETCH_EXTENSIONS = {"ino", "pde"};
+
   static Map<Integer, String> platformNames = new HashMap<Integer, String>();
   static {
     platformNames.put(PConstants.WINDOWS, "windows");

Diff for: app/src/processing/app/Sketch.java

@@ -1308,7 +1308,7 @@ public void preprocess(String buildPath, PdePreprocessor preprocessor) throws Ru
     StringBuffer bigCode = new StringBuffer();
     int bigCount = 0;
     for (SketchCode sc : code) {
-      if (sc.isExtension("ino") || sc.isExtension("pde")) {
+      if (sc.isExtension(Base.SKETCH_EXTENSIONS)) {
         sc.setPreprocOffset(bigCount);
         // These #line directives help the compiler report errors with
         // correct the filename and line number (issue 281 & 907)
@@ -1368,7 +1368,7 @@ public void preprocess(String buildPath, PdePreprocessor preprocessor) throws Ru
     // 3. then loop over the code[] and save each .java file
 
     for (SketchCode sc : code) {
-      if (sc.isExtension("c") || sc.isExtension("cpp") || sc.isExtension("h")) {
+      if (sc.isExtension(Base.SOURCE_EXTENSIONS) || sc.isExtension(Base.HEADER_EXTENSIONS)) {
         // no pre-processing services necessary for java files
         // just write the the contents of 'program' to a .java file
         // into the build directory. uses byte stream and reader/writer
@@ -1382,7 +1382,7 @@ public void preprocess(String buildPath, PdePreprocessor preprocessor) throws Ru
         }
 //        sc.setPreprocName(filename);
 
-      } else if (sc.isExtension("ino") || sc.isExtension("pde")) {
+      } else if (sc.isExtension(Base.SKETCH_EXTENSIONS)) {
         // The compiler and runner will need this to have a proper offset
         sc.addPreprocOffset(headerOffset);
       }
@@ -1818,20 +1818,22 @@ public boolean validExtension(String what) {
    * Returns the default extension for this editor setup.
    */
   public String getDefaultExtension() {
-    return "ino";
+    return Base.SKETCH_EXTENSIONS[0];
   }
 
-  static private List<String> hiddenExtensions = Arrays.asList("ino", "pde");
-
   public List<String> getHiddenExtensions() {
-    return hiddenExtensions;
+    return Arrays.asList(Base.SKETCH_EXTENSIONS);
   }
 
   /**
    * Returns a String[] array of proper extensions.
    */
   public List<String> getExtensions() {
-    return Arrays.asList("ino", "pde", "c", "cpp", "h");
+    List<String> res = new ArrayList<String>();
+    res.addAll(Arrays.asList(Base.SKETCH_EXTENSIONS));
+    res.addAll(Arrays.asList(Base.SOURCE_EXTENSIONS));
+    res.addAll(Arrays.asList(Base.HEADER_EXTENSIONS));
+    return res;
   }
 
 

Diff for: app/src/processing/app/debug/Compiler.java

@@ -240,7 +240,7 @@ private PreferencesMap createBuildPreferences(String _buildPath,
   private List<File> compileFiles(File outputPath, File sourcePath,
                                   boolean recurse, List<File> includeFolders)
       throws RunnerException {
-    List<File> sourceFiles = FileUtils.listFiles(sourcePath, recurse, "s", "c", "cpp");
+    List<File> sourceFiles = FileUtils.listFiles(sourcePath, recurse, Base.SOURCE_EXTENSIONS);
     return compileFiles(outputPath, sourcePath, sourceFiles, includeFolders);
 
   }