improvements to jpa-new-field command

forge · Jan 29, 2014 · fdd0275 · fdd0275
1 parent d31479a
commit fdd0275
Showing 1 changed file with 22 additions and 10 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
@@ -66,11 +66,11 @@ public class NewFieldWizard extends AbstractJavaEECommand implements UIWizard
    private UIInput<String> named;
 
    @Inject
-   @WithAttributes(label = "Target Field Type", description = "The type intended to be used for this field", type = InputType.JAVA_CLASS_PICKER, required = true, defaultValue = "String")
-   private UIInput<String> targetFieldType;
+   @WithAttributes(label = "Field Type", description = "The type intended to be used for this field", type = InputType.JAVA_CLASS_PICKER, required = true, defaultValue = "String")
+   private UIInput<String> type;
 
    @Inject
-   @WithAttributes(label = "Relationship", description = "The type of the relationship", type = InputType.RADIO)
+   @WithAttributes(label = "Relationship Type", description = "The the relationship type", type = InputType.RADIO)
    private UISelectOne<RelationshipType> relationshipType;
 
    @Inject
@@ -102,13 +102,13 @@ public void initializeUI(UIBuilder builder) throws Exception
       setupEntities(builder.getUIContext());
       setupRelationshipType();
       final Project project = getSelectedProject(builder);
-      targetFieldType.setCompleter(new UICompleter<String>()
+      final String[] types = { "byte", "float", "char", "double", "int", "long", "short", "boolean", "String" };
+      type.setCompleter(new UICompleter<String>()
       {
          @Override
          public Iterable<String> getCompletionProposals(final UIContext context, final InputComponent<?, String> input,
                   final String value)
          {
-            String[] types = { "byte", "float", "char", "double", "int", "long", "short", "boolean", "String" };
             final List<String> options = new ArrayList<>();
             for (String type : types)
             {
@@ -138,6 +138,17 @@ public Iterable<String> getCompletionProposals(final UIContext context, final In
             return options;
          }
       });
+
+      // relationshipType.setEnabled(new Callable<Boolean>()
+      // {
+      // @Override
+      // public Boolean call() throws Exception
+      // {
+      // List<String> basicTypes = Arrays.asList(types);
+      // return !basicTypes.contains(type.getValue());
+      // }
+      // });
+
       lob.setEnabled(new Callable<Boolean>()
       {
          @Override
@@ -146,7 +157,7 @@ public Boolean call() throws Exception
             return relationshipType.getValue() == RelationshipType.BASIC;
          }
       });
-      targetFieldType.setEnabled(new Callable<Boolean>()
+      type.setEnabled(new Callable<Boolean>()
       {
          @Override
          public Boolean call() throws Exception
@@ -167,11 +178,12 @@ public Boolean call() throws Exception
          @Override
          public Boolean call() throws Exception
          {
-            String typeValue = targetFieldType.getValue();
+            String typeValue = type.getValue();
             return Date.class.getName().equals(typeValue) || Calendar.class.getName().equals(typeValue);
          }
       });
-      builder.add(targetEntity).add(named).add(targetFieldType).add(temporalType).add(length).add(relationshipType).add(lob);
+      builder.add(targetEntity).add(named).add(type).add(temporalType).add(length).add(relationshipType)
+               .add(lob);
    }
 
    private void setupEntities(UIContext context)
@@ -259,7 +271,7 @@ public Result execute(UIExecutionContext context) throws Exception
          }
          else
          {
-            String fieldType = targetFieldType.getValue();
+            String fieldType = type.getValue();
             field = fieldOperations.addFieldTo(targetEntity, fieldType, fieldNameStr,
                      Column.class.getCanonicalName());
          }
@@ -323,7 +335,7 @@ public NavigationResult next(UINavigationContext context) throws Exception
       Map<Object, Object> attributeMap = context.getUIContext().getAttributeMap();
       attributeMap.put(JavaResource.class, targetEntity.getValue());
       attributeMap.put("fieldName", named.getValue());
-      attributeMap.put("fieldType", targetFieldType.getValue());
+      attributeMap.put("fieldType", type.getValue());
       attributeMap.put(RelationshipType.class, relationshipType.getValue());
       if (relationshipType.getValue() == RelationshipType.BASIC)
       {