recognize java comments

[javainspect.git] / src / main / java / eu / svjatoslav / inspector / java / methods / Clazz.java

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 (file)
--- 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");