You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/12/31 08:45:15 UTC
svn commit: r1554382 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/commons/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/java/org/apac...
Author: ilgrosso
Date: Tue Dec 31 07:45:14 2013
New Revision: 1554382
URL: http://svn.apache.org/r1554382
Log:
[SYNCOPE-465] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.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/ProvisioningModalPage.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/panels/ActionDataTablePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckGroupColumn.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1554188-1554232
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java Tue Dec 31 07:45:14 2013
@@ -20,6 +20,8 @@ package org.apache.syncope.console.commo
public final class Constants {
+ public static final String ON_CLICK = "onclick";
+
public static final String ON_CHANGE = "onchange";
public static final String ON_BLUR = "onblur";
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=1554382&r1=1554381&r2=1554382&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 Tue Dec 31 07:45:14 2013
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.console.pages;
-import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
@@ -49,7 +48,7 @@ public class BulkActionModalPage<T, S> e
public BulkActionModalPage(
final ModalWindow window,
- final List<T> items,
+ final Collection<T> items,
final List<IColumn<T, S>> columns,
final Collection<ActionLink.ActionType> actions,
final BaseRestClient bulkActionExecutor,
@@ -63,7 +62,7 @@ public class BulkActionModalPage<T, S> e
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();
}
@@ -73,7 +72,7 @@ public class BulkActionModalPage<T, S> e
}
@Override
- public IModel<T> model(T object) {
+ public IModel<T> model(final T object) {
return new CompoundPropertyModel<T>(object);
}
};
@@ -89,7 +88,7 @@ public class BulkActionModalPage<T, S> e
for (ActionLink.ActionType action : actions) {
final BulkAction bulkAction = new BulkAction();
- for (Object item : items) {
+ for (T item : items) {
try {
bulkAction.getTargets().add(getTargetId(item, idFieldName).toString());
} catch (Exception e) {
@@ -136,7 +135,7 @@ public class BulkActionModalPage<T, S> e
}, action, pageId, !items.isEmpty());
}
- final Form form = new Form(FORM);
+ final Form<Void> form = new Form<Void>(FORM);
add(form);
final AjaxButton cancel =
@@ -155,8 +154,9 @@ public class BulkActionModalPage<T, S> e
}
private Object getTargetId(final Object target, final String idFieldName)
- throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- final PropertyDescriptor propDesc = BeanUtils.getPropertyDescriptor(target.getClass(), idFieldName);
- return propDesc.getReadMethod().invoke(target, new Object[0]);
+ throws IllegalAccessException, InvocationTargetException {
+
+ return BeanUtils.getPropertyDescriptor(target.getClass(), idFieldName).
+ getReadMethod().invoke(target, new Object[0]);
}
}
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=1554382&r1=1554381&r2=1554382&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 Tue Dec 31 07:45:14 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.console.pages;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.apache.syncope.common.reqres.BulkActionResult;
@@ -45,7 +46,7 @@ public class BulkActionResultModalPage<T
public BulkActionResultModalPage(
final ModalWindow window,
- final List<T> items,
+ final Collection<T> items,
final List<IColumn<T, S>> columns,
final BulkActionResult results,
final String idFieldName) {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ProvisioningModalPage.java Tue Dec 31 07:45:14 2013
@@ -54,6 +54,8 @@ public class ProvisioningModalPage<T ext
private static final long serialVersionUID = -4285220460543213901L;
+ private static final int ROWS_PER_PAGE = 10;
+
private final ResourceTO resourceTO;
private final Class<? extends AbstractAttributableTO> typeRef;
@@ -62,8 +64,6 @@ public class ProvisioningModalPage<T ext
private final ModalWindow window;
- private int rowsPerPage = 25;
-
private final StatusUtils statusUtils;
public ProvisioningModalPage(
@@ -97,28 +97,28 @@ public class ProvisioningModalPage<T ext
columns.add(new AbstractColumn<StatusBean, String>(
new StringResourceModel("status", this, null, "")) {
- private static final long serialVersionUID = -3503023501954863131L;
+ private static final long serialVersionUID = -3503023501954863131L;
- @Override
- public String getCssClass() {
- return "action";
- }
-
- @Override
- public void populateItem(
- final Item<ICellPopulator<StatusBean>> cellItem,
- final String componentId,
- final IModel<StatusBean> model) {
- cellItem.
- add(statusUtils.getStatusImagePanel(componentId, model.getObject().getStatus()));
- }
- });
+ @Override
+ public String getCssClass() {
+ return "action";
+ }
+
+ @Override
+ public void populateItem(
+ final Item<ICellPopulator<StatusBean>> cellItem,
+ final String componentId,
+ final IModel<StatusBean> model) {
+ cellItem.
+ add(statusUtils.getStatusImagePanel(componentId, model.getObject().getStatus()));
+ }
+ });
final ActionDataTablePanel<StatusBean, String> table = new ActionDataTablePanel<StatusBean, String>(
"resourceDatatable",
columns,
(ISortableDataProvider<StatusBean, String>) new StatusBeanProvider(),
- rowsPerPage,
+ ROWS_PER_PAGE,
pageRef);
final String pageId = "Resources";
@@ -191,10 +191,10 @@ public class ProvisioningModalPage<T ext
final List<T> attributables = new ArrayList<T>();
if (UserTO.class.isAssignableFrom(typeRef)) {
- attributables.addAll((List<T>) userRestClient.search(fiql, 1, rowsPerPage,
+ attributables.addAll((List<T>) userRestClient.search(fiql, 1, ROWS_PER_PAGE,
new SortParam<String>("id", true)));
} else {
- attributables.addAll((List<T>) roleRestClient.search(fiql, 1, rowsPerPage,
+ attributables.addAll((List<T>) roleRestClient.search(fiql, 1, ROWS_PER_PAGE,
new SortParam<String>("id", true)));
}
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=1554382&r1=1554381&r2=1554382&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 Tue Dec 31 07:45:14 2013
@@ -74,6 +74,10 @@ public class Resources extends BasePage
private static final long serialVersionUID = -3789252860990261728L;
+ private static final int WIN_HEIGHT = 600;
+
+ private static final int WIN_WIDTH = 1100;
+
@SpringBean
private ConnectorRestClient connectorRestClient;
@@ -88,18 +92,14 @@ public class Resources extends BasePage
private final ModalWindow editConnectorWin;
- private static final int WIN_HEIGHT = 600;
+ private final int resourcePaginatorRows;
- private static final int WIN_WIDTH = 1100;
+ private final int connectorPaginatorRows;
private WebMarkupContainer resourceContainer;
private WebMarkupContainer connectorContainer;
- private int resourcePaginatorRows;
-
- private int connectorPaginatorRows;
-
/**
* Modal window to be used for user status management.
*/
@@ -367,27 +367,29 @@ public class Resources extends BasePage
editResourceWin.setInitialWidth(WIN_WIDTH);
editResourceWin.setCookieName("edit-res-modal");
- AjaxLink createResourceLink = new ClearIndicatingAjaxLink("createResourceLink", getPageReference()) {
+ AjaxLink<Void> createResourceLink =
+ new ClearIndicatingAjaxLink<Void>("createResourceLink", getPageReference()) {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- protected void onClickInternal(final AjaxRequestTarget target) {
- createResourceWin.setPageCreator(new ModalWindow.PageCreator() {
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ createResourceWin.setPageCreator(new ModalWindow.PageCreator() {
- private static final long serialVersionUID = -7834632442532690940L;
+ private static final long serialVersionUID = -7834632442532690940L;
- @Override
- public Page createPage() {
- final ResourceModalPage windows = new ResourceModalPage(Resources.this.getPageReference(),
- editResourceWin, new ResourceTO(), true);
- return windows;
- }
- });
+ @Override
+ public Page createPage() {
+ final ResourceModalPage windows = new ResourceModalPage(Resources.this.
+ getPageReference(),
+ editResourceWin, new ResourceTO(), true);
+ return windows;
+ }
+ });
- createResourceWin.show(target);
- }
- };
+ createResourceWin.show(target);
+ }
+ };
MetaDataRoleAuthorizationStrategy.authorize(createResourceLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
"Resources", "create"));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ActionDataTablePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ActionDataTablePanel.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ActionDataTablePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ActionDataTablePanel.java Tue Dec 31 07:45:14 2013
@@ -47,12 +47,14 @@ import org.slf4j.LoggerFactory;
public class ActionDataTablePanel<T, S> extends Panel {
+ private static final long serialVersionUID = -8826989026203543957L;
+
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(ActionDataTablePanel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionDataTablePanel.class);
- private static final long serialVersionUID = -8826989026203543957L;
+ private static final String CANCEL = "cancel";
private final CheckGroup<T> group;
@@ -64,8 +66,6 @@ public class ActionDataTablePanel<T, S>
private final PageReference pageRef;
- private final String CANCEL = "cancel";
-
public ActionDataTablePanel(
final String id,
final List<IColumn<T, S>> columns,
@@ -85,12 +85,10 @@ public class ActionDataTablePanel<T, S>
private static final long serialVersionUID = -8667764190925075389L;
@Override
- public boolean isCheckable(T element) {
+ public boolean isCheckable(final T element) {
return isElementEnabled(element);
}
};
- bulkActionForm.add(group);
-
group.add(new AjaxFormChoiceComponentUpdatingBehavior() {
private static final long serialVersionUID = -151291731388673682L;
@@ -100,6 +98,7 @@ public class ActionDataTablePanel<T, S>
// ignore
}
});
+ bulkActionForm.add(group);
columns.add(0, new CheckGroupColumn<T, S>(group));
dataTable = new AjaxFallbackDefaultDataTable<T, S>("dataTable", columns, dataProvider, rowsPerPage);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java Tue Dec 31 07:45:14 2013
@@ -32,6 +32,7 @@ import org.apache.syncope.console.wicket
import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
@@ -44,7 +45,7 @@ import org.apache.wicket.markup.html.pan
public class AjaxDataTablePanel<T, S> extends Panel {
- private static final long serialVersionUID = -8826989026203543957L;
+ private static final long serialVersionUID = -7264400471578272966L;
private final AjaxFallbackDefaultDataTable<T, S> dataTable;
@@ -100,6 +101,16 @@ public class AjaxDataTablePanel<T, S> ex
fragment.add(bulkActionForm);
final CheckGroup<T> group = new CheckGroup<T>("checkgroup", new ArrayList<T>());
+ group.add(new AjaxFormChoiceComponentUpdatingBehavior() {
+
+ private static final long serialVersionUID = -151291731388673682L;
+
+ @Override
+ protected void onUpdate(final AjaxRequestTarget target) {
+ // triggers AJAX form submit
+ }
+
+ });
bulkActionForm.add(group);
columns.add(0, new CheckGroupColumn<T, S>(group));
@@ -120,7 +131,7 @@ public class AjaxDataTablePanel<T, S> ex
public Page createPage() {
return new BulkActionModalPage<T, S>(
bulkModalWin,
- new ArrayList<T>(group.getModelObject()),
+ group.getModelObject(),
columns,
actions,
bulkActionExecutor,
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckGroupColumn.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckGroupColumn.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckGroupColumn.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/CheckGroupColumn.java Tue Dec 31 07:45:14 2013
@@ -30,7 +30,7 @@ public class CheckGroupColumn<T, S> exte
private static final long serialVersionUID = 7955560320949560715L;
- private CheckGroup<T> group;
+ private final CheckGroup<T> group;
public CheckGroupColumn(final CheckGroup<T> checkGroup) {
super(new Model<String>());
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java?rev=1554382&r1=1554381&r2=1554382&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java Tue Dec 31 07:45:14 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.wicket.markup.html.form;
+import org.apache.syncope.console.commons.Constants;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
@@ -37,7 +38,8 @@ public abstract class AjaxDecoratedCheck
public AjaxDecoratedCheckbox(final String id, final IModel<Boolean> model) {
super(id, model);
- add(new AjaxEventBehavior("onclick") {
+ add(new AjaxEventBehavior(Constants.ON_CLICK) {
+
private static final long serialVersionUID = -295188647830294610L;
@Override
@@ -50,4 +52,4 @@ public abstract class AjaxDecoratedCheck
private void refreshComponent(final AjaxRequestTarget target) {
target.add(this);
}
-}
\ No newline at end of file
+}