Merge pull request #80 from drapostolos/master

Changed methodname to: rectored PROPERTY_EDITOR converter (method name was wrong)
matteobaccan · Jun 10, 2014 · ddfdfc0 · ddfdfc0
2 parents 62512ea + b1ec204
commit ddfdfc0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/owner/src/main/java/org/aeonbits/owner/Converters.java b/owner/src/main/java/org/aeonbits/owner/Converters.java
@@ -146,7 +146,7 @@ Object tryConvert(Method targetMethod, Class<?> targetType, String text) {
 
         @Override
         Object tryConvert(Method targetMethod, Class<?> targetType, String text) {
-            if (canUsePropertyEditors())
+            if (!canUsePropertyEditors())
                 return SKIP;
 
             PropertyEditor editor = PropertyEditorManager.findEditor(targetType);
@@ -160,7 +160,7 @@ Object tryConvert(Method targetMethod, Class<?> targetType, String text) {
         }
 
         private boolean canUsePropertyEditors() {
-            return ! isPropertyEditoryAvailable() || isPropertyEditorDisabled();
+            return isPropertyEditoryAvailable() && !isPropertyEditorDisabled();
         }
 
         private boolean isPropertyEditoryAvailable() {