[1/4] groovy git commit: Remove deprecated StringGroovyMethods.capitalize call (port to 2_4_X)

[paulk]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 091a787af -> b4ccc85fa


Remove deprecated StringGroovyMethods.capitalize call (port to 2_4_X)

I also noticed that propName was being capitalized three times in the
createComparatorFor() method, so I only call it once at the beginning.

I followed the same style of passing in the CharSequence like it was
defined in the deprecated method:
```groovy
@Deprecated
public static String capitalize(String self) {
    return capitalize((CharSequence) self);
}
````

If you would rather have something like the following, or something else
let me know:

```groovy
CharSequence propName = property.getName();
String capitalizedPropName = StringGroovyMethods.capitalize(propName);

```


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f74bf852
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f74bf852
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f74bf852

Branch: refs/heads/GROOVY_2_4_X
Commit: f74bf8529f8ef57dc22d17d1d5c80b98a7807b2b
Parents: 091a787
Author: Russell Sanborn <russellsanb...@gmail.com>
Authored: Fri Nov 17 10:02:19 2017 -0600
Committer: paulk <pa...@asert.com.au>
Committed: Sun Nov 19 17:24:44 2017 +1000

----------------------------------------------------------------------
 .../codehaus/groovy/transform/SortableASTTransformation.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/f74bf852/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
----------------------------------------------------------------------
diff --git 
a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java 
b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
index 69e2bbb..81f4dc2 100644
--- a/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
+++ b/src/main/org/codehaus/groovy/transform/SortableASTTransformation.java
@@ -156,8 +156,8 @@ public class SortableASTTransformation extends 
AbstractASTTransformation {
     }
 
     private static void createComparatorFor(ClassNode classNode, PropertyNode 
property) {
-        String propName = property.getName();
-        String className = classNode.getName() + "$" + 
StringGroovyMethods.capitalize(propName) + "Comparator";
+        String propName = StringGroovyMethods.capitalize((CharSequence) 
property.getName());
+        String className = classNode.getName() + "$" + propName + "Comparator";
         ClassNode superClass = 
makeClassSafeWithGenerics(AbstractComparator.class, classNode);
         InnerClassNode cmpClass = new InnerClassNode(classNode, className, 
ACC_PRIVATE | ACC_STATIC, superClass);
         classNode.getModule().addClass(cmpClass);
@@ -171,7 +171,7 @@ public class SortableASTTransformation extends 
AbstractASTTransformation {
                 createCompareMethodBody(property)
         ));
 
-        String fieldName = "this$" + StringGroovyMethods.capitalize(propName) 
+ "Comparator";
+        String fieldName = "this$" + propName + "Comparator";
         // private final Comparator this$<property>Comparator = new 
<type>$<property>Comparator();
         FieldNode cmpField = classNode.addField(
                 fieldName,
@@ -180,7 +180,7 @@ public class SortableASTTransformation extends 
AbstractASTTransformation {
                 ctorX(cmpClass));
 
         classNode.addMethod(new MethodNode(
-                "comparatorBy" + StringGroovyMethods.capitalize(propName),
+                "comparatorBy" + propName,
                 ACC_PUBLIC | ACC_STATIC,
                 COMPARATOR_TYPE,
                 Parameter.EMPTY_ARRAY,