syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1553676 [1/2] - in /syncope/trunk: common/src/main/java/org/apache/syncope/common/types/ console/src/main/java/org/apache/syncope/console/ console/src/main/java/org/apache/syncope/console/commons/ console/src/main/java/org/apache/syncope/c...
Date Fri, 27 Dec 2013 14:23:52 GMT
Author: ilgrosso
Date: Fri Dec 27 14:23:50 2013
New Revision: 1553676

URL: http://svn.apache.org/r1553676
Log:
Huge clean up of console code (generics are your friends) + usage of SpinnerFieldPanel in AttributesPanel

Added:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerSchemaModalPage.java
      - copied, changed from r1553458, syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirSchemaModalPage.java
      - copied, changed from r1553458, syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/MultiFieldPanel.java
      - copied, changed from r1553458, syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.java
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiFieldPanel.html
      - copied unchanged from r1553458, syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiFieldPanel.properties
      - copied unchanged from r1553458, syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiFieldPanel_it.properties
      - copied unchanged from r1553458, syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiFieldPanel_pt_BR.properties
      - copied unchanged from r1553458, syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_pt_BR.properties
Removed:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.java
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_it.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_pt_BR.properties
Modified:
    syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SchemaModalPageFactory.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/CrontabContainer.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/VirtualAttributesPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/UserRestClient.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTextFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SelectableRecorder.java
    syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/SpinnerFieldPanel.java
    syncope/trunk/console/src/main/webapp/css/fieldstyle.css

Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ConnConfProperty.java Fri Dec 27 14:23:50 2013
@@ -37,7 +37,7 @@ public class ConnConfProperty extends Ab
 
     private ConnConfPropSchema schema;
 
-    private List<Object> values = new ArrayList<Object>();
+    private final List<Object> values = new ArrayList<Object>();
 
     private boolean overridable;
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java Fri Dec 27 14:23:50 2013
@@ -148,7 +148,7 @@ public class SyncopeApplication
             }
         });
 
-        final AjaxLink<Void> infoLink = new AjaxLink<Void>("infoLink") {
+        final AjaxLink<Page> infoLink = new AjaxLink<Page>("infoLink") {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -159,7 +159,7 @@ public class SyncopeApplication
         };
         page.add(infoLink);
 
-        BookmarkablePageLink<Void> schemaLink = new BookmarkablePageLink<Void>("schema", Schema.class);
+        BookmarkablePageLink<Page> schemaLink = new BookmarkablePageLink<Page>("schema", Schema.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 schemaLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Schema", "list"));
         page.add(schemaLink);
@@ -167,7 +167,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "schema" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> usersLink = new BookmarkablePageLink<Void>("users", Users.class);
+        BookmarkablePageLink<Page> usersLink = new BookmarkablePageLink<Page>("users", Users.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 usersLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Users", "list"));
         page.add(usersLink);
@@ -175,7 +175,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "users" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> rolesLink = new BookmarkablePageLink<Void>("roles", Roles.class);
+        BookmarkablePageLink<Page> rolesLink = new BookmarkablePageLink<Page>("roles", Roles.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 rolesLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Roles", "list"));
         page.add(rolesLink);
@@ -183,7 +183,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "roles" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> resourcesLink = new BookmarkablePageLink<Void>("resources", Resources.class);
+        BookmarkablePageLink<Page> resourcesLink = new BookmarkablePageLink<Page>("resources", Resources.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 resourcesLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Resources", "list"));
         page.add(resourcesLink);
@@ -191,7 +191,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "resources" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> todoLink = new BookmarkablePageLink<Void>("todo", Todo.class);
+        BookmarkablePageLink<Page> todoLink = new BookmarkablePageLink<Page>("todo", Todo.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 todoLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Approval", "list"));
         page.add(todoLink);
@@ -199,7 +199,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "todo" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> reportLink = new BookmarkablePageLink<Void>("reports", Reports.class);
+        BookmarkablePageLink<Page> reportLink = new BookmarkablePageLink<Page>("reports", Reports.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 reportLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Reports", "list"));
         page.add(reportLink);
@@ -207,7 +207,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "reports" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> configurationLink = new BookmarkablePageLink<Void>("configuration",
+        BookmarkablePageLink<Page> configurationLink = new BookmarkablePageLink<Page>("configuration",
                 Configuration.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 configurationLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Configuration", "list"));
@@ -216,7 +216,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "configuration" + Constants.PNG_EXT)));
 
-        BookmarkablePageLink<Void> taskLink = new BookmarkablePageLink<Void>("tasks", Tasks.class);
+        BookmarkablePageLink<Page> taskLink = new BookmarkablePageLink<Page>("tasks", Tasks.class);
         MetaDataRoleAuthorizationStrategy.authorize(
                 taskLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles("Tasks", "list"));
         page.add(taskLink);
@@ -224,7 +224,7 @@ public class SyncopeApplication
                 ? IMG_NOTSEL
                 : "") + "tasks" + Constants.PNG_EXT)));
 
-        page.add(new BookmarkablePageLink<Void>("logout", Logout.class));
+        page.add(new BookmarkablePageLink<Page>("logout", Logout.class));
     }
 
     public void setupEditProfileModal(final WebPage page, final UserSelfRestClient userSelfRestClient) {
@@ -236,7 +236,7 @@ public class SyncopeApplication
         editProfileModalWin.setCookieName("edit-profile-modal");
         page.add(editProfileModalWin);
 
-        final AjaxLink<Void> editProfileLink = new AjaxLink<Void>("editProfileLink") {
+        final AjaxLink<Page> editProfileLink = new AjaxLink<Page>("editProfileLink") {
 
             private static final long serialVersionUID = -7978723352517770644L;
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SchemaModalPageFactory.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SchemaModalPageFactory.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SchemaModalPageFactory.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/SchemaModalPageFactory.java Fri Dec 27 14:23:50 2013
@@ -21,9 +21,9 @@ package org.apache.syncope.console.commo
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.types.SchemaType;
 import org.apache.syncope.console.pages.AbstractSchemaModalPage;
-import org.apache.syncope.console.pages.DerivedSchemaModalPage;
+import org.apache.syncope.console.pages.DerSchemaModalPage;
 import org.apache.syncope.console.pages.SchemaModalPage;
-import org.apache.syncope.console.pages.VirtualSchemaModalPage;
+import org.apache.syncope.console.pages.VirSchemaModalPage;
 
 public final class SchemaModalPageFactory {
 
@@ -41,11 +41,11 @@ public final class SchemaModalPageFactor
 
         switch (schemaType) {
             case DERIVED:
-                page = (T) new DerivedSchemaModalPage(entity);
+                page = (T) new DerSchemaModalPage(entity);
                 break;
 
             case VIRTUAL:
-                page = (T) new VirtualSchemaModalPage(entity);
+                page = (T) new VirSchemaModalPage(entity);
                 break;
 
             default:

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/CrontabContainer.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/CrontabContainer.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/CrontabContainer.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/markup/html/CrontabContainer.java Fri Dec 27 14:23:50 2013
@@ -48,6 +48,7 @@ public class CrontabContainer extends We
 
     private final TextField daysOfWeek;
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public CrontabContainer(final String id, final PropertyModel<String> cronExpressionModel,
             final String cronExpression) {
 
@@ -66,16 +67,15 @@ public class CrontabContainer extends We
         final DropDownChoice<SelectOption> cronTemplateChooser =
                 new DropDownChoice<SelectOption>("cronTemplateChooser") {
 
-            private static final long serialVersionUID = -5843424545478691442L;
+                    private static final long serialVersionUID = -5843424545478691442L;
 
-            @Override
-            protected CharSequence getDefaultChoice(final String selected) {
-                return "<option value=\"\">" + getString("chooseForTemplate") + "</option>";
-            }
-        };
+                    @Override
+                    protected CharSequence getDefaultChoice(final String selected) {
+                        return "<option value=\"\">" + getString("chooseForTemplate") + "</option>";
+                    }
+                };
 
-        cronTemplateChooser.setModel(
-                new IModel<SelectOption>() {
+        cronTemplateChooser.setModel(new IModel<SelectOption>() {
 
             private static final long serialVersionUID = 6762568283146531315L;
 
@@ -101,6 +101,7 @@ public class CrontabContainer extends We
 
             @Override
             public void detach() {
+                // no detach
             }
         });
         cronTemplateChooser.setChoices(Arrays.asList(CRON_TEMPLATES));

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchemaModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSchemaModalPage.java Fri Dec 27 14:23:50 2013
@@ -18,7 +18,7 @@
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.common.AbstractBaseBean;
+import org.apache.syncope.common.to.AbstractSchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -26,7 +26,7 @@ import org.apache.wicket.extensions.ajax
 /**
  * Modal window with Schema form.
  */
-public abstract class AbstractSchemaModalPage extends BaseModalPage {
+public abstract class AbstractSchemaModalPage<T extends AbstractSchemaTO> extends BaseModalPage {
 
     private static final long serialVersionUID = 7369215690388444748L;
 
@@ -36,7 +36,7 @@ public abstract class AbstractSchemaModa
         this.kind = kind;
     }
 
-    public abstract void setSchemaModalPage(PageReference callerPageRef, ModalWindow window, AbstractBaseBean schema,
+    public abstract void setSchemaModalPage(PageReference callerPageRef, ModalWindow window, T schema,
             boolean createFlag);
 
     public AttributableType getKind() {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionModalPage.java Fri Dec 27 14:23:50 2013
@@ -127,7 +127,7 @@ public class BulkActionModalPage<T, S> e
                         final BulkActionResult res = (BulkActionResult) bulkActionExecutor.getClass().
                                 getMethod("bulkAction", BulkAction.class).invoke(bulkActionExecutor, bulkAction);
 
-                        setResponsePage(new BulkActionResultModalPage(window, items, columns, res, idFieldName));
+                        setResponsePage(new BulkActionResultModalPage<T, S>(window, items, columns, res, idFieldName));
                     } catch (Exception e) {
                         LOG.error("Operation {} not supported", bulkAction.getOperation(), e);
                     }
@@ -142,13 +142,13 @@ public class BulkActionModalPage<T, S> e
         final AjaxButton cancel =
                 new ClearIndicatingAjaxButton(CANCEL, new ResourceModel(CANCEL), getPageReference()) {
 
-            private static final long serialVersionUID = -958724007591692537L;
+                    private static final long serialVersionUID = -958724007591692537L;
 
-            @Override
-            protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
-                window.close(target);
-            }
-        };
+                    @Override
+                    protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
+                        window.close(target);
+                    }
+                };
 
         cancel.setDefaultFormProcessing(false);
         form.add(cancel);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BulkActionResultModalPage.java Fri Dec 27 14:23:50 2013
@@ -60,7 +60,7 @@ public class BulkActionResultModalPage<T
             private static final long serialVersionUID = 5291903859908641954L;
 
             @Override
-            public Iterator<? extends T> iterator(long first, long count) {
+            public Iterator<? extends T> iterator(final long first, final long count) {
                 return items.iterator();
             }
 
@@ -70,7 +70,7 @@ public class BulkActionResultModalPage<T
             }
 
             @Override
-            public IModel<T> model(T object) {
+            public IModel<T> model(final T object) {
                 return new CompoundPropertyModel<T>(object);
             }
         };
@@ -92,6 +92,5 @@ public class BulkActionResultModalPage<T
         };
 
         add(close);
-
     }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Fri Dec 27 14:23:50 2013
@@ -377,10 +377,12 @@ public class Configuration extends BaseP
                 "Configuration", "read"));
         add(dbExportLink);
 
+        @SuppressWarnings("rawtypes")
         Form confPaginatorForm = new Form("confPaginatorForm");
 
-        final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
-                "confPaginatorRows"), prefMan.getPaginatorChoices());
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
+                new PropertyModel(this, "confPaginatorRows"), prefMan.getPaginatorChoices());
 
         rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
 
@@ -528,8 +530,10 @@ public class Configuration extends BaseP
                 "Notification", "create"));
         add(createNotificationLink);
 
+        @SuppressWarnings("rawtypes")
         Form notificationPaginatorForm = new Form("notificationPaginatorForm");
 
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
                 "notificationPaginatorRows"), prefMan.getPaginatorChoices());
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java Fri Dec 27 14:23:50 2013
@@ -45,7 +45,7 @@ public class ConfigurationModalPage exte
     @SpringBean
     private ConfigurationRestClient configurationsRestClient;
 
-    private AjaxButton submit;
+    private final AjaxButton submit;
 
     /**
      * ConfigurationModalPage constructor.
@@ -58,15 +58,17 @@ public class ConfigurationModalPage exte
     public ConfigurationModalPage(final PageReference pageRef, final ModalWindow window,
             final ConfigurationTO configurationTO, final boolean createFlag) {
 
-        Form form = new Form(FORM, new CompoundPropertyModel(configurationTO));
+        Form<ConfigurationTO> form =
+                new Form<ConfigurationTO>(FORM, new CompoundPropertyModel<ConfigurationTO>(configurationTO));
 
-        final AjaxTextFieldPanel key = new AjaxTextFieldPanel("key", "key", new PropertyModel(configurationTO, "key"));
+        final AjaxTextFieldPanel key = new AjaxTextFieldPanel("key", "key",
+                new PropertyModel<String>(configurationTO, "key"));
         form.add(key);
         key.setEnabled(createFlag);
         key.addRequiredLabel();
 
-        final AjaxTextFieldPanel value = new AjaxTextFieldPanel("value", "value", new PropertyModel(configurationTO,
-                "value"));
+        final AjaxTextFieldPanel value = new AjaxTextFieldPanel("value", "value",
+                new PropertyModel<String>(configurationTO, "value"));
         form.add(value);
 
         submit = new IndicatingAjaxButton(APPLY, new Model<String>(getString(SUBMIT))) {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnObjectModalPage.java Fri Dec 27 14:23:50 2013
@@ -25,7 +25,7 @@ import org.apache.syncope.common.to.Attr
 import org.apache.syncope.common.to.ConnObjectTO;
 import org.apache.syncope.console.markup.html.list.AltListView;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiFieldPanel;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -90,7 +90,7 @@ public class ConnObjectModalPage extends
                     field = new AjaxTextFieldPanel("value",
                             prop.getSchema(), new Model<String>(prop.getValues().get(0)));
                 } else {
-                    field = new MultiValueSelectorPanel<String>("value", new ListModel<String>(prop.getValues()),
+                    field = new MultiFieldPanel<String>("value", new ListModel<String>(prop.getValues()),
                             new AjaxTextFieldPanel("panel", prop.getSchema(), new Model<String>()));
                 }
                 item.add(field);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Fri Dec 27 14:23:50 2013
@@ -41,7 +41,7 @@ import org.apache.syncope.console.wicket
 import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
 import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import org.apache.syncope.console.wicket.markup.html.form.FieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiFieldPanel;
 import org.apache.syncope.console.wicket.markup.html.form.SpinnerFieldPanel;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -358,7 +358,7 @@ public class ConnectorModalPage extends 
                                 property.getValues().add(null);
                             }
 
-                            item.add(new MultiValueSelectorPanel<String>(
+                            item.add(new MultiFieldPanel<String>(
                                             "panel", new PropertyModel<List<String>>(property, "values"), field));
                         } else {
                             field.setNewModel(property.getValues());

Copied: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerSchemaModalPage.java (from r1553458, syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerSchemaModalPage.java?p2=syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerSchemaModalPage.java&p1=syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java&r1=1553458&r2=1553676&rev=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerSchemaModalPage.java Fri Dec 27 14:23:50 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.common.AbstractBaseBean;
 import org.apache.syncope.common.to.DerSchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.SyncopeClientException;
@@ -41,25 +40,25 @@ import org.apache.wicket.model.ResourceM
 /**
  * Modal window with Schema form.
  */
-public class DerivedSchemaModalPage extends AbstractSchemaModalPage {
+public class DerSchemaModalPage extends AbstractSchemaModalPage<DerSchemaTO> {
 
     private static final long serialVersionUID = 6668789770131753386L;
 
-    public DerivedSchemaModalPage(final AttributableType kind) {
+    public DerSchemaModalPage(final AttributableType kind) {
         super(kind);
     }
 
     @Override
     public void setSchemaModalPage(final PageReference pageRef, final ModalWindow window,
-            AbstractBaseBean schema, final boolean createFlag) {
+            DerSchemaTO schema, final boolean createFlag) {
 
         if (schema == null) {
             schema = new DerSchemaTO();
         }
 
-        final Form schemaForm = new Form(FORM);
+        final Form<DerSchemaTO> schemaForm = new Form<DerSchemaTO>(FORM);
 
-        schemaForm.setModel(new CompoundPropertyModel(schema));
+        schemaForm.setModel(new CompoundPropertyModel<DerSchemaTO>(schema));
 
         final AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", getString("name"), new PropertyModel<String>(
                 schema, "name"));
@@ -72,11 +71,9 @@ public class DerivedSchemaModalPage exte
         final WebMarkupContainer jexlHelp = JexlHelpUtil.getJexlHelpWebContainer("jexlHelp");
         schemaForm.add(jexlHelp);
 
-
-        final AjaxLink questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
+        final AjaxLink<Void> questionMarkJexlHelp = JexlHelpUtil.getAjaxLink(jexlHelp, "questionMarkJexlHelp");
         schemaForm.add(questionMarkJexlHelp);
 
-
         name.setEnabled(createFlag);
 
         final AjaxButton submit = new IndicatingAjaxButton(APPLY, new ResourceModel(SUBMIT)) {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ErrorPage.java Fri Dec 27 14:23:50 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.console.pages;
 
+import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.model.Model;
@@ -30,12 +31,13 @@ public class ErrorPage extends BasePage 
 
     private static final long serialVersionUID = -390761262038796657L;
 
+    @SuppressWarnings("unchecked")
     public ErrorPage(final PageParameters parameters) {
         super(parameters);
 
         add(new Label("errorTitle", new Model<String>(parameters.get("errorTitle").toString())));
         add(new Label("errorMessage", new Model<String>(parameters.get("errorMessage").toString())));
 
-        add(new BookmarkablePageLink("home", getApplication().getHomePage()));
+        add(new BookmarkablePageLink<Page>("home", getApplication().getHomePage()));
     }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Fri Dec 27 14:23:50 2013
@@ -42,11 +42,11 @@ public class MembershipModalPage extends
     public MembershipModalPage(final PageReference pageRef, final ModalWindow window, final MembershipTO membershipTO,
             final boolean templateMode) {
 
-        final Form form = new Form("MembershipForm");
+        final Form<MembershipTO> form = new Form<MembershipTO>("MembershipForm");
 
         final UserTO userTO = ((UserModalPage) pageRef.getPage()).getUserTO();
 
-        form.setModel(new CompoundPropertyModel(membershipTO));
+        form.setModel(new CompoundPropertyModel<MembershipTO>(membershipTO));
 
         submit = new AjaxButton(SUBMIT, new ResourceModel(SUBMIT)) {
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Fri Dec 27 14:23:50 2013
@@ -108,10 +108,11 @@ public class ReportModalPage extends Bas
     private ListChoice<AbstractReportletConf> reportlets;
 
     public ReportModalPage(final ModalWindow window, final ReportTO reportTO, final PageReference callerPageRef) {
+        super();
         this.reportTO = reportTO;
 
         form = new Form<ReportTO>(FORM);
-        form.setModel(new CompoundPropertyModel(reportTO));
+        form.setModel(new CompoundPropertyModel<ReportTO>(reportTO));
         add(form);
 
         setupProfile();
@@ -128,16 +129,16 @@ public class ReportModalPage extends Bas
 
                     @Override
                     protected void onSubmitInternal(final AjaxRequestTarget target, final Form<?> form) {
-                        ReportTO reportTO = (ReportTO) form.getModelObject();
-                        reportTO.setCronExpression(StringUtils.hasText(reportTO.getCronExpression())
+                        ReportTO toSubmit = (ReportTO) form.getModelObject();
+                        toSubmit.setCronExpression(StringUtils.hasText(toSubmit.getCronExpression())
                                 ? crontab.getCronExpression()
                                 : null);
 
                         try {
-                            if (reportTO.getId() > 0) {
-                                reportRestClient.update(reportTO);
+                            if (toSubmit.getId() > 0) {
+                                reportRestClient.update(toSubmit);
                             } else {
-                                reportRestClient.create(reportTO);
+                                reportRestClient.create(toSubmit);
                             }
 
                             ((BasePage) callerPageRef.getPage()).setModalResult(true);
@@ -157,11 +158,11 @@ public class ReportModalPage extends Bas
                 };
 
         if (reportTO.getId() > 0) {
-            MetaDataRoleAuthorizationStrategy.authorize(submit, RENDER, xmlRolesReader.getAllAllowedRoles("Reports",
-                    "update"));
+            MetaDataRoleAuthorizationStrategy.authorize(submit, RENDER,
+                    xmlRolesReader.getAllAllowedRoles("Reports", "update"));
         } else {
-            MetaDataRoleAuthorizationStrategy.authorize(submit, RENDER, xmlRolesReader.getAllAllowedRoles("Reports",
-                    "create"));
+            MetaDataRoleAuthorizationStrategy.authorize(submit, RENDER,
+                    xmlRolesReader.getAllAllowedRoles("Reports", "create"));
         }
 
         form.add(submit);
@@ -243,8 +244,8 @@ public class ReportModalPage extends Bas
         nextExec.setEnabled(false);
         profile.add(nextExec);
 
-        reportlets = new ListChoice<AbstractReportletConf>("reportletConfs", new Model(), reportTO.getReportletConfs(),
-                new IChoiceRenderer<ReportletConf>() {
+        reportlets = new ListChoice<AbstractReportletConf>("reportletConfs", new Model<AbstractReportletConf>(),
+                reportTO.getReportletConfs(), new IChoiceRenderer<ReportletConf>() {
 
                     private static final long serialVersionUID = 1048000918946220007L;
 
@@ -254,7 +255,7 @@ public class ReportModalPage extends Bas
                     }
 
                     @Override
-                    public String getIdValue(final ReportletConf object, int index) {
+                    public String getIdValue(final ReportletConf object, final int index) {
                         return object.getName();
                     }
                 }) {
@@ -262,7 +263,7 @@ public class ReportModalPage extends Bas
                     private static final long serialVersionUID = 4022366881854379834L;
 
                     @Override
-                    protected CharSequence getDefaultChoice(String selectedValue) {
+                    protected CharSequence getDefaultChoice(final String selectedValue) {
                         return null;
                     }
                 };
@@ -274,12 +275,12 @@ public class ReportModalPage extends Bas
             private static final long serialVersionUID = -1107858522700306810L;
 
             @Override
-            protected void onUpdate(AjaxRequestTarget target) {
+            protected void onUpdate(final AjaxRequestTarget target) {
                 target.add(reportlets);
             }
         });
 
-        profile.add(new AjaxLink(ADD_BUTTON_ID) {
+        profile.add(new AjaxLink<Void>(ADD_BUTTON_ID) {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -301,13 +302,12 @@ public class ReportModalPage extends Bas
             }
         });
 
-        profile.add(new AjaxLink(EDIT_BUTTON_ID) {
+        profile.add(new AjaxLink<Void>(EDIT_BUTTON_ID) {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
             @Override
             public void onClick(final AjaxRequestTarget target) {
-
                 if (reportlets.getModelObject() != null) {
                     reportletConfWin.setPageCreator(new ModalWindow.PageCreator() {
 
@@ -322,13 +322,11 @@ public class ReportModalPage extends Bas
                         }
                     });
                     reportletConfWin.show(target);
-                } else {
-                    target.appendJavaScript("alert('" + getString("selectItem") + "')");
                 }
             }
         });
 
-        profile.add(new AjaxLink(REMOVE_BUTTON_ID) {
+        profile.add(new AjaxLink<Void>(REMOVE_BUTTON_ID) {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -341,7 +339,6 @@ public class ReportModalPage extends Bas
 
             @Override
             protected void updateAjaxAttributes(final AjaxRequestAttributes attributes) {
-
                 if (reportlets.getModelObject() != null) {
 
                     super.updateAjaxAttributes(attributes);
@@ -360,7 +357,7 @@ public class ReportModalPage extends Bas
             }
         });
 
-        profile.add(new AjaxLink(UP_BUTTON_ID) {
+        profile.add(new AjaxLink<Void>(UP_BUTTON_ID) {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -373,7 +370,7 @@ public class ReportModalPage extends Bas
             }
         });
 
-        profile.add(new AjaxLink(DOWN_BUTTON_ID) {
+        profile.add(new AjaxLink<Void>(DOWN_BUTTON_ID) {
 
             private static final long serialVersionUID = -7978723352517770644L;
 
@@ -405,6 +402,7 @@ public class ReportModalPage extends Bas
         }
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private void setupExecutions() {
         final WebMarkupContainer executions = new WebMarkupContainer("executionContainer");
         executions.setOutputMarkupId(true);
@@ -562,11 +560,12 @@ public class ReportModalPage extends Bas
 
         private static final long serialVersionUID = 2118096121691420539L;
 
-        private SortableDataProviderComparator<ReportExecTO> comparator;
+        private final SortableDataProviderComparator<ReportExecTO> comparator;
 
-        private ReportTO reportTO;
+        private final ReportTO reportTO;
 
         public ReportExecutionsProvider(final ReportTO reportTO) {
+            super();
             this.reportTO = reportTO;
             setSort("startDate", SortOrder.DESCENDING);
             comparator = new SortableDataProviderComparator<ReportExecTO>(this);
@@ -613,6 +612,7 @@ public class ReportModalPage extends Bas
         private HttpResourceStream stream;
 
         public AjaxExportDownloadBehavior(final ReportExecExportFormat exportFormat, final long exportExecId) {
+            super();
             this.exportFormat = exportFormat;
             this.exportExecId = exportExecId;
         }

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=1553676&r1=1553675&r2=1553676&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 Dec 27 14:23:50 2013
@@ -42,7 +42,7 @@ import org.apache.syncope.console.wicket
 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.console.wicket.markup.html.form.MultiFieldPanel;
 import org.apache.syncope.console.wicket.markup.html.form.SpinnerFieldPanel;
 import org.apache.wicket.Component;
 import org.apache.wicket.PageReference;
@@ -95,7 +95,7 @@ public class ReportletConfModalPage exte
         form.add(propertiesContainer);
 
         name = new AjaxTextFieldPanel("name", "name", this.reportletConf == null
-                ? new Model()
+                ? new Model<String>()
                 : new PropertyModel<String>(this.reportletConf, "name"));
         name.setOutputMarkupId(true);
         name.addRequiredLabel();
@@ -196,6 +196,7 @@ public class ReportletConfModalPage exte
         form.add(cancel);
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private FieldPanel buildSinglePanel(final Class<?> type, final String fieldName, final String id) {
         FieldPanel result = null;
         PropertyModel model = new PropertyModel(ReportletConfModalPage.this.reportletConf, fieldName);
@@ -242,6 +243,7 @@ public class ReportletConfModalPage exte
 
             private static final long serialVersionUID = 9101744072914090143L;
 
+            @SuppressWarnings({ "unchecked", "rawtypes" })
             @Override
             protected void populateItem(final ListItem<String> item) {
                 final String fieldName = item.getModelObject();
@@ -339,7 +341,7 @@ public class ReportletConfModalPage exte
                             ((List) wrapper.getPropertyValue(fieldName)).add(null);
                         }
 
-                        panel = new MultiValueSelectorPanel("value", new PropertyModel<List>(
+                        panel = new MultiFieldPanel("value", new PropertyModel<List>(
                                 ReportletConfModalPage.this.reportletConf, fieldName),
                                 buildSinglePanel(field.getType(), fieldName, "panel"));
                     }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Fri Dec 27 14:23:50 2013
@@ -105,24 +105,24 @@ public class Reports extends BasePage {
         setupAudit();
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     private void setupReport() {
         reportContainer = new WebMarkupContainer("reportContainer");
         setWindowClosedCallback(window, reportContainer);
 
-        MetaDataRoleAuthorizationStrategy.authorize(reportContainer, RENDER, xmlRolesReader.getAllAllowedRoles(
-                "Reports", "list"));
+        MetaDataRoleAuthorizationStrategy.authorize(reportContainer, RENDER,
+                xmlRolesReader.getAllAllowedRoles("Reports", "list"));
 
         paginatorRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_REPORT_PAGINATOR_ROWS);
 
-        List<IColumn> columns = new ArrayList<IColumn>();
-        columns.add(new PropertyColumn(new ResourceModel("id"), "id", "id"));
-        columns.add(new PropertyColumn(new ResourceModel("name"), "name", "name"));
-        columns.add(new DatePropertyColumn(new ResourceModel("lastExec"), "lastExec", "lastExec"));
-        columns.add(new DatePropertyColumn(new ResourceModel("nextExec"), "nextExec", "nextExec"));
-        columns.add(new DatePropertyColumn(new ResourceModel("startDate"), "startDate", "startDate"));
-        columns.add(new DatePropertyColumn(new ResourceModel("endDate"), "endDate", "endDate"));
-        columns.add(new PropertyColumn(new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
+        List<IColumn<ReportTO, String>> columns = new ArrayList<IColumn<ReportTO, String>>();
+        columns.add(new PropertyColumn<ReportTO, String>(new ResourceModel("id"), "id", "id"));
+        columns.add(new PropertyColumn<ReportTO, String>(new ResourceModel("name"), "name", "name"));
+        columns.add(new DatePropertyColumn<ReportTO>(new ResourceModel("lastExec"), "lastExec", "lastExec"));
+        columns.add(new DatePropertyColumn<ReportTO>(new ResourceModel("nextExec"), "nextExec", "nextExec"));
+        columns.add(new DatePropertyColumn<ReportTO>(new ResourceModel("startDate"), "startDate", "startDate"));
+        columns.add(new DatePropertyColumn<ReportTO>(new ResourceModel("endDate"), "endDate", "endDate"));
+        columns.add(new PropertyColumn<ReportTO, String>(
+                new ResourceModel("latestExecStatus"), "latestExecStatus", "latestExecStatus"));
         columns.add(new ActionColumn<ReportTO, String>(new ResourceModel("actions", "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
@@ -213,19 +213,22 @@ public class Reports extends BasePage {
             }
         });
 
-        final AjaxFallbackDefaultDataTable reportTable =
-                new AjaxFallbackDefaultDataTable("reportTable", columns, new ReportProvider(), paginatorRows);
+        final AjaxFallbackDefaultDataTable<ReportTO, String> reportTable =
+                new AjaxFallbackDefaultDataTable<ReportTO, String>(
+                        "reportTable", columns, new ReportProvider(), paginatorRows);
 
         reportContainer.add(reportTable);
         reportContainer.setOutputMarkupId(true);
 
         add(reportContainer);
 
+        @SuppressWarnings("rawtypes")
         Form paginatorForm = new Form("paginatorForm");
 
-        MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles("Reports",
-                "list"));
+        MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER,
+                xmlRolesReader.getAllAllowedRoles("Reports", "list"));
 
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"),
                 prefMan.getPaginatorChoices());
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Fri Dec 27 14:23:50 2013
@@ -47,6 +47,7 @@ public class ResourceModalPage extends B
 
     private static final long serialVersionUID = 1734415311027284221L;
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public ResourceModalPage(final PageReference pageRef, final ModalWindow window, final ResourceTO resourceTO,
             final boolean createFlag) {
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Fri Dec 27 14:23:50 2013
@@ -394,8 +394,10 @@ public class Resources extends BasePage 
 
         add(createResourceLink);
 
+        @SuppressWarnings("rawtypes")
         final Form paginatorForm = new Form("resourcePaginatorForm");
 
+        @SuppressWarnings({ "unchecked", "rawtypes" })
         final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
                 "resourcePaginatorRows"), prefMan.getPaginatorChoices());
 
@@ -525,33 +527,35 @@ public class Resources extends BasePage 
         editConnectorWin.setInitialWidth(WIN_WIDTH);
         editConnectorWin.setCookieName("edit-conn-modal");
 
-        AjaxLink createConnectorLink = new ClearIndicatingAjaxLink("createConnectorLink", getPageReference()) {
+        AjaxLink<Void> createConnectorLink =
+                new ClearIndicatingAjaxLink<Void>("createConnectorLink", getPageReference()) {
 
-            private static final long serialVersionUID = -7978723352517770644L;
+                    private static final long serialVersionUID = -7978723352517770644L;
 
-            @Override
-            protected void onClickInternal(final AjaxRequestTarget target) {
-                createConnectorWin.setPageCreator(new ModalWindow.PageCreator() {
+                    @Override
+                    protected void onClickInternal(final AjaxRequestTarget target) {
+                        createConnectorWin.setPageCreator(new ModalWindow.PageCreator() {
 
-                    private static final long serialVersionUID = -7834632442532690940L;
+                            private static final long serialVersionUID = -7834632442532690940L;
 
-                    @Override
-                    public Page createPage() {
-                        ConnectorModalPage form = new ConnectorModalPage(Resources.this.getPageReference(),
-                                editConnectorWin, new ConnInstanceTO());
-                        return form;
-                    }
-                });
+                            @Override
+                            public Page createPage() {
+                                ConnectorModalPage form = new ConnectorModalPage(Resources.this.getPageReference(),
+                                        editConnectorWin, new ConnInstanceTO());
+                                return form;
+                            }
+                        });
 
-                createConnectorWin.show(target);
-            }
-        };
+                        createConnectorWin.show(target);
+                    }
+                };
 
         MetaDataRoleAuthorizationStrategy.authorize(createConnectorLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
                 "Connectors", "create"));
 
         add(createConnectorLink);
 
+        @SuppressWarnings("rawtypes")
         Form paginatorForm = new Form("connectorPaginatorForm");
 
         MetaDataRoleAuthorizationStrategy.authorize(paginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles(
@@ -585,9 +589,10 @@ public class Resources extends BasePage 
 
         private static final long serialVersionUID = -9055916672926643975L;
 
-        private SortableDataProviderComparator<ResourceTO> comparator;
+        private final SortableDataProviderComparator<ResourceTO> comparator;
 
         public ResourcesProvider() {
+            super();
             //Default sorting
             setSort("name", SortOrder.ASCENDING);
             comparator = new SortableDataProviderComparator<ResourceTO>(this);
@@ -629,9 +634,10 @@ public class Resources extends BasePage 
 
         private static final long serialVersionUID = 4445909568349448518L;
 
-        private SortableDataProviderComparator<ConnInstanceTO> comparator;
+        private final SortableDataProviderComparator<ConnInstanceTO> comparator;
 
         public ConnectorsProvider() {
+            super();
             //Default sorting
             setSort("id", SortOrder.ASCENDING);
             comparator = new SortableDataProviderComparator<ConnInstanceTO>(this);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java Fri Dec 27 14:23:50 2013
@@ -260,7 +260,7 @@ public class ResultStatusModalPage exten
      * @param propTO propagation TO.
      * @return list view.
      */
-    private ListView getConnObjectView(final PropagationStatus propTO) {
+    private ListView<String> getConnObjectView(final PropagationStatus propTO) {
         final ConnObjectTO before = propTO.getBeforeObj();
         final ConnObjectTO after = propTO.getAfterObj();
 
@@ -273,19 +273,13 @@ public class ResultStatusModalPage exten
         head.add(ConnIdSpecialAttributeName.UID);
         head.add(ConnIdSpecialAttributeName.NAME);
 
-        final Map<String, AttributeTO> beforeAttrMap;
-        if (before == null) {
-            beforeAttrMap = Collections.<String, AttributeTO>emptyMap();
-        } else {
-            beforeAttrMap = before.getAttrMap();
-        }
-
-        final Map<String, AttributeTO> afterAttrMap;
-        if (after == null) {
-            afterAttrMap = Collections.<String, AttributeTO>emptyMap();
-        } else {
-            afterAttrMap = after.getAttrMap();
-        }
+        final Map<String, AttributeTO> beforeAttrMap = before == null
+                ? Collections.<String, AttributeTO>emptyMap()
+                : before.getAttrMap();
+
+        final Map<String, AttributeTO> afterAttrMap = after == null
+                ? Collections.<String, AttributeTO>emptyMap()
+                : after.getAttrMap();
 
         final Set<String> attributes = new HashSet<String>();
         attributes.addAll(beforeAttrMap.keySet());
@@ -307,13 +301,13 @@ public class ResultStatusModalPage exten
             }
         }
 
-        return new ListView("attrs", profile) {
+        return new ListView<String>("attrs", profile) {
 
             private static final long serialVersionUID = 4949588177564901031L;
 
             @Override
-            protected void populateItem(final ListItem item) {
-                String name = item.getModelObject().toString();
+            protected void populateItem(final ListItem<String> item) {
+                String name = item.getModelObject();
 
                 final Fragment beforeValue;
                 final Fragment afterValue;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Fri Dec 27 14:23:50 2013
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.to.AbstractSchemaTO;
+import org.apache.syncope.common.to.SchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.types.SchemaType;
 import org.apache.syncope.console.commons.Constants;

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Fri Dec 27 14:23:50 2013
@@ -18,14 +18,12 @@
  */
 package org.apache.syncope.console.pages;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.AbstractBaseBean;
 import org.apache.syncope.common.SyncopeConstants;
 import org.apache.syncope.common.to.SchemaTO;
 import org.apache.syncope.common.types.AttributableType;
@@ -36,7 +34,7 @@ import org.apache.syncope.console.common
 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.AjaxTextFieldPanel;
-import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
+import org.apache.syncope.console.wicket.markup.html.form.MultiFieldPanel;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -60,7 +58,7 @@ import org.apache.wicket.util.string.Str
 /**
  * Modal window with Schema form.
  */
-public class SchemaModalPage extends AbstractSchemaModalPage {
+public class SchemaModalPage extends AbstractSchemaModalPage<SchemaTO> {
 
     private static final long serialVersionUID = -5991561277287424057L;
 
@@ -70,18 +68,15 @@ public class SchemaModalPage extends Abs
 
     @Override
     public void setSchemaModalPage(final PageReference pageRef, final ModalWindow window,
-            AbstractBaseBean schemaTO, final boolean createFlag) {
+            final SchemaTO schemaTO, final boolean createFlag) {
 
-        final SchemaTO schema;
-        if (schemaTO != null && schemaTO instanceof SchemaTO) {
-            schema = (SchemaTO) schemaTO;
-        } else {
-            schema = new SchemaTO();
-        }
+        final SchemaTO schema = schemaTO == null
+                ? new SchemaTO()
+                : schemaTO;
 
-        final Form schemaForm = new Form(FORM);
+        final Form<SchemaTO> schemaForm = new Form<SchemaTO>(FORM);
 
-        schemaForm.setModel(new CompoundPropertyModel(schema));
+        schemaForm.setModel(new CompoundPropertyModel<SchemaTO>(schema));
         schemaForm.setOutputMarkupId(Boolean.TRUE);
 
         final AjaxTextFieldPanel name =
@@ -104,33 +99,35 @@ public class SchemaModalPage extends Abs
         };
 
         final AjaxDropDownChoicePanel<String> validatorClass = new AjaxDropDownChoicePanel<String>("validatorClass",
-                getString("validatorClass"), new PropertyModel(schema, "validatorClass"));
+                getString("validatorClass"), new PropertyModel<String>(schema, "validatorClass"));
 
         ((DropDownChoice) validatorClass.getField()).setNullValid(true);
         validatorClass.setChoices(validatorsList.getObject());
 
         final AjaxDropDownChoicePanel<AttributeSchemaType> type = new AjaxDropDownChoicePanel<AttributeSchemaType>(
-                "type", getString("type"), new PropertyModel(schema, "type"));
+                "type", getString("type"), new PropertyModel<AttributeSchemaType>(schema, "type"));
         type.setChoices(Arrays.asList(AttributeSchemaType.values()));
         type.addRequiredLabel();
 
         final AjaxTextFieldPanel enumerationValuesPanel =
                 new AjaxTextFieldPanel("panel", "enumerationValues", new Model<String>(null));
-        final MultiValueSelectorPanel<String> enumerationValues =
-                new MultiValueSelectorPanel<String>("enumerationValues",
-                new Model(),
-                enumerationValuesPanel);
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final MultiFieldPanel<String> enumerationValues =
+                new MultiFieldPanel<String>("enumerationValues",
+                        new Model(),
+                        enumerationValuesPanel);
         schemaForm.add(enumerationValues);
 
-        enumerationValues.setModelObject((Serializable) getEnumValuesAsList(schema.getEnumerationValues()));
+        enumerationValues.setModelObject(getEnumValuesAsList(schema.getEnumerationValues()));
 
-        final MultiValueSelectorPanel<String> enumerationKeys =
-                new MultiValueSelectorPanel<String>("enumerationKeys",
-                new Model(),
-                new AjaxTextFieldPanel("panel", "enumerationKeys", new Model<String>(null)));
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final MultiFieldPanel<String> enumerationKeys =
+                new MultiFieldPanel<String>("enumerationKeys",
+                        new Model(),
+                        new AjaxTextFieldPanel("panel", "enumerationKeys", new Model<String>(null)));
         schemaForm.add(enumerationKeys);
 
-        enumerationKeys.setModelObject((Serializable) getEnumValuesAsList(schema.getEnumerationKeys()));
+        enumerationKeys.setModelObject(getEnumValuesAsList(schema.getEnumerationKeys()));
 
         if (AttributeSchemaType.Enum == schema.getType()) {
             enumerationValues.setEnabled(Boolean.TRUE);
@@ -152,10 +149,10 @@ public class SchemaModalPage extends Abs
                         enumerationValuesPanel.addRequiredLabel();
                     }
                     enumerationValues.setEnabled(Boolean.TRUE);
-                    enumerationValues.setModelObject((Serializable) getEnumValuesAsList(schema.getEnumerationValues()));
+                    enumerationValues.setModelObject(getEnumValuesAsList(schema.getEnumerationValues()));
 
                     enumerationKeys.setEnabled(Boolean.TRUE);
-                    enumerationKeys.setModelObject((Serializable) getEnumValuesAsList(schema.getEnumerationKeys()));
+                    enumerationKeys.setModelObject(getEnumValuesAsList(schema.getEnumerationKeys()));
                 } else {
                     if (enumerationValuesPanel.isRequired()) {
                         enumerationValuesPanel.removeRequiredLabel();
@@ -164,41 +161,42 @@ public class SchemaModalPage extends Abs
                     values.add("");
 
                     enumerationValues.setEnabled(Boolean.FALSE);
-                    enumerationValues.setModelObject((Serializable) values);
+                    enumerationValues.setModelObject(values);
 
                     final List<String> keys = new ArrayList<String>();
                     keys.add("");
 
                     enumerationKeys.setEnabled(Boolean.FALSE);
-                    enumerationKeys.setModelObject((Serializable) keys);
+                    enumerationKeys.setModelObject(keys);
                 }
 
                 target.add(schemaForm);
             }
         });
 
-        final AutoCompleteTextField mandatoryCondition = new AutoCompleteTextField("mandatoryCondition") {
-
-            private static final long serialVersionUID = -2428903969518079100L;
-
-            @Override
-            protected Iterator<String> getChoices(String input) {
-                List<String> choices = new ArrayList<String>();
+        final AutoCompleteTextField<String> mandatoryCondition =
+                new AutoCompleteTextField<String>("mandatoryCondition") {
 
-                if (Strings.isEmpty(input)) {
-                    choices = Collections.emptyList();
-                    return choices.iterator();
-                }
+                    private static final long serialVersionUID = -2428903969518079100L;
 
-                if ("true".startsWith(input.toLowerCase())) {
-                    choices.add("true");
-                } else if ("false".startsWith(input.toLowerCase())) {
-                    choices.add("false");
-                }
+                    @Override
+                    protected Iterator<String> getChoices(final String input) {
+                        List<String> choices = new ArrayList<String>();
+
+                        if (Strings.isEmpty(input)) {
+                            choices = Collections.emptyList();
+                            return choices.iterator();
+                        }
+
+                        if ("true".startsWith(input.toLowerCase())) {
+                            choices.add("true");
+                        } else if ("false".startsWith(input.toLowerCase())) {
+                            choices.add("false");
+                        }
 
-                return choices.iterator();
-            }
-        };
+                        return choices.iterator();
+                    }
+                };
 
         mandatoryCondition.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
 

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java Fri Dec 27 14:23:50 2013
@@ -59,7 +59,7 @@ public class SyncTaskModalPage extends A
         };
 
         final AjaxDropDownChoicePanel<String> resource = new AjaxDropDownChoicePanel<String>("resource",
-                getString("resourceName"), new PropertyModel(taskTO, "resource"));
+                getString("resourceName"), new PropertyModel<String>(taskTO, "resource"));
         resource.setChoices(allResources.getObject());
         resource.setChoiceRenderer(new SelectChoiceRenderer());
         resource.addRequiredLabel();
@@ -69,7 +69,7 @@ public class SyncTaskModalPage extends A
         profile.add(resource);
 
         final AjaxDropDownChoicePanel<String> actionsClassName = new AjaxDropDownChoicePanel<String>(
-                "actionsClassName", getString("actionsClass"), new PropertyModel(taskTO, "actionsClassName"));
+                "actionsClassName", getString("actionsClass"), new PropertyModel<String>(taskTO, "actionsClassName"));
         actionsClassName.setChoices(taskRestClient.getSyncActionsClasses());
         actionsClassName.setStyleSheet("ui-widget-content ui-corner-all long_dynamicsize");
         profile.add(actionsClassName);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Fri Dec 27 14:23:50 2013
@@ -62,15 +62,15 @@ public class Todo extends BasePage {
     @SpringBean
     private ApprovalRestClient restClient;
 
+    @SpringBean
+    private PreferenceManager prefMan;
+
     private final ModalWindow window;
 
     private static final int WIN_HEIGHT = 400;
 
     private static final int WIN_WIDTH = 600;
 
-    @SpringBean
-    private PreferenceManager prefMan;
-
     private WebMarkupContainer container;
 
     private int paginatorRows;
@@ -87,13 +87,18 @@ public class Todo extends BasePage {
 
         paginatorRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_TODO_PAGINATOR_ROWS);
 
-        List<IColumn> columns = new ArrayList<IColumn>();
-        columns.add(new PropertyColumn(new ResourceModel("taskId"), "taskId", "taskId"));
-        columns.add(new PropertyColumn(new ResourceModel("key"), "key", "key"));
-        columns.add(new PropertyColumn(new ResourceModel("description"), "description", "description"));
-        columns.add(new DatePropertyColumn(new ResourceModel("createTime"), "createTime", "createTime"));
-        columns.add(new DatePropertyColumn(new ResourceModel("dueDate"), "dueDate", "dueDate"));
-        columns.add(new PropertyColumn(new ResourceModel("owner"), "owner", "owner"));
+        List<IColumn<WorkflowFormTO, String>> columns = new ArrayList<IColumn<WorkflowFormTO, String>>();
+        columns.add(new PropertyColumn<WorkflowFormTO, String>(
+                new ResourceModel("taskId"), "taskId", "taskId"));
+        columns.add(new PropertyColumn<WorkflowFormTO, String>(
+                new ResourceModel("key"), "key", "key"));
+        columns.add(new PropertyColumn<WorkflowFormTO, String>(
+                new ResourceModel("description"), "description", "description"));
+        columns.add(new DatePropertyColumn<WorkflowFormTO>(
+                new ResourceModel("createTime"), "createTime", "createTime"));
+        columns.add(new DatePropertyColumn<WorkflowFormTO>(
+                new ResourceModel("dueDate"), "dueDate", "dueDate"));
+        columns.add(new PropertyColumn<WorkflowFormTO, String>(new ResourceModel("owner"), "owner", "owner"));
         columns.add(new AbstractColumn<WorkflowFormTO, String>(new ResourceModel("actions", "")) {
 
             private static final long serialVersionUID = 2054811145491901166L;
@@ -153,21 +158,23 @@ public class Todo extends BasePage {
             }
         });
 
-        final AjaxFallbackDefaultDataTable approvalTable = new AjaxFallbackDefaultDataTable("approvalTable", columns,
-                new ApprovalProvider(), paginatorRows);
-
+        final AjaxFallbackDefaultDataTable<WorkflowFormTO, String> approvalTable =
+                new AjaxFallbackDefaultDataTable<WorkflowFormTO, String>(
+                        "approvalTable", columns, new ApprovalProvider(), paginatorRows);
         container.add(approvalTable);
-        container.setOutputMarkupId(true);
 
+        container.setOutputMarkupId(true);
         add(container);
 
+        @SuppressWarnings("rawtypes")
         Form approvalPaginatorForm = new Form("paginatorForm");
 
-        MetaDataRoleAuthorizationStrategy.authorize(approvalPaginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles(
-                "Approval", "list"));
+        MetaDataRoleAuthorizationStrategy.authorize(approvalPaginatorForm, RENDER,
+                xmlRolesReader.getAllAllowedRoles("Approval", "list"));
 
-        final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
-                "paginatorRows"), prefMan.getPaginatorChoices());
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
+                new PropertyModel(this, "paginatorRows"), prefMan.getPaginatorChoices());
 
         rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
 
@@ -175,8 +182,8 @@ public class Todo extends BasePage {
 
             @Override
             protected void onUpdate(final AjaxRequestTarget target) {
-                prefMan.set(getRequest(), getResponse(), Constants.PREF_TODO_PAGINATOR_ROWS, String.valueOf(
-                        paginatorRows));
+                prefMan.set(getRequest(), getResponse(), Constants.PREF_TODO_PAGINATOR_ROWS,
+                        String.valueOf(paginatorRows));
                 approvalTable.setItemsPerPage(paginatorRows);
 
                 target.add(container);
@@ -198,9 +205,10 @@ public class Todo extends BasePage {
 
         private static final long serialVersionUID = -2311716167583335852L;
 
-        private SortableDataProviderComparator<WorkflowFormTO> comparator;
+        private final SortableDataProviderComparator<WorkflowFormTO> comparator;
 
         public ApprovalProvider() {
+            super();
             //Default sorting
             setSort("key", SortOrder.ASCENDING);
             comparator = new SortableDataProviderComparator<WorkflowFormTO>(this);

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Fri Dec 27 14:23:50 2013
@@ -90,6 +90,7 @@ public abstract class UserModalPage exte
         this.userTO = userTO;
     }
 
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     protected Form setupEditPanel() {
         fragment.add(new Label("id", userTO.getId() == 0
                 ? ""
@@ -206,7 +207,9 @@ public abstract class UserModalPage exte
         };
     }
 
-    protected abstract void submitAction(final AjaxRequestTarget target, final Form form);
+    @SuppressWarnings("rawtypes")
+    protected abstract void submitAction(AjaxRequestTarget target, Form form);
 
-    protected abstract void closeAction(final AjaxRequestTarget target, final Form form);
+    @SuppressWarnings("rawtypes")
+    protected abstract void closeAction(AjaxRequestTarget target, Form form);
 }

Copied: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirSchemaModalPage.java (from r1553458, syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirSchemaModalPage.java?p2=syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirSchemaModalPage.java&p1=syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java&r1=1553458&r2=1553676&rev=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirSchemaModalPage.java Fri Dec 27 14:23:50 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.console.pages;
 
-import org.apache.syncope.common.AbstractBaseBean;
 import org.apache.syncope.common.to.VirSchemaTO;
 import org.apache.syncope.common.types.AttributableType;
 import org.apache.syncope.common.SyncopeClientException;
@@ -39,25 +38,25 @@ import org.apache.wicket.model.ResourceM
 /**
  * Modal window with Schema form.
  */
-public class VirtualSchemaModalPage extends AbstractSchemaModalPage {
+public class VirSchemaModalPage extends AbstractSchemaModalPage<VirSchemaTO> {
 
     private static final long serialVersionUID = 5979623248182851337L;
 
-    public VirtualSchemaModalPage(final AttributableType kind) {
+    public VirSchemaModalPage(final AttributableType kind) {
         super(kind);
     }
 
     @Override
     public void setSchemaModalPage(final PageReference pageRef, final ModalWindow window,
-            AbstractBaseBean schema, final boolean createFlag) {
+            VirSchemaTO schema, final boolean createFlag) {
 
         if (schema == null) {
             schema = new VirSchemaTO();
         }
 
-        final Form<AbstractBaseBean> schemaForm = new Form<AbstractBaseBean>(FORM);
+        final Form<VirSchemaTO> schemaForm = new Form<VirSchemaTO>(FORM);
 
-        schemaForm.setModel(new CompoundPropertyModel<AbstractBaseBean>(schema));
+        schemaForm.setModel(new CompoundPropertyModel<VirSchemaTO>(schema));
 
         final AjaxTextFieldPanel name = new AjaxTextFieldPanel("name", getString("name"), new PropertyModel<String>(
                 schema, "name"));
@@ -73,7 +72,7 @@ public class VirtualSchemaModalPage exte
             private static final long serialVersionUID = -958724007591692537L;
 
             @Override
-            protected void onSubmit(final AjaxRequestTarget target, final Form form) {
+            protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
                 VirSchemaTO schemaTO = (VirSchemaTO) form.getDefaultModelObject();
                 try {
                     if (createFlag) {

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java Fri Dec 27 14:23:50 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.console.pages.panels;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.to.AbstractAttributableTO;
 import org.apache.syncope.common.to.UserTO;
 import org.apache.syncope.console.SyncopeSession;
@@ -34,36 +35,39 @@ public class AccountInformationPanel ext
         // ------------------------
         // Change password date
         // ------------------------
-        add(new Label("changePwdDate", new Model(userTO.getChangePwdDate() != null
-                ? SyncopeSession.get().getDateFormat().format(userTO.getChangePwdDate()) : "")));
+        add(new Label("changePwdDate", new Model<String>(userTO.getChangePwdDate() == null
+                ? StringUtils.EMPTY
+                : SyncopeSession.get().getDateFormat().format(userTO.getChangePwdDate()))));
         // ------------------------
 
         // ------------------------
         // Last login date
         // ------------------------
-        add(new Label("lastLoginDate", new Model(userTO.getLastLoginDate() != null
-                ? SyncopeSession.get().getDateFormat().format(userTO.getLastLoginDate()) : "")));
+        add(new Label("lastLoginDate", new Model<String>(userTO.getLastLoginDate() == null
+                ? StringUtils.EMPTY
+                : SyncopeSession.get().getDateFormat().format(userTO.getLastLoginDate()))));
         // ------------------------
 
         // ------------------------
         // Failed logins
         // ------------------------
-        add(new Label("failedLogins", new Model(userTO.getFailedLogins() != null
-                ? userTO.getFailedLogins() : "")));
+        add(new Label("failedLogins", new Model<Integer>(userTO.getFailedLogins())));
         // ------------------------
 
         // ------------------------
         // Token
         // ------------------------
-        add(new Label("token", new Model(userTO.getToken() != null
-                ? userTO.getToken() : "")));
+        add(new Label("token", new Model<String>(userTO.getToken() == null
+                ? StringUtils.EMPTY
+                : userTO.getToken())));
         // ------------------------
 
         // ------------------------
         // Token expire time
         // ------------------------
-        add(new Label("tokenExpireTime", new Model(userTO.getTokenExpireTime() != null
-                ? userTO.getTokenExpireTime() : "")));
+        add(new Label("tokenExpireTime", new Model<String>(userTO.getTokenExpireTime() == null
+                ? StringUtils.EMPTY
+                : SyncopeSession.get().getDateFormat().format(userTO.getTokenExpireTime()))));
         // ------------------------
     }
 }

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1553676&r1=1553675&r2=1553676&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java Fri Dec 27 14:23:50 2013
@@ -48,7 +48,8 @@ import org.apache.syncope.console.wicket
 import org.apache.syncope.console.wicket.markup.html.form.DateTextFieldPanel;
 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.console.wicket.markup.html.form.MultiFieldPanel;
+import org.apache.syncope.console.wicket.markup.html.form.SpinnerFieldPanel;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -104,6 +105,7 @@ public class AttributesPanel extends Pan
                     private static final long serialVersionUID = 9101744072914090143L;
 
                     @Override
+                    @SuppressWarnings({ "unchecked", "rawtypes" })
                     protected void populateItem(final ListItem<AttributeTO> item) {
                         final AttributeTO attributeTO = (AttributeTO) item.getDefaultModelObject();
 
@@ -125,7 +127,7 @@ public class AttributesPanel extends Pan
                         if (templateMode || !schemas.get(attributeTO.getSchema()).isMultivalue()) {
                             item.add(panel);
                         } else {
-                            item.add(new MultiValueSelectorPanel<String>(
+                            item.add(new MultiFieldPanel<String>(
                                             "panel", new PropertyModel<List<String>>(attributeTO, "values"), panel));
                         }
                     }
@@ -263,9 +265,26 @@ public class AttributesPanel extends Pan
                 if (required) {
                     panel.addRequiredLabel();
                 }
+                break;
+                
+            case Long:
+                panel = new SpinnerFieldPanel<Long>("panel", schemaTO.getName(),
+                        Long.class, new Model<Long>(), null, null, false);
 
+                if (required) {
+                    panel.addRequiredLabel();
+                }
                 break;
 
+            case Double:
+                panel = new SpinnerFieldPanel<Double>("panel", schemaTO.getName(),
+                        Double.class, new Model<Double>(), null, null, false);
+
+                if (required) {
+                    panel.addRequiredLabel();
+                }
+                break;
+                
             default:
                 panel = new AjaxTextFieldPanel("panel", schemaTO.getName(), new Model<String>());
                 if (required) {



Mime
View raw message