remove SourceType

forge · Nov 20, 2013 · 030d2de · 030d2de
1 parent 134f699
commit 030d2de
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 63 deletions.
diff --git a/api/src/main/java/org/jboss/forge/parser/java/JavaType.java b/api/src/main/java/org/jboss/forge/parser/java/JavaType.java
@@ -84,8 +84,4 @@ public interface JavaType<T extends JavaType<T>> extends
     */
    public List<? extends JavaType<?>> getNestedClasses();
 
-   /**
-    * Return the {@link SourceType} of this {@link JavaType} instance.
-    */
-   public SourceType getSourceType();
 }
diff --git a/api/src/main/java/org/jboss/forge/parser/java/SourceType.java b/api/src/main/java/org/jboss/forge/parser/java/SourceType.java
diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/EnumConstantBodyImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/EnumConstantBodyImpl.java
@@ -28,13 +28,13 @@
 import org.jboss.forge.parser.java.JavaType;
 import org.jboss.forge.parser.java.Method;
 import org.jboss.forge.parser.java.Parameter;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.SyntaxError;
 import org.jboss.forge.parser.java.Visibility;
 import org.jboss.forge.parser.java.ast.MethodFinderVisitor;
 import org.jboss.forge.parser.java.ast.TypeDeclarationFinderVisitor;
 import org.jboss.forge.parser.java.source.AnnotationSource;
 import org.jboss.forge.parser.java.source.EnumConstantSource;
+import org.jboss.forge.parser.java.source.EnumConstantSource.Body;
 import org.jboss.forge.parser.java.source.FieldSource;
 import org.jboss.forge.parser.java.source.Import;
 import org.jboss.forge.parser.java.source.JavaClassSource;
@@ -43,7 +43,6 @@
 import org.jboss.forge.parser.java.source.MemberSource;
 import org.jboss.forge.parser.java.source.MethodSource;
 import org.jboss.forge.parser.java.source.ParameterSource;
-import org.jboss.forge.parser.java.source.EnumConstantSource.Body;
 import org.jboss.forge.parser.java.util.Strings;
 import org.jboss.forge.parser.java.util.Types;
 import org.jboss.forge.parser.spi.JavaParserImpl;
@@ -136,12 +135,6 @@ public List<JavaSource<?>> getNestedClasses()
       return result;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.CLASS;
-   }
-
    @Override
    public String getPackage()
    {

diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaAnnotationImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaAnnotationImpl.java
@@ -16,7 +16,6 @@
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jface.text.Document;
 import org.jboss.forge.parser.java.AnnotationElement;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.source.AnnotationElementSource;
 import org.jboss.forge.parser.java.source.JavaAnnotationSource;
 import org.jboss.forge.parser.java.source.JavaSource;
@@ -41,12 +40,6 @@ protected JavaAnnotationSource updateTypeNames(final String name)
       return this;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.ANNOTATION;
-   }
-
    @Override
    public AnnotationElementSource addAnnotationElement()
    {

diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaClassImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaClassImpl.java
@@ -13,7 +13,6 @@
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jface.text.Document;
 import org.jboss.forge.parser.java.JavaType;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.ast.ModifierAccessor;
 import org.jboss.forge.parser.java.source.JavaClassSource;
 import org.jboss.forge.parser.java.source.JavaSource;
@@ -161,9 +160,4 @@ else if (Types.isGeneric(type))
       return this;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.CLASS;
-   }
 }
diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaEnumImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaEnumImpl.java
@@ -15,7 +15,6 @@
 import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
 import org.eclipse.jdt.core.dom.EnumDeclaration;
 import org.eclipse.jface.text.Document;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.source.EnumConstantSource;
 import org.jboss.forge.parser.java.source.JavaEnumSource;
 import org.jboss.forge.parser.java.source.JavaSource;
@@ -91,9 +90,4 @@ protected JavaEnumSource updateTypeNames(final String newName)
       return this;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.ENUM;
-   }
 }
diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaInterfaceImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaInterfaceImpl.java
@@ -9,7 +9,6 @@
 import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jface.text.Document;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.source.JavaInterfaceSource;
 import org.jboss.forge.parser.java.source.JavaSource;
 
@@ -31,9 +30,4 @@ protected JavaInterfaceSource updateTypeNames(final String name)
       return this;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.INTERFACE;
-   }
 }
diff --git a/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaPackageInfoImpl.java b/impl/src/main/java/org/jboss/forge/parser/java/impl/JavaPackageInfoImpl.java
@@ -17,7 +17,6 @@
 import org.jboss.forge.parser.ParserException;
 import org.jboss.forge.parser.java.Annotation;
 import org.jboss.forge.parser.java.JavaType;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.SyntaxError;
 import org.jboss.forge.parser.java.Visibility;
 import org.jboss.forge.parser.java.ast.AnnotationAccessor;
@@ -46,12 +45,6 @@ public JavaPackageInfoImpl(JavaSource<?> enclosingType, Document document,
       this.pkg = pkg;
    }
 
-   @Override
-   public SourceType getSourceType()
-   {
-      return SourceType.PACKAGEINFO;
-   }
-
    @Override
    public String getName()
    {

diff --git a/impl/src/test/java/org/jboss/forge/test/parser/java/JavaAnnotationTest.java b/impl/src/test/java/org/jboss/forge/test/parser/java/JavaAnnotationTest.java
@@ -17,7 +17,6 @@
 import java.io.InputStream;
 
 import org.jboss.forge.parser.JavaParser;
-import org.jboss.forge.parser.java.SourceType;
 import org.jboss.forge.parser.java.Type;
 import org.jboss.forge.parser.java.source.AnnotationSource;
 import org.jboss.forge.parser.java.source.AnnotationElementSource;
@@ -65,8 +64,6 @@ public void testCanParseOuterAnnotation() throws Exception
    public void testCanParseInnerAnnotation() throws Exception
    {
       assertEquals(1, javaAnnotation.getNestedClasses().size());
-      assertSame(SourceType.ANNOTATION,
-               javaAnnotation.getNestedClasses().get(0).getSourceType());
       JavaAnnotationSource nestedAnnotation = (JavaAnnotationSource) javaAnnotation.getNestedClasses().get(0);
       assertEquals("MockNestedJavaAnnotationType", nestedAnnotation.getName());
       assertEquals(5, nestedAnnotation.getAnnotationElements().size());