eliminate JavaType

forge · Nov 20, 2013 · c3bb7c6 · c3bb7c6
1 parent 39bcd6c
commit c3bb7c6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 32 deletions.
diff --git a/api/src/main/java/org/jboss/forge/parser/java/ReadJavaClass.java b/api/src/main/java/org/jboss/forge/parser/java/ReadJavaClass.java
@@ -10,18 +10,26 @@
 import org.jboss.forge.parser.JavaParser;
 
 /**
- * Represents a Java {@link Class} or interface source file as an in-memory modifiable element. See {@link JavaParser}
+ * Represents a Java {@link Class} source file as an in-memory modifiable element. See {@link JavaParser}
  * for various options in generating {@link ReadJavaClass} instances.
  * 
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
 public interface ReadJavaClass<O extends ReadJavaClass<O>> extends
-         ReadJavaType<O>,
+         ReadJavaSource<O>,
+         ReadInterfaceCapable,
+         ReadFieldHolder<O>,
+         ReadMethodHolder<O>,
+         ReadGenericCapable,
          ReadExtendable<O>,
          ReadAbstractable<O>
 {
    public interface JavaClass extends ReadJavaClass<JavaClass>,
-            JavaType<JavaClass>,
+            JavaSource<JavaClass>,
+            InterfaceCapable<JavaClass>,
+            FieldHolder<JavaClass>,
+            MethodHolder<JavaClass>,
+            GenericCapable<JavaClass>,
             Extendable<JavaClass>,
             Abstractable<JavaClass>
    {

diff --git a/api/src/main/java/org/jboss/forge/parser/java/ReadJavaInterface.java b/api/src/main/java/org/jboss/forge/parser/java/ReadJavaInterface.java
@@ -10,10 +10,18 @@
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * 
  */
-public interface ReadJavaInterface<O extends ReadJavaInterface<O>> extends ReadJavaType<O>,
-         ReadInterfaceCapable
+public interface ReadJavaInterface<O extends ReadJavaInterface<O>> extends
+         ReadJavaSource<O>,
+         ReadInterfaceCapable,
+         ReadFieldHolder<O>,
+         ReadMethodHolder<O>,
+         ReadGenericCapable
 {
-   public interface JavaInterface extends ReadJavaInterface<JavaInterface>, JavaType<JavaInterface>,
+   public interface JavaInterface extends ReadJavaInterface<JavaInterface>,
+            JavaSource<JavaInterface>,
+            FieldHolder<JavaInterface>,
+            MethodHolder<JavaInterface>,
+            GenericCapable<JavaInterface>,
             InterfaceCapable<JavaInterface>
    {
    }

diff --git a/api/src/main/java/org/jboss/forge/parser/java/ReadJavaType.java b/api/src/main/java/org/jboss/forge/parser/java/ReadJavaType.java