svn commit: r1631740 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java

[ilgrosso]

Author: ilgrosso
Date: Tue Oct 14 13:14:57 2014
New Revision: 1631740

URL: http://svn.apache.org/r1631740
Log:
[SYNCOPE-565] Merge from 1_2_X

Modified:
    syncope/trunk/   (props changed)
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
    
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_2_X:r1631710-1631737

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1631740&r1=1631739&r2=1631740&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
 Tue Oct 14 13:14:57 2014
@@ -206,7 +206,8 @@ public class ReportletConfModalPage exte
         if (ClassUtils.isAssignable(Boolean.class, type)) {
             result = new AjaxCheckBoxPanel(id, fieldName, model);
         } else if (ClassUtils.isAssignable(Number.class, type)) {
-            result = new SpinnerFieldPanel<Number>(id, fieldName, 
(Class<Number>) type, model, null, null);
+            result = new SpinnerFieldPanel<Number>(id, fieldName,
+                    (Class<Number>) 
ClassUtils.resolvePrimitiveIfNecessary(type), model, null, null);
         } else if (Date.class.equals(type)) {
             result = new DateTimeFieldPanel(id, fieldName, model, 
SyncopeConstants.DEFAULT_DATE_PATTERN);
         } else if (type.isEnum()) {

Modified: 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1631740&r1=1631739&r2=1631740&view=diff
==============================================================================
--- 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
 (original)
+++ 
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
 Tue Oct 14 13:14:57 2014
@@ -155,7 +155,8 @@ public class ResourceConnConfPanel exten
                             }
 
                             if (ClassUtils.isAssignable(Number.class, 
propertySchemaClass)) {
-                                Class<Number> numberClass = (Class<Number>) 
propertySchemaClass;
+                                Class<Number> numberClass =
+                                        (Class<Number>) 
ClassUtils.resolvePrimitiveIfNecessary(propertySchemaClass);
                                 field = new SpinnerFieldPanel<Number>("panel", 
label.getDefaultModelObjectAsString(),
                                         numberClass, new Model<Number>(), 
null, null);