[1/2] groovy git commit: formatting only
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 15fc34835 -> d98afbeb2
http://git-wip-us.apache.org/repos/asf/groovy/blob/d98afbeb/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 9137bd7..b8f3763 100644
---
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -300,13 +300,13 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (returnStatement.getExpression() == ConstantExpression.NULL)
return;
if (isNullConstant(returnStatement.getExpression())) return;
checkReturnType(returnStatement);
-if (typeCheckingContext.getEnclosingClosure()!=null) {
+if (typeCheckingContext.getEnclosingClosure() != null) {
addClosureReturnType(getType(returnStatement.getExpression()));
} else if (typeCheckingContext.getEnclosingMethod() != null) {
} else {
throw new GroovyBugError("Unexpected return statement at "
-+
returnStatement.getLineNumber()+":"+returnStatement.getColumnNumber()
-+ " "+returnStatement.getText());
++ returnStatement.getLineNumber() + ":" +
returnStatement.getColumnNumber()
++ " " + returnStatement.getText());
}
}
};
@@ -441,6 +441,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
/**
* Test if a node is an inner class node, and if it is, then checks if the
enclosing method is skipped.
+ *
* @param node
* @return true if the inner class node should be skipped
*/
@@ -462,7 +463,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
@SuppressWarnings("unchecked")
private static void addPrivateFieldOrMethodAccess(Expression source,
ClassNode cn, StaticTypesMarker type, ASTNode accessedMember) {
Set set = (Set) cn.getNodeMetaData(type);
-if (set==null) {
+if (set == null) {
set = new LinkedHashSet();
cn.putNodeMetaData(type, set);
}
@@ -474,9 +475,9 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a field node, checks if we are accessing or setting a private
field from an inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, FieldNode fn,
boolean lhsOfAssignment) {
-if (fn!=null && Modifier.isPrivate(fn.getModifiers()) &&
-(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure()!=null) &&
-fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
+if (fn != null && Modifier.isPrivate(fn.getModifiers()) &&
+(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure() != null) &&
+fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
StaticTypesMarker marker = lhsOfAssignment ?
StaticTypesMarker.PV_FIELDS_MUTATION : StaticTypesMarker.PV_FIELDS_ACCESS;
addPrivateFieldOrMethodAccess(source, fn.getDeclaringClass(),
marker, fn);
}
@@ -486,7 +487,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a method node, checks if we are calling a private method from an
inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, MethodNode mn) {
-if (mn==null) {
+if (mn == null) {
return;
}
ClassNode declaringClass = mn.getDeclaringClass();
@@ -495,7 +496,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
int mods = mn.getModifiers();
boolean sameModule = declaringClass.getModule() ==
enclosingClassNode.getModule();
String packageName = declaringClass.getPackageName();
-if (packageName==null) {
+if (packageName == null) {
packageName = "";
}
if ((Modifier.isPrivate(mods) && sameModule)) {
@@ -515,7 +516,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
private void checkSuperCallFromClosure(Expression call, MethodNode
directCallTarget) {
if (call instanceof MethodCallExpression &&
typeCheckingContext.getEnclosingClosure() != null) {
-Expression objectExpression =
((MethodCallExpression)call).getObjectExpressio
[1/2] groovy git commit: formatting only
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 49a1c02d8 -> ef659512a
http://git-wip-us.apache.org/repos/asf/groovy/blob/ef659512/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 17d6c92..9308617 100644
---
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -304,13 +304,13 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (returnStatement.getExpression() == ConstantExpression.NULL)
return;
if (isNullConstant(returnStatement.getExpression())) return;
checkReturnType(returnStatement);
-if (typeCheckingContext.getEnclosingClosure()!=null) {
+if (typeCheckingContext.getEnclosingClosure() != null) {
addClosureReturnType(getType(returnStatement.getExpression()));
} else if (typeCheckingContext.getEnclosingMethod() != null) {
} else {
throw new GroovyBugError("Unexpected return statement at "
-+
returnStatement.getLineNumber()+":"+returnStatement.getColumnNumber()
-+ " "+returnStatement.getText());
++ returnStatement.getLineNumber() + ":" +
returnStatement.getColumnNumber()
++ " " + returnStatement.getText());
}
}
};
@@ -445,6 +445,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
/**
* Test if a node is an inner class node, and if it is, then checks if the
enclosing method is skipped.
+ *
* @param node
* @return true if the inner class node should be skipped
*/
@@ -466,7 +467,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
@SuppressWarnings("unchecked")
private static void addPrivateFieldOrMethodAccess(Expression source,
ClassNode cn, StaticTypesMarker type, ASTNode accessedMember) {
Set set = (Set) cn.getNodeMetaData(type);
-if (set==null) {
+if (set == null) {
set = new LinkedHashSet();
cn.putNodeMetaData(type, set);
}
@@ -478,9 +479,9 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a field node, checks if we are accessing or setting a private
field from an inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, FieldNode fn,
boolean lhsOfAssignment) {
-if (fn!=null && Modifier.isPrivate(fn.getModifiers()) &&
-(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure()!=null) &&
-fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
+if (fn != null && Modifier.isPrivate(fn.getModifiers()) &&
+(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure() != null) &&
+fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
StaticTypesMarker marker = lhsOfAssignment ?
StaticTypesMarker.PV_FIELDS_MUTATION : StaticTypesMarker.PV_FIELDS_ACCESS;
addPrivateFieldOrMethodAccess(source, fn.getDeclaringClass(),
marker, fn);
}
@@ -490,7 +491,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a method node, checks if we are calling a private method from an
inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, MethodNode mn) {
-if (mn==null) {
+if (mn == null) {
return;
}
ClassNode declaringClass = mn.getDeclaringClass();
@@ -499,7 +500,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
int mods = mn.getModifiers();
boolean sameModule = declaringClass.getModule() ==
enclosingClassNode.getModule();
String packageName = declaringClass.getPackageName();
-if (packageName==null) {
+if (packageName == null) {
packageName = "";
}
if ((Modifier.isPrivate(mods) && sameModule)) {
@@ -519,7 +520,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
private void checkSuperCallFromClosure(Expression call, MethodNode
directCallTarget) {
if (call instanceof MethodCallExpression &&
typeCheckingContext.getEnclosingClosure() != null) {
-Expression objectExpression =
((MethodCallExpression)call).getObjectExpressio
[1/2] groovy git commit: formatting only
Repository: groovy
Updated Branches:
refs/heads/master 4ada9e66c -> d033d1ce5
http://git-wip-us.apache.org/repos/asf/groovy/blob/d033d1ce/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
--
diff --git
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index c8e79bb..a6067c2 100644
---
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -304,13 +304,13 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
if (returnStatement.getExpression() == ConstantExpression.NULL)
return;
if (isNullConstant(returnStatement.getExpression())) return;
checkReturnType(returnStatement);
-if (typeCheckingContext.getEnclosingClosure()!=null) {
+if (typeCheckingContext.getEnclosingClosure() != null) {
addClosureReturnType(getType(returnStatement.getExpression()));
} else if (typeCheckingContext.getEnclosingMethod() != null) {
} else {
throw new GroovyBugError("Unexpected return statement at "
-+
returnStatement.getLineNumber()+":"+returnStatement.getColumnNumber()
-+ " "+returnStatement.getText());
++ returnStatement.getLineNumber() + ":" +
returnStatement.getColumnNumber()
++ " " + returnStatement.getText());
}
}
};
@@ -445,6 +445,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
/**
* Test if a node is an inner class node, and if it is, then checks if the
enclosing method is skipped.
+ *
* @param node
* @return true if the inner class node should be skipped
*/
@@ -466,7 +467,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
@SuppressWarnings("unchecked")
private static void addPrivateFieldOrMethodAccess(Expression source,
ClassNode cn, StaticTypesMarker type, ASTNode accessedMember) {
Set set = (Set) cn.getNodeMetaData(type);
-if (set==null) {
+if (set == null) {
set = new LinkedHashSet();
cn.putNodeMetaData(type, set);
}
@@ -478,9 +479,9 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a field node, checks if we are accessing or setting a private
field from an inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, FieldNode fn,
boolean lhsOfAssignment) {
-if (fn!=null && Modifier.isPrivate(fn.getModifiers()) &&
-(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure()!=null) &&
-fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
+if (fn != null && Modifier.isPrivate(fn.getModifiers()) &&
+(fn.getDeclaringClass() !=
typeCheckingContext.getEnclosingClassNode() ||
typeCheckingContext.getEnclosingClosure() != null) &&
+fn.getDeclaringClass().getModule() ==
typeCheckingContext.getEnclosingClassNode().getModule()) {
StaticTypesMarker marker = lhsOfAssignment ?
StaticTypesMarker.PV_FIELDS_MUTATION : StaticTypesMarker.PV_FIELDS_ACCESS;
addPrivateFieldOrMethodAccess(source, fn.getDeclaringClass(),
marker, fn);
}
@@ -490,7 +491,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
* Given a method node, checks if we are calling a private method from an
inner class.
*/
private void checkOrMarkPrivateAccess(Expression source, MethodNode mn) {
-if (mn==null) {
+if (mn == null) {
return;
}
ClassNode declaringClass = mn.getDeclaringClass();
@@ -499,7 +500,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
int mods = mn.getModifiers();
boolean sameModule = declaringClass.getModule() ==
enclosingClassNode.getModule();
String packageName = declaringClass.getPackageName();
-if (packageName==null) {
+if (packageName == null) {
packageName = "";
}
if ((Modifier.isPrivate(mods) && sameModule)) {
@@ -519,7 +520,7 @@ public class StaticTypeCheckingVisitor extends
ClassCodeVisitorSupport {
private void checkSuperCallFromClosure(Expression call, MethodNode
directCallTarget) {
if (call instanceof MethodCallExpression &&
typeCheckingContext.getEnclosingClosure() != null) {
-Expression objectExpression =
((MethodCallExpression)call).getObjectExpression();
+
