From 274cc9e1e3b5d9878c9da98274a3448bf6f56d62 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 15 Aug 2015 08:44:15 -0400
Subject: [PATCH] Move java yasnippet defuns into snippets repo

---
 modules/lib/defuns-java.el                | 13 -------------
 private/templates/java-mode/.yas-setup.el | 11 +++++++++++
 private/templates/java-mode/@@            |  4 ++--
 private/templates/java-mode/@@main        |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 private/templates/java-mode/.yas-setup.el

diff --git a/modules/lib/defuns-java.el b/modules/lib/defuns-java.el
index a634b7d6e..d786cee3c 100644
--- a/modules/lib/defuns-java.el
+++ b/modules/lib/defuns-java.el
@@ -1,18 +1,5 @@
 ;;; defuns-java.el ---
 
-;;;###autoload
-(defun narf/java-project-package ()
-  (if (eq major-mode 'java-mode)
-    (s-chop-suffix "." (s-replace "/" "." (f-dirname (f-relative (buffer-file-name)
-                                                                 (concat (narf/project-root) "/src/")))))
-    ""))
-
-;;;###autoload
-(defun narf/java-class-name ()
-  (if (eq major-mode 'java-mode)
-      (f-no-ext (f-base (buffer-file-name)))
-    ""))
-
 ;; yasnippet defuns
 ;;;###autoload
 (defun narf/java-android-mode-is-layout-file ()
diff --git a/private/templates/java-mode/.yas-setup.el b/private/templates/java-mode/.yas-setup.el
new file mode 100644
index 000000000..f4143072e
--- /dev/null
+++ b/private/templates/java-mode/.yas-setup.el
@@ -0,0 +1,11 @@
+(defun yas-java-project-package ()
+  (if (eq major-mode 'java-mode)
+    (s-chop-suffix "." (s-replace "/" "." (f-dirname (f-relative (buffer-file-name)
+                                                                 (concat (narf/project-root) "/src/")))))
+    ""))
+
+(defun yas-java-class-name ()
+  (if (eq major-mode 'java-mode)
+      (f-no-ext (f-base (buffer-file-name)))
+    ""))
+
diff --git a/private/templates/java-mode/@@ b/private/templates/java-mode/@@
index 6525b3d7c..2f45b0ca0 100644
--- a/private/templates/java-mode/@@
+++ b/private/templates/java-mode/@@
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: Java file template
 # --
-package `(narf/java-project-package)`;
+package `(yas-java-project-package)`;
 
-public class `(narf/java-class-name)` $1
+public class `(yas-java-class-name)` $1
 {
     $0
 }
diff --git a/private/templates/java-mode/@@main b/private/templates/java-mode/@@main
index a31ac0988..20dde1223 100644
--- a/private/templates/java-mode/@@main
+++ b/private/templates/java-mode/@@main
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: Java MAIN file template
 # --
-package `(narf/java-project-package)`;
+package `(yas-java-project-package)`;
 
-public class `(narf/java-class-name)` $1
+public class `(yas-java-class-name)` $1
 {
     public static void main(String[] args) {
         $0