implement user templates

benfry · benfry · commit dd71a2fdaea3 · 2016-08-10T18:47:15.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1902,6 +1902,11 @@ static public File getSketchbookExamplesFolder() {
   }
 
 
+  static public File getSketchbookTemplatesFolder() {
+    return new File(sketchbookFolder, "templates");
+  }
+
+
   static protected File getDefaultSketchbookFolder() {
     File sketchbookFolder = null;
     try {
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -241,7 +241,12 @@ public File addTemplateFiles(File sketchFolder,
     File newbieFile =
       new File(sketchFolder, sketchName + "." + getDefaultExtension());
 
-    File templateFolder = getTemplateFolder();
+    // First see if the user has overridden the default template
+    File templateFolder = getUserTemplateFolder();
+    if (!templateFolder.exists()) {
+      // If not, see if the Mode has its own template
+      templateFolder = getTemplateFolder();
+    }
     if (templateFolder.exists()) {
       Util.copyDir(templateFolder, sketchFolder);
       File templateFile =
@@ -258,6 +263,11 @@ public File addTemplateFiles(File sketchFolder,
   }
 
 
+  public File getUserTemplateFolder() {
+    return new File(Base.getSketchbookTemplatesFolder(), getTitle());
+  }
+
+
   public File getTemplateFolder() {
     return getContentFile("template");
   }
diff --git a/todo.txt b/todo.txt
@@ -31,6 +31,7 @@ _ in Mode: TokenMarker getTokenMarker(SketchCode code)
 _   passes through to no args version if not overridden
 X change PdeKeywords to PdeTokenMarker
 X   doesn't seem to cause any breakage, but will keep an eye out
+X added getSketchbookTemplatesFolder() to Base
 
 _ modify line number color when no lines extend that far?
 _   https://github.com/processing/processing/pull/4560
