Clean up old methods

javaparser · Jan 18, 2017 · d34926f · d34926f
1 parent cd7814e
commit d34926f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 51 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassMetaModel.java
@@ -33,25 +33,25 @@ public boolean is(Class<?> c) {
         return reflectionClass.equals(c);
     }
 
-//    @Override
-//    public boolean equals(Object o) {
-//        if (this == o) return true;
-//        if (o == null || getClass() != o.getClass()) return false;
-//
-//        OldClassMetaModel oldClassMetaModel = (OldClassMetaModel) o;
-//
-//        if (!reflectionClass.equals(oldClassMetaModel.reflectionClass)) return false;
-//
-//        return true;
-//    }
-//
-//    @Override
-//    public int hashCode() {
-//        return reflectionClass.hashCode();
-//    }
-//
-//    @Override
-//    public String toString() {
-//        return getClassName();
-//    }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ClassMetaModel classMetaModel = (ClassMetaModel) o;
+
+        if (!reflectionClass.equals(classMetaModel.reflectionClass)) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return reflectionClass.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldMetaModel.java
@@ -41,31 +41,25 @@ public boolean is(String fieldName) {
         return name.equals(fieldName);
     }
 
-//    public boolean is(Class<?> c, String fieldName) {
-//        return getOldClassMetaModel().is(c) && getName().equals(fieldName);
-//    }
-//
-//    public boolean is(String fieldName) {
-//        return getName().equals(fieldName);
-//    }
+    @Override
+    public String toString() {
+        return "(" + type.getSimpleName() + ")\t" + classMetaModel + "#" + name;
+    }
+
+    @Override
+    public int hashCode() {
+        return reflectionField.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
 
-//    @Override
-//    public String toString() {
-//        return "(" + getType().getSimpleName() + ")\t" + oldClassMetaModel.toString() + "#" + getName();
-//    }
-//    @Override
-//    public int hashCode() {
-//        return reflectionField.hashCode();
-//    }
-//    @Override
-//    public boolean equals(Object o) {
-//        if (this == o) return true;
-//        if (o == null || getClass() != o.getClass()) return false;
-//
-//        OldFieldMetaModel that = (OldFieldMetaModel) o;
-//
-//        if (!reflectionField.equals(that.reflectionField)) return false;
-//
-//        return true;
-//    }
+        FieldMetaModel that = (FieldMetaModel) o;
+
+        if (!reflectionField.equals(that.reflectionField)) return false;
+
+        return true;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java
@@ -125,10 +125,10 @@ public Optional<ClassMetaModel> getClassMetaModel(Class<?> c) {
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
-        for (ClassMetaModel oldClassMetaModel : getClassMetaModels()) {
-            b.append(oldClassMetaModel).append("\n");
-            for (FieldMetaModel oldFieldMetaModel : oldClassMetaModel.fieldMetaModels) {
-                b.append("\t").append(oldFieldMetaModel).append("\n");
+        for (ClassMetaModel classMetaModel : getClassMetaModels()) {
+            b.append(classMetaModel).append("\n");
+            for (FieldMetaModel fieldMetaModel : classMetaModel.fieldMetaModels) {
+                b.append("\t").append(fieldMetaModel).append("\n");
             }
         }
         return b.toString();

diff --git a/...parser-testing/src/test/java/com/github/javaparser/metamodel/JavaParserMetaModelTest.java b/...parser-testing/src/test/java/com/github/javaparser/metamodel/JavaParserMetaModelTest.java
@@ -11,5 +11,6 @@ public void outputEverythingWithoutFailure() {
                 System.out.println(classMetaModel.name + "." + fieldMetaModel.name);
             }
         }
+        System.out.println(javaParserMetaModel);
     }
 }