syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1435078 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
Date Fri, 18 Jan 2013 10:53:12 GMT
Author: ilgrosso
Date: Fri Jan 18 10:53:11 2013
New Revision: 1435078

URL: http://svn.apache.org/viewvc?rev=1435078&view=rev
Log:
Merge from 1_0_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/UserSearchResultPanel.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1434781-1435069

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=1435078&r1=1435077&r2=1435078&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
Fri Jan 18 10:53:11 2013
@@ -31,6 +31,18 @@ import org.apache.syncope.annotation.For
 import org.apache.syncope.client.SyncopeConstants;
 import org.apache.syncope.client.report.ReportletConf;
 import org.apache.syncope.client.search.NodeCond;
+import org.apache.syncope.console.pages.panels.UserSearchPanel;
+import org.apache.syncope.console.rest.ReportRestClient;
+import org.apache.syncope.console.rest.SchemaRestClient;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.CheckBoxMultipleChoiceFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
 import org.apache.syncope.types.AttributableType;
 import org.apache.wicket.Component;
 import org.apache.wicket.PageReference;
@@ -55,18 +67,6 @@ import org.apache.wicket.spring.injectio
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.util.ClassUtils;
-import org.apache.syncope.console.pages.panels.UserSearchPanel;
-import org.apache.syncope.console.rest.ReportRestClient;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel;
-import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.CheckBoxMultipleChoiceFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
 
 public class ReportletConfModalPage extends BaseModalPage {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java?rev=1435078&r1=1435077&r2=1435078&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
(original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
Fri Jan 18 10:53:11 2013
@@ -49,6 +49,7 @@ import org.apache.wicket.extensions.mark
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.ResourceModel;
+import org.springframework.util.ReflectionUtils;
 
 public class UserSearchResultPanel extends AbstractSearchResultPanel {
 
@@ -66,17 +67,7 @@ public class UserSearchResultPanel exten
                 new ArrayList<IColumn<AbstractAttributableTO, String>>();
 
         for (String name : prefMan.getList(getRequest(), Constants.PREF_USERS_DETAILS_VIEW))
{
-            Field field = null;
-            try {
-                field = UserTO.class.getDeclaredField(name);
-            } catch (Exception ue) {
-                LOG.debug("Error retrieving UserTO field {}", name, ue);
-                try {
-                    field = AbstractAttributableTO.class.getDeclaredField(name);
-                } catch (Exception aae) {
-                    LOG.error("Error retrieving AbstractAttributableTO field {}", name, aae);
-                }
-            }
+            final Field field = ReflectionUtils.findField(UserTO.class, name);
 
             if ("token".equalsIgnoreCase(name)) {
                 columns.add(new TokenColumn("token"));



Mime
View raw message