X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fmethods%2FClazz.java;h=3c5333b9b2a0265435e2435daa178cadcb77f503;hb=05934ede2e526bc55d3661d6029891bef70fd3b9;hp=fda73d13e842628b3925d6cbcc8c007b4ff66a45;hpb=79db54fde2069b536c95e9da810efb27f2e4efb5;p=javainspect.git

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
index fda73d1..3c5333b 100644
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
@@ -11,17 +11,21 @@ public class Clazz {
 
 	private final String packageName;
 	private final String className;
+	private final boolean isInterface;
 
 	public ClassReference superClass;
 	public List<ClassReference> implementedInterfaces = new ArrayList<ClassReference>();
 
 	public Clazz(final String packageName, final String className,
-			final Tokenizer tokenizer) throws InvalidSyntaxException {
+			final Tokenizer tokenizer, final boolean isInterface)
+			throws InvalidSyntaxException {
+
 		this.packageName = packageName;
 		this.className = className;
+		this.isInterface = isInterface;
 
 		while (true) {
-			final TokenizerMatch match = tokenizer.getToken();
+			final TokenizerMatch match = tokenizer.getNextToken();
 
 			if ("extends".equals(match.token)) {
 				superClass = new ClassReference(tokenizer);
@@ -32,7 +36,7 @@ public class Clazz {
 				while (true) {
 					implementedInterfaces.add(new ClassReference(tokenizer));
 
-					if (tokenizer.isNextToken(","))
+					if (tokenizer.probeNextToken(","))
 						continue;
 
 					break;
@@ -49,14 +53,21 @@ public class Clazz {
 	}
 
 	public void parseClassBody(final Tokenizer tokenizer) {
-		tokenizer.skipUtilEnd();
+		tokenizer.skipUntilDataEnd();
 	}
 
 	@Override
 	public String toString() {
 		final EnumerationBuffer result = new EnumerationBuffer();
 
-		result.append(packageName + " -> " + className + "\n");
+		result.append(packageName + " -> " + className + " ");
+
+		if (isInterface)
+			result.append("(interface)");
+		else
+			result.append("(class)");
+		result.append("\n");
+
 		if (superClass != null)
 			result.append("    super: " + superClass.toString() + "\n");