fix pmd

st-js · Dec 15, 2015 · b775b13 · b775b13
1 parent fb0aec0
commit b775b13
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/.../main/java/org/stjs/generator/writer/templates/fields/PathGetterMemberSelectTemplate.java b/.../main/java/org/stjs/generator/writer/templates/fields/PathGetterMemberSelectTemplate.java
@@ -55,7 +55,11 @@
  */
 public class PathGetterMemberSelectTemplate<JS> implements WriterContributor<MemberSelectTree, JS> {
 
-	private JS getTarget(WriterVisitor<JS> visitor, ExpressionTree tree, GenerationContext<JS> context) {
+	private JS getTarget(WriterVisitor<JS> visitor, TreeWrapper<ExpressionTree, JS> currentWrapper, ExpressionTree tree,
+			GenerationContext<JS> context, boolean targetIsPartOfPath) {
+		if (!targetIsPartOfPath) {
+			return visitor.scan(currentWrapper.getTree(), context);
+		}
 		if (tree instanceof MemberSelectTree) {
 			MemberSelectTree ms = (MemberSelectTree) tree;
 			if (JavaNodes.isSuper(ms.getExpression())) {
@@ -87,6 +91,15 @@ private String ident(Tree tree) {
 		throw new STJSRuntimeException("Unexpected node type while building path:" + tree);
 	}
 
+	private boolean checkTemplateParams(String[] params, GenerationContext<JS> context, TreeWrapper<ExpressionTree, JS> currentWrapper) {
+		if (params == null || params.length == 0) {
+			context.addError(currentWrapper.getTree(),
+					"The 'path' template needs a parameter designating the method to be called, like this @Template(\"path(methodName)\")");
+			return false;
+		}
+		return true;
+	}
+
 	private JS getPath(WriterVisitor<JS> visitor, TreeWrapper<ExpressionTree, JS> tree, GenerationContext<JS> context) {
 		String path = "";
 		TreeWrapper<ExpressionTree, JS> currentWrapper = tree;
@@ -99,6 +112,7 @@ private JS getPath(WriterVisitor<JS> visitor, TreeWrapper<ExpressionTree, JS> tr
 		while (true) {
 			Tree currentTree = currentWrapper.getTree();
 			String template = currentWrapper.getFieldTemplate();
+
 			if (!"path".equals(template)) {
 				targetIsPartOfPath = false;
 				break;
@@ -113,14 +127,12 @@ private JS getPath(WriterVisitor<JS> visitor, TreeWrapper<ExpressionTree, JS> tr
 			currentWrapper = currentWrapper.child(((MemberSelectTree) currentTree).getExpression());
 		}
 
-		JS target = targetIsPartOfPath ? getTarget(visitor, currentWrapper.getTree(), context) : visitor.scan(currentWrapper.getTree(), context);
-
-		if (params == null || params.length == 0) {
-			context.addError(currentWrapper.getTree(),
-					"The 'path' template needs a parameter designating the method to be called, like this @Template(\"path(methodName)\")");
+		if (!checkTemplateParams(params, context, currentWrapper)) {
 			return null;
 		}
 
+		JS target = getTarget(visitor, currentWrapper, currentWrapper.getTree(), context, targetIsPartOfPath);
+
 		String methodName = params[0];
 
 		JS pathString = context.js().string(path);