Unable to detect hyperlink on property value of @Result annotation if the return type is List

Author: harawata

mybatipse/src/net/harawata/mybatipse/hyperlink/JavaHyperlinkDetector.java

@@ -59,6 +59,7 @@
 import net.harawata.mybatipse.mybatis.JavaMapperUtil.ResultsAnnotationWithId;
 import net.harawata.mybatipse.mybatis.MapperNamespaceCache;
 import net.harawata.mybatipse.mybatis.MybatipseXmlUtil;
+import net.harawata.mybatipse.util.NameUtil;
 import net.harawata.mybatipse.util.XpathUtil;
 
 /**
@@ -279,33 +280,33 @@ private void parseResults(Annotation anno)
 			}
 			for (Expression resultAnno : resultAnnos)
 			{
-				if (isInRange(resultAnno, offset))
+				if (!isInRange(resultAnno, offset))
+					continue;
+				createHyperlink("select",
+					expressionAt(annotationValueAt((Annotation)annotationValueAt((Annotation)resultAnno,
+						Arrays.asList("one", "many"), offset), "select", offset), offset));
+				if (hyperlink == null)
 				{
-					createHyperlink("select",
-						expressionAt(annotationValueAt((Annotation)annotationValueAt((Annotation)resultAnno,
-							Arrays.asList("one", "many"), offset), "select", offset), offset));
-					if (hyperlink == null)
+					Expression propertyName = annotationValueAt((Annotation)resultAnno, "property",
+						offset);
+					if (propertyName == null)
+						return;
+					String returnType = method.resolveBinding().getReturnType().getQualifiedName();
+					if (returnType == null || "void".equals(returnType))
+						return;
+					try
 					{
-						Expression propertyName = annotationValueAt((Annotation)resultAnno, "property",
-							offset);
-						if (propertyName == null)
-							return;
-						String returnType = method.resolveBinding().getReturnType().getQualifiedName();
-						if (returnType == null || "void".equals(returnType))
-							return;
-						try
-						{
-							hyperlink = linkToJavaProperty(project, returnType,
-								(String)propertyName.resolveConstantExpressionValue(),
-								new Region(propertyName.getStartPosition(), propertyName.getLength()));
-						}
-						catch (JavaModelException e)
-						{
-							Activator.log(Status.ERROR, e.getMessage(), e);
-						}
+						hyperlink = linkToJavaProperty(project,
+							NameUtil.manageableReturnType(project, returnType),
+							(String)propertyName.resolveConstantExpressionValue(),
+							new Region(propertyName.getStartPosition(), propertyName.getLength()));
+					}
+					catch (JavaModelException e)
+					{
+						Activator.log(Status.ERROR, e.getMessage(), e);
 					}
-					break;
 				}
+				break;
 			}
 		}