optimization: better return type

3 files changed, 9 insertions, 8 deletions

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
index 19cc2d5cd..94f16a987 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
@@ -14,7 +14,6 @@ package org.aspectj.weaver;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -305,7 +304,7 @@ public class JoinPointSignature implements ResolvedMember {
 		throw new UnsupportedOperationException("Adrian doesn't think you should be calling this...");
 	}
 
-	public Iterator getJoinPointSignatures(World world) {
+	public JoinPointSignatureIterator getJoinPointSignatures(World world) {
 		return realMember.getJoinPointSignatures(world);
 	}
 
@@ -358,13 +357,16 @@ public class JoinPointSignature implements ResolvedMember {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (!(obj instanceof JoinPointSignature))
+		if (!(obj instanceof JoinPointSignature)) {
 			return false;
+		}
 		JoinPointSignature other = (JoinPointSignature) obj;
-		if (!realMember.equals(other.realMember))
+		if (!realMember.equals(other.realMember)) {
 			return false;
-		if (!substituteDeclaringType.equals(other.substituteDeclaringType))
+		}
+		if (!substituteDeclaringType.equals(other.substituteDeclaringType)) {
 			return false;
+		}
 		return true;
 	}
 
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
index 9bd9abc30..a3c91d369 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
@@ -14,7 +14,6 @@
 package org.aspectj.weaver;
 
 import java.util.Collection;
-import java.util.Iterator;
 
 /**
  * Abstract representation of a member within a type.
@@ -61,7 +60,7 @@ public interface Member extends Comparable {
 	 */
 	public String getSignature();
 
-	public Iterator getJoinPointSignatures(World world);
+	public JoinPointSignatureIterator getJoinPointSignatures(World world);
 
 	public int getArity();
 
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
index eb3815ddb..878c38ffb 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
@@ -510,7 +510,7 @@ public class MemberImpl implements Member {
 	/**
 	 * All the signatures that a join point with this member as its signature has.
 	 */
-	public Iterator getJoinPointSignatures(World inAWorld) {
+	public JoinPointSignatureIterator getJoinPointSignatures(World inAWorld) {
 		if (joinPointSignatures == null) {
 			joinPointSignatures = new JoinPointSignatureIterator(this, inAWorld);
 		}