Moved countLines() and loadFile() from Base to BaseNoGui.

Author: bitron

app/src/processing/app/Base.java

@@ -2478,11 +2478,7 @@ static public InputStream getLibStream(String filename) throws IOException {
    * characters inside a String (and adding 1).
    */
   static public int countLines(String what) {
-    int count = 1;
-    for (char c : what.toCharArray()) {
-      if (c == '\n') count++;
-    }
-    return count;
+    return BaseNoGui.countLines(what);
   }
 
 
@@ -2560,10 +2556,8 @@ static public void copyFile(File sourceFile,
    * Grab the contents of a file as a string.
    */
   static public String loadFile(File file) throws IOException {
-    String[] contents = PApplet.loadStrings(file);
-    if (contents == null) return null;
-    return PApplet.join(contents, "\n");
-    }
+    return BaseNoGui.loadFile(file);
+  }
 
 
   /**

app/src/processing/app/BaseNoGui.java

@@ -75,6 +75,18 @@ static public File absoluteFile(String path) {
     return file;
   }
 
+  /**
+   * Get the number of lines in a file by counting the number of newline
+   * characters inside a String (and adding 1).
+   */
+  static public int countLines(String what) {
+    int count = 1;
+    for (char c : what.toCharArray()) {
+      if (c == '\n') count++;
+    }
+    return count;
+  }
+
   static public String getAvrBasePath() {
     String path = getHardwarePath() + File.separator + "tools" +
                   File.separator + "avr" + File.separator + "bin" + File.separator;
@@ -349,6 +361,15 @@ static protected void loadHardware(File folder) {
     }
   }
 
+  /**
+   * Grab the contents of a file as a string.
+   */
+  static public String loadFile(File file) throws IOException {
+    String[] contents = PApplet.loadStrings(file);
+    if (contents == null) return null;
+    return PApplet.join(contents, "\n");
+  }
+
   static public void populateImportToLibraryTable() {
     // Populate importToLibraryTable
     importToLibraryTable = new HashMap<String, Library>();

app/src/processing/app/SketchCode.java

@@ -114,7 +114,7 @@ protected boolean renameTo(File what) {
 
 
   protected void copyTo(File dest) throws IOException {
-    Base.saveFile(program, dest);
+    BaseNoGui.saveFile(program, dest);
   }
 
 
@@ -148,7 +148,7 @@ public void setProgram(String replacement) {
 
 
   public int getLineCount() {
-    return Base.countLines(program);
+    return BaseNoGui.countLines(program);
   }
 
 
@@ -184,7 +184,7 @@ public void addPreprocOffset(int extra) {
    * Load this piece of code from a file.
    */
   public void load() throws IOException {
-    program = Base.loadFile(file);
+    program = BaseNoGui.loadFile(file);
 
     if (program.indexOf('\uFFFD') != -1) {
       System.err.println(
@@ -212,7 +212,7 @@ public void save() throws IOException {
     // TODO re-enable history
     //history.record(s, SketchHistory.SAVE);
 
-    Base.saveFile(program, file);
+    BaseNoGui.saveFile(program, file);
     setModified(false);
   }
 
@@ -221,6 +221,6 @@ public void save() throws IOException {
    * Save this file to another location, used by Sketch.saveAs()
    */
   public void saveAs(File newFile) throws IOException {
-    Base.saveFile(program, newFile);
+    BaseNoGui.saveFile(program, newFile);
   }
 }