From ad8883ddcaf27414e96dfc521aba9260cfc48e8c Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Fri, 28 Mar 2014 12:10:19 -0400
Subject: [PATCH 1/3] Fix java setter method param case, remove return.

The paramater was keeping the case of the setter name.  It should
have been lowercased.  The other uses of the paramter were already
lowercased correctly.

There should also not be a return statement in a void method.
---
 UltiSnips/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index de15572e6..18746b4f5 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -343,8 +343,8 @@ public ${1:String} get${2:Name}() {
 endsnippet
 
 snippet /set(ter)?/ "setter" br
-public void set${1:Name}(${2:String} $1) {
-	return this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
+	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
 }
 endsnippet
 

From e5f3d6bdf55ebd2dc6e129cb58bf4c8faac289f0 Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Fri, 28 Mar 2014 15:32:39 -0400
Subject: [PATCH 2/3] Change java set/get snippets to use mixedCase.

The java setter and getter snippets were incorrectly formatting the
set/get name as all lowercase.  It should be mixed case, as per java's
coding standard.

A new function was made (mixedCase) to handle that.
---
 UltiSnips/java.snippets | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 18746b4f5..a9aa55fa0 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -27,6 +27,9 @@ def getArgs(group):
 def camel(word):
 	return word[0].upper() + word[1:]
 
+def mixedCase(word):
+	return word[0].lower() + word[1:]
+
 endglobal
 
 snippet sleep "try sleep catch" b
@@ -338,23 +341,23 @@ endsnippet
 
 snippet /get(ter)?/ "getter" br
 public ${1:String} get${2:Name}() {
-	return `!p snip.rv = t[2].lower()`;
+	return `!p snip.rv = mixedCase(t[2])`;
 }
 endsnippet
 
 snippet /set(ter)?/ "setter" br
-public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
-	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
 }
 endsnippet
 
 snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
-public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
-	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
 }
 
 public $2 get$1() {
-	return `!p snip.rv = t[1].lower()`;
+	return `!p snip.rv = mixedCase(t[1])`;
 }
 endsnippet
 

From 87ea532f410551cb3609d0d62262696702363dea Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Sat, 29 Mar 2014 20:39:14 -0400
Subject: [PATCH 3/3] Bug fix for java case coercion helpers.

If an empty tab stop was used with either of the java case coercion
helper functions then they would blow up.  Fixed by returning an empty
string if the word passed to them is falsey.
---
 UltiSnips/java.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index a9aa55fa0..21be6bef9 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -25,9 +25,11 @@ def getArgs(group):
 	return [i.split(" ") for i in word.findall(group) ]
 
 def camel(word):
+	if not word: return ''
 	return word[0].upper() + word[1:]
 
 def mixedCase(word):
+	if not word: return ''
 	return word[0].lower() + word[1:]
 
 endglobal