You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2016/09/19 11:40:57 UTC
[1/2] [lang] Checkstyle: Add missing curly braces
Repository: commons-lang
Updated Branches:
refs/heads/master e6ad17215 -> d962a2b31
Checkstyle: Add missing curly braces
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/d58d64dd
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/d58d64dd
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/d58d64dd
Branch: refs/heads/master
Commit: d58d64ddb1f205a54c7eb57fe0cbec9c59cad8d6
Parents: e6ad172
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon Sep 19 13:39:49 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon Sep 19 13:39:49 2016 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/d58d64dd/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
index 3922bb4..41605cf 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
@@ -153,8 +153,9 @@ abstract class MemberUtils {
// "source" and "destination" are the actual and declared args respectively.
float totalCost = 0.0f;
final long normalArgsLen = isVarArgs ? destArgs.length-1 : destArgs.length;
- if (srcArgs.length < normalArgsLen)
+ if (srcArgs.length < normalArgsLen) {
return Float.MAX_VALUE;
+ }
for (int i = 0; i < normalArgsLen; i++) {
totalCost += getObjectTransformationCost(srcArgs[i], destArgs[i]);
}
[2/2] [lang] Checkstyle: Convert tabs to spaces
Posted by br...@apache.org.
Checkstyle: Convert tabs to spaces
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/d962a2b3
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/d962a2b3
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/d962a2b3
Branch: refs/heads/master
Commit: d962a2b31c9a7216c2df557eaed3e475b13939f1
Parents: d58d64d
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon Sep 19 13:40:46 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon Sep 19 13:40:46 2016 +0200
----------------------------------------------------------------------
.../commons/lang3/reflect/MethodUtils.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/d962a2b3/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 3acbd73..388eba7 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -764,24 +764,24 @@ public class MethodUtils {
* @return the aggregate number of inheritance hops between assignable argument class types.
*/
private static int distance(Class<?>[] classArray, Class<?>[] toClassArray) {
- int answer=0;
-
- if (!ClassUtils.isAssignable(classArray, toClassArray, true)) {
- return -1;
- }
- for (int offset = 0; offset < classArray.length; offset++) {
- // Note InheritanceUtils.distance() uses different scoring system.
- if (classArray[offset].equals(toClassArray[offset])) {
- continue;
- } else if (ClassUtils.isAssignable(classArray[offset], toClassArray[offset], true)
- && !ClassUtils.isAssignable(classArray[offset], toClassArray[offset], false)) {
- answer++;
- } else {
- answer = answer+2;
- }
- }
-
- return answer;
+ int answer = 0;
+
+ if (!ClassUtils.isAssignable(classArray, toClassArray, true)) {
+ return -1;
+ }
+ for (int offset = 0; offset < classArray.length; offset++) {
+ // Note InheritanceUtils.distance() uses different scoring system.
+ if (classArray[offset].equals(toClassArray[offset])) {
+ continue;
+ } else if (ClassUtils.isAssignable(classArray[offset], toClassArray[offset], true)
+ && !ClassUtils.isAssignable(classArray[offset], toClassArray[offset], false)) {
+ answer++;
+ } else {
+ answer = answer + 2;
+ }
+ }
+
+ return answer;
}
/**