Author: mdisabatino Date: Thu Jun 19 10:32:44 2014 New Revision: 1603819 URL: http://svn.apache.org/r1603819 Log: [SYNCOPE-509]
Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java?rev=1603819&r1=1603818&r2=1603819&view=diff ============================================================================== --- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java (original) +++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractTasks.java Thu Jun 19 10:32:44 2014 @@ -21,6 +21,7 @@ package org.apache.syncope.console.pages import org.apache.syncope.console.commons.PreferenceManager; import org.apache.syncope.console.commons.XMLRolesReader; import org.apache.syncope.console.rest.TaskRestClient; +import org.apache.wicket.PageReference; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.spring.injection.annot.SpringBean; @@ -35,6 +36,8 @@ public abstract class AbstractTasks exte protected static final int WIN_WIDTH = 700; protected static final String TASKS = "Tasks"; + + protected PageReference pageRef; @SpringBean protected TaskRestClient restClient; @@ -45,7 +48,8 @@ public abstract class AbstractTasks exte @SpringBean protected XMLRolesReader xmlRolesReader; - public AbstractTasks(final String id) { + public AbstractTasks(final String id, final PageReference pageRef) { super(id); + this.pageRef = pageRef; } } Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1603819&r1=1603818&r2=1603819&view=diff ============================================================================== --- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original) +++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Thu Jun 19 10:32:44 2014 @@ -60,13 +60,11 @@ public class NotificationTasks extends A private ModalWindow window; - private final List<IColumn<TaskTO, String>> columns; - private AjaxDataTablePanel<TaskTO, String> table; - + public NotificationTasks(final String id, final PageReference pageRef) { - super(id); - + super(id, pageRef); + container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); add(container); @@ -75,7 +73,69 @@ public class NotificationTasks extends A paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_NOTIFICATION_TASKS_PAGINATOR_ROWS); - columns = new ArrayList<IColumn<TaskTO, String>>(); + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(), NotificationTaskTO.class), + container, + 0, + pageRef, + restClient); + + container.add(table); + + window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() { + + private static final long serialVersionUID = 8804221891699487139L; + + @Override + public void onClose(final AjaxRequestTarget target) { + target.add(container); + if (operationResult) { + info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(getPage().get(Constants.FEEDBACK)); + operationResult = false; + } + } + }); + + window.setCssClassName(ModalWindow.CSS_CLASS_GRAY); + window.setInitialHeight(WIN_HEIGHT); + window.setInitialWidth(WIN_WIDTH); + window.setCookieName(VIEW_TASK_WIN_COOKIE_NAME); + + final Form paginatorForm = new Form("PaginatorForm"); + + final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), + prefMan.getPaginatorChoices()); + + rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { + + private static final long serialVersionUID = -1107858522700306810L; + + @Override + protected void onUpdate(final AjaxRequestTarget target) { + prefMan.set(getWebRequest(), (WebResponse) getResponse(), + Constants.PREF_NOTIFICATION_TASKS_PAGINATOR_ROWS, String.valueOf(paginatorRows)); + + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(), + NotificationTaskTO.class), + container, + table == null ? 0 : (int) table.getCurrentPage(), + pageRef, + restClient); + + target.add(container); + } + }); + + paginatorForm.add(rowsChooser); + add(paginatorForm); + } + + private List<IColumn<TaskTO, String>> getColumns() { + final List<IColumn<TaskTO, String>> columns = new ArrayList<IColumn<TaskTO, String>>(); columns.add(new PropertyColumn<TaskTO, String>( new StringResourceModel("id", this, null), "id", "id")); @@ -179,66 +239,8 @@ public class NotificationTasks extends A return panel; } }); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(), NotificationTaskTO.class), - container, - 0, - pageRef, - restClient); - - container.add(table); - - window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() { - - private static final long serialVersionUID = 8804221891699487139L; - - @Override - public void onClose(final AjaxRequestTarget target) { - target.add(container); - if (operationResult) { - info(getString(Constants.OPERATION_SUCCEEDED)); - target.add(getPage().get(Constants.FEEDBACK)); - operationResult = false; - } - } - }); - - window.setCssClassName(ModalWindow.CSS_CLASS_GRAY); - window.setInitialHeight(WIN_HEIGHT); - window.setInitialWidth(WIN_WIDTH); - window.setCookieName(VIEW_TASK_WIN_COOKIE_NAME); - - Form paginatorForm = new Form("PaginatorForm"); - - final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), - prefMan.getPaginatorChoices()); - - rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { - - private static final long serialVersionUID = -1107858522700306810L; - - @Override - protected void onUpdate(final AjaxRequestTarget target) { - prefMan.set(getWebRequest(), (WebResponse) getResponse(), - Constants.PREF_NOTIFICATION_TASKS_PAGINATOR_ROWS, String.valueOf(paginatorRows)); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<NotificationTaskTO>(restClient, paginatorRows, getId(), - NotificationTaskTO.class), - container, - table == null ? 0 : (int) table.getCurrentPage(), - pageRef, - restClient); - - target.add(container); - } - }); - - paginatorForm.add(rowsChooser); - add(paginatorForm); + + return columns; } @Override Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1603819&r1=1603818&r2=1603819&view=diff ============================================================================== --- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original) +++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Thu Jun 19 10:32:44 2014 @@ -65,12 +65,10 @@ public class PropagationTasks extends Ab private ModalWindow window; - private final List<IColumn<TaskTO, String>> columns; - private AjaxDataTablePanel<TaskTO, String> table; public PropagationTasks(final String id, final PageReference pageRef) { - super(id); + super(id, pageRef); container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); @@ -80,7 +78,67 @@ public class PropagationTasks extends Ab paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS); - columns = new ArrayList<IColumn<TaskTO, String>>(); + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<PropagationTaskTO>(restClient, paginatorRows, getId(), PropagationTaskTO.class), + container, + 0, + pageRef, + restClient); + + window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() { + + private static final long serialVersionUID = 8804221891699487139L; + + @Override + public void onClose(final AjaxRequestTarget target) { + target.add(container); + if (operationResult) { + info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(getPage().get(Constants.FEEDBACK)); + operationResult = false; + } + } + }); + + window.setCssClassName(ModalWindow.CSS_CLASS_GRAY); + window.setInitialHeight(WIN_HEIGHT); + window.setInitialWidth(WIN_WIDTH); + window.setCookieName(VIEW_TASK_WIN_COOKIE_NAME); + + Form paginatorForm = new Form("PaginatorForm"); + + final DropDownChoice rowsChooser = new DropDownChoice( + "rowsChooser", new PropertyModel(this, "paginatorRows"), prefMan.getPaginatorChoices()); + + rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { + + private static final long serialVersionUID = -1107858522700306810L; + + @Override + protected void onUpdate(final AjaxRequestTarget target) { + prefMan.set(getWebRequest(), (WebResponse) getResponse(), + Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS, String.valueOf(paginatorRows)); + + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<PropagationTaskTO>(restClient, paginatorRows, + getId(), PropagationTaskTO.class), + container, + table == null ? 0 : (int) table.getCurrentPage(), + pageRef, + restClient); + + target.add(container); + } + }); + + paginatorForm.add(rowsChooser); + add(paginatorForm); + } + + private List<IColumn<TaskTO, String>> getColumns() { + final List<IColumn<TaskTO, String>> columns = new ArrayList<IColumn<TaskTO, String>>(); columns.add(new PropertyColumn<TaskTO, String>( new StringResourceModel("id", this, null), "id", "id")); @@ -200,64 +258,8 @@ public class PropagationTasks extends Ab return panel; } }); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<PropagationTaskTO>(restClient, paginatorRows, getId(), PropagationTaskTO.class), - container, - 0, - pageRef, - restClient); - - window.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() { - - private static final long serialVersionUID = 8804221891699487139L; - - @Override - public void onClose(final AjaxRequestTarget target) { - target.add(container); - if (operationResult) { - info(getString(Constants.OPERATION_SUCCEEDED)); - target.add(getPage().get(Constants.FEEDBACK)); - operationResult = false; - } - } - }); - - window.setCssClassName(ModalWindow.CSS_CLASS_GRAY); - window.setInitialHeight(WIN_HEIGHT); - window.setInitialWidth(WIN_WIDTH); - window.setCookieName(VIEW_TASK_WIN_COOKIE_NAME); - - Form paginatorForm = new Form("PaginatorForm"); - - final DropDownChoice rowsChooser = new DropDownChoice( - "rowsChooser", new PropertyModel(this, "paginatorRows"), prefMan.getPaginatorChoices()); - - rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { - - private static final long serialVersionUID = -1107858522700306810L; - - @Override - protected void onUpdate(final AjaxRequestTarget target) { - prefMan.set(getWebRequest(), (WebResponse) getResponse(), - Constants.PREF_PROPAGATION_TASKS_PAGINATOR_ROWS, String.valueOf(paginatorRows)); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<PropagationTaskTO>(restClient, paginatorRows, - getId(), PropagationTaskTO.class), - container, - table == null ? 0 : (int) table.getCurrentPage(), - pageRef, - restClient); - - target.add(container); - } - }); - - paginatorForm.add(rowsChooser); - add(paginatorForm); + + return columns; } @Override Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java?rev=1603819&r1=1603818&r2=1603819&view=diff ============================================================================== --- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java (original) +++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SchedTasks.java Thu Jun 19 10:32:44 2014 @@ -62,13 +62,11 @@ public class SchedTasks extends Abstract private ModalWindow window; - private final List<IColumn<TaskTO, String>> columns; - private AjaxDataTablePanel<TaskTO, String> table; - + public SchedTasks(final String id, final PageReference pageRef) { - super(id); - + super(id, pageRef); + container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); add(container); @@ -84,7 +82,73 @@ public class SchedTasks extends Abstract paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SCHED_TASKS_PAGINATOR_ROWS); - columns = new ArrayList<IColumn<TaskTO, String>>(); + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class), + container, + 0, + pageRef, + restClient); + + container.add(table); + + Form paginatorForm = new Form("PaginatorForm"); + + final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), + prefMan.getPaginatorChoices()); + + rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { + + private static final long serialVersionUID = -1107858522700306810L; + + @Override + protected void onUpdate(final AjaxRequestTarget target) { + prefMan.set(getWebRequest(), (WebResponse) getResponse(), Constants.PREF_SCHED_TASKS_PAGINATOR_ROWS, + String.valueOf(paginatorRows)); + + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class), + container, + table == null ? 0 : (int) table.getCurrentPage(), + pageRef, + restClient); + + target.add(container); + } + }); + + paginatorForm.add(rowsChooser); + add(paginatorForm); + + AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) { + + private static final long serialVersionUID = -7978723352517770644L; + + @Override + protected void onClickInternal(final AjaxRequestTarget target) { + window.setPageCreator(new ModalWindow.PageCreator() { + + private static final long serialVersionUID = -7834632442532690940L; + + @Override + public Page createPage() { + return new SchedTaskModalPage(window, new SchedTaskTO(), pageRef); + } + }); + + window.show(target); + } + }; + + MetaDataRoleAuthorizationStrategy.authorize( + createLink, RENDER, xmlRolesReader.getAllAllowedRoles(TASKS, "create")); + + add(createLink); + } + + private List<IColumn<TaskTO, String>> getColumns() { + final List<IColumn<TaskTO, String>> columns = new ArrayList<IColumn<TaskTO, String>>(); columns.add(new PropertyColumn<TaskTO, String>( new StringResourceModel("id", this, null), "id", "id")); @@ -207,70 +271,7 @@ public class SchedTasks extends Abstract return panel; } }); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class), - container, - 0, - pageRef, - restClient); - - container.add(table); - - Form paginatorForm = new Form("PaginatorForm"); - - final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), - prefMan.getPaginatorChoices()); - - rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { - - private static final long serialVersionUID = -1107858522700306810L; - - @Override - protected void onUpdate(final AjaxRequestTarget target) { - prefMan.set(getWebRequest(), (WebResponse) getResponse(), Constants.PREF_SCHED_TASKS_PAGINATOR_ROWS, - String.valueOf(paginatorRows)); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<SchedTaskTO>(restClient, paginatorRows, getId(), SchedTaskTO.class), - container, - table == null ? 0 : (int) table.getCurrentPage(), - pageRef, - restClient); - - target.add(container); - } - }); - - paginatorForm.add(rowsChooser); - add(paginatorForm); - - AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) { - - private static final long serialVersionUID = -7978723352517770644L; - - @Override - protected void onClickInternal(final AjaxRequestTarget target) { - window.setPageCreator(new ModalWindow.PageCreator() { - - private static final long serialVersionUID = -7834632442532690940L; - - @Override - public Page createPage() { - return new SchedTaskModalPage(window, new SchedTaskTO(), pageRef); - } - }); - - window.show(target); - } - }; - - MetaDataRoleAuthorizationStrategy.authorize( - createLink, RENDER, xmlRolesReader.getAllAllowedRoles(TASKS, "create")); - - add(createLink); + return columns; } @Override Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java?rev=1603819&r1=1603818&r2=1603819&view=diff ============================================================================== --- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java (original) +++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasks.java Thu Jun 19 10:32:44 2014 @@ -64,13 +64,11 @@ public class SyncTasks extends AbstractT private ModalWindow window; - private final List<IColumn<TaskTO, String>> columns; - private AjaxDataTablePanel<TaskTO, String> table; - + public SyncTasks(final String id, final PageReference pageRef) { - super(id); - + super(id, pageRef); + container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); add(container); @@ -86,7 +84,74 @@ public class SyncTasks extends AbstractT paginatorRows = prefMan.getPaginatorRows(getWebRequest(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS); - columns = new ArrayList<IColumn<TaskTO, String>>(); + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class), + container, + 0, + pageRef, + restClient); + + container.add(table); + + Form paginatorForm = new Form("PaginatorForm"); + + final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), + prefMan.getPaginatorChoices()); + + rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { + + private static final long serialVersionUID = -1107858522700306810L; + + @Override + protected void onUpdate(final AjaxRequestTarget target) { + prefMan.set(getWebRequest(), (WebResponse) getResponse(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS, + String.valueOf(paginatorRows)); + + table = Tasks.updateTaskTable( + getColumns(), + new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class), + container, + table == null ? 0 : (int) table.getCurrentPage(), + pageRef, + restClient); + + target.add(container); + } + }); + + paginatorForm.add(rowsChooser); + add(paginatorForm); + + // create new user + final AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) { + + private static final long serialVersionUID = -7978723352517770644L; + + @Override + protected void onClickInternal(final AjaxRequestTarget target) { + window.setPageCreator(new ModalWindow.PageCreator() { + + private static final long serialVersionUID = -7834632442532690940L; + + @Override + public Page createPage() { + return new SyncTaskModalPage(window, new SyncTaskTO(), pageRef); + } + }); + + window.show(target); + } + }; + + MetaDataRoleAuthorizationStrategy.authorize( + createLink, RENDER, xmlRolesReader.getAllAllowedRoles(TASKS, "create")); + + add(createLink); + } + + private List<IColumn<TaskTO, String>> getColumns() { + final List<IColumn<TaskTO, String>> columns = new ArrayList<IColumn<TaskTO, String>>(); columns.add(new PropertyColumn<TaskTO, String>( new StringResourceModel("id", this, null), "id", "id")); @@ -252,70 +317,7 @@ public class SyncTasks extends AbstractT } }); - table = Tasks.updateTaskTable( - columns, - new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class), - container, - 0, - pageRef, - restClient); - - container.add(table); - - Form paginatorForm = new Form("PaginatorForm"); - - final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this, "paginatorRows"), - prefMan.getPaginatorChoices()); - - rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { - - private static final long serialVersionUID = -1107858522700306810L; - - @Override - protected void onUpdate(final AjaxRequestTarget target) { - prefMan.set(getWebRequest(), (WebResponse) getResponse(), Constants.PREF_SYNC_TASKS_PAGINATOR_ROWS, - String.valueOf(paginatorRows)); - - table = Tasks.updateTaskTable( - columns, - new TasksProvider<SyncTaskTO>(restClient, paginatorRows, getId(), SyncTaskTO.class), - container, - table == null ? 0 : (int) table.getCurrentPage(), - pageRef, - restClient); - - target.add(container); - } - }); - - paginatorForm.add(rowsChooser); - add(paginatorForm); - - // create new user - AjaxLink createLink = new ClearIndicatingAjaxLink("createLink", pageRef) { - - private static final long serialVersionUID = -7978723352517770644L; - - @Override - protected void onClickInternal(final AjaxRequestTarget target) { - window.setPageCreator(new ModalWindow.PageCreator() { - - private static final long serialVersionUID = -7834632442532690940L; - - @Override - public Page createPage() { - return new SyncTaskModalPage(window, new SyncTaskTO(), pageRef); - } - }); - - window.show(target); - } - }; - - MetaDataRoleAuthorizationStrategy.authorize( - createLink, RENDER, xmlRolesReader.getAllAllowedRoles(TASKS, "create")); - - add(createLink); + return columns; } @Override