From 3f54ab2ddd126b1d9d8c570eb5cccec2b649f58c Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 13 Nov 2017 13:37:05 -0800
Subject: [PATCH] Add Java config

---
 emacs/.emacs.d/init.org               | 15 +++++++++++----
 emacs/.emacs.d/init/oni-java-init.org | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 emacs/.emacs.d/init/oni-java-init.org

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 621ae60..dd19a88 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -881,11 +881,18 @@ Computing Environment".
          (with-eval-after-load 'scheme (load "oni-scheme-init"))
        #+END_SRC
 
-  - [[file:init/oni-compilation-init.org][compilation-mode]]
+  - [[file:init/oni-compilation-init.org][compilation-mode]] :: Major mode for various compilation processes.
+
+       #+BEGIN_SRC emacs-lisp
+         (with-eval-after-load 'compile (load "oni-compilation-init"))
+       #+END_SRC
+
+  - [[file:init/oni-java-init.org][java-mode]] :: Major mode for the Java programming language.
+
+       #+BEGIN_SRC emacs-lisp
+         (with-eval-after-load 'cc-mode (load "oni-java-init"))
+       #+END_SRC
 
-    #+BEGIN_SRC emacs-lisp
-      (with-eval-after-load 'compile (load "oni-compilation-init"))
-    #+END_SRC
 
 ** Inferior Emacs lisp mode (ielm)
 
diff --git a/emacs/.emacs.d/init/oni-java-init.org b/emacs/.emacs.d/init/oni-java-init.org
new file mode 100644
index 0000000..c18a1a4
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-java-init.org
@@ -0,0 +1,24 @@
+Enable electric pair mode
+
+#+BEGIN_SRC emacs-lisp
+  (add-hook 'java-mode-hook 'electric-pair-local-mode)
+#+END_SRC
+
+Enable electric indent mode
+
+#+BEGIN_SRC emacs-lisp
+  (add-hook 'java-mode-hook 'electric-indent-local-mode)
+#+END_SRC
+
+Configure the JDEE server
+
+#+BEGIN_SRC emacs-lisp
+  (with-eval-after-load 'jdee-bsh
+    (setq jdee-server-dir "~/usr/share/java/jdee/"))
+#+END_SRC
+
+Enable fill column indicator
+
+#+BEGIN_SRC emacs-lisp
+  (add-hook 'java-mode-hook 'fci-mode)
+#+END_SRC