Enums cannot appear in targetEntity list

forge · Apr 16, 2014 · 8b8d27a · 8b8d27a
1 parent e2ffaca
commit 8b8d27a
Showing 1 changed file with 46 additions and 8 deletions.
diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/ui/NewFieldWizard.java
@@ -163,6 +163,22 @@ public Iterable<String> getCompletionProposals(final UIContext context, final In
                   {
                   }
                }
+               for (JavaResource resource : getProjectEnums(project))
+               {
+                  try
+                  {
+                     JavaSource<?> javaSource = resource.getJavaType();
+                     String qualifiedName = javaSource.getQualifiedName();
+                     if (Strings.isNullOrEmpty(value) || qualifiedName.startsWith(value))
+                     {
+                        options.add(qualifiedName);
+                     }
+                  }
+                  catch (FileNotFoundException ignored)
+                  {
+                  }
+               }
+
             }
             return options;
          }
@@ -266,31 +282,25 @@ private void setupEntities(UIContext context)
       }
    }
 
-   /**
-    * @param project
-    * @return entities
-    */
    private List<JavaResource> getProjectEntities(Project project)
    {
       final List<JavaResource> entities = new ArrayList<>();
       if (project != null)
       {
          project.getFacet(JavaSourceFacet.class).visitJavaSources(new JavaResourceVisitor()
          {
-
             @Override
             public void visit(VisitContext context, JavaResource resource)
             {
                try
                {
                   JavaSource<?> javaSource = resource.getJavaType();
-                  if (javaSource.hasAnnotation(Entity.class) || javaSource.hasAnnotation(MappedSuperclass.class)
-                           || javaSource.isEnum())
+                  if (javaSource.hasAnnotation(Entity.class) || javaSource.hasAnnotation(MappedSuperclass.class))
                   {
                      entities.add(resource);
                   }
                }
-               catch (FileNotFoundException e)
+               catch (ResourceException | FileNotFoundException e)
                {
                   // ignore
                }
@@ -300,6 +310,34 @@ public void visit(VisitContext context, JavaResource resource)
       return entities;
    }
 
+   private List<JavaResource> getProjectEnums(Project project)
+   {
+      final List<JavaResource> enums = new ArrayList<>();
+      if (project != null)
+      {
+         project.getFacet(JavaSourceFacet.class).visitJavaSources(new JavaResourceVisitor()
+         {
+            @Override
+            public void visit(VisitContext context, JavaResource resource)
+            {
+               try
+               {
+                  JavaSource<?> javaSource = resource.getJavaType();
+                  if (javaSource.isEnum())
+                  {
+                     enums.add(resource);
+                  }
+               }
+               catch (ResourceException | FileNotFoundException e)
+               {
+                  // ignore
+               }
+            }
+         });
+      }
+      return enums;
+   }
+
    private void setupRelationshipType()
    {
       relationshipType.setItemLabelConverter(new Converter<RelationshipType, String>()