Fixed error message and potential NPE in SetCompilerVersionCommand

forge · Apr 23, 2014 · a1253ac · a1253ac
1 parent 51298f1
commit a1253ac
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...va/impl/src/main/java/org/jboss/forge/addon/parser/java/ui/SetCompilerVersionCommand.java b/...va/impl/src/main/java/org/jboss/forge/addon/parser/java/ui/SetCompilerVersionCommand.java
@@ -46,8 +46,8 @@ public UICommandMetadata getMetadata(UIContext context)
    public void initializeUI(UIBuilder builder) throws Exception
    {
       JavaCompilerFacet javaCompilerFacet = getJavaCompilerFacet(builder.getUIContext());
-      sourceVersion.setValue(javaCompilerFacet.getSourceCompilerVersion());
-      targetVersion.setValue(javaCompilerFacet.getTargetCompilerVersion());
+      sourceVersion.setDefaultValue(javaCompilerFacet.getSourceCompilerVersion());
+      targetVersion.setDefaultValue(javaCompilerFacet.getTargetCompilerVersion());
       builder.add(sourceVersion).add(targetVersion);
    }
 
@@ -71,10 +71,13 @@ private JavaCompilerFacet getJavaCompilerFacet(UIContext context)
    @Override
    public void validate(UIValidationContext validator)
    {
-      if (sourceVersion.getValue().ordinal() > targetVersion.getValue().ordinal())
+      if (sourceVersion.hasValue() && targetVersion.hasValue())
       {
-         validator.addValidationError(sourceVersion, "Selected source version (" + sourceVersion.toString() +
-                  ") is higher than the target version (" + targetVersion.toString() + ").");
+         if (sourceVersion.getValue().ordinal() > targetVersion.getValue().ordinal())
+         {
+            validator.addValidationError(sourceVersion, "Selected source version (" + sourceVersion.getValue() +
+                     ") is higher than the target version (" + targetVersion.getValue() + ").");
+         }
       }
    }