Minor non-disruptive ASM API cleanup.

3 files changed, 8 insertions, 8 deletions

diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java
index ca6dac5bb..825db4cd3 100644
--- a/asm/src/org/aspectj/asm/IProgramElement.java
+++ b/asm/src/org/aspectj/asm/IProgramElement.java
@@ -278,7 +278,7 @@ public interface IProgramElement extends Serializable {
 			return list;
 		}
 		
-		public boolean isMemberKind() {
+		public boolean isMember() {
 			return this == FIELD
 				|| this == METHOD
 				|| this == CONSTRUCTOR
@@ -286,24 +286,24 @@ public interface IProgramElement extends Serializable {
 				|| this == ADVICE;
 		}
 
-		public boolean isInterTypeMemberKind() {
+		public boolean isInterTypeMember() {
 			return this == INTER_TYPE_CONSTRUCTOR
 				|| this == INTER_TYPE_FIELD
 				|| this == INTER_TYPE_METHOD;
 		}
 		
-		public boolean isTypeKind() {
+		public boolean isType() {
 			return this == CLASS
 				|| this == INTERFACE
 				|| this == ASPECT;	
 		}
 
-		public boolean isSourceFileKind() {
+		public boolean isSourceFile() {
 			return this == FILE_ASPECTJ
 				|| this == FILE_JAVA;
 		}
 		
-		public boolean isDeclareKind() {
+		public boolean isDeclare() {
 			return name.startsWith("declare");	
 		} 
 
diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 13712361c..0a36642ab 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
@@ -264,7 +264,7 @@ public class AspectJElementHierarchy implements IHierarchy {
 					&& node.getSourceLocation().getEndLine() >= lineNumber)
 					||
 					(lineNumber <= 1
-					 && node.getKind().isSourceFileKind())
+					 && node.getKind().isSourceFile())
 				);
 //		} catch (IOException ioe) { 
 //			return false;
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 6141f600e..1beec6173 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -172,7 +172,7 @@ public class ProgramElement implements IProgramElement {
 	}
 
 	public boolean isMemberKind() {
-		return kind.isMemberKind();
+		return kind.isMember();
 	}
 
 	public void setRunnable(boolean value) {
@@ -395,7 +395,7 @@ public class ProgramElement implements IProgramElement {
 		String label;
 		if (kind == Kind.CODE || kind == Kind.INITIALIZER) {
 			label = parent.getParent().getName() + ": ";
-		} else if (kind.isInterTypeMemberKind()) {
+		} else if (kind.isInterTypeMember()) {
 			int dotIndex = name.indexOf('.');  
 			if (dotIndex != -1) {
 				return parent.getName() + ": " + toLabelString().substring(dotIndex+1);