svn commit: r1459736 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console: pages/DisplayAttributesModalPage.java pages/panels/ResultSetPanel.java rest/SchemaRestClient.java
Author: ilgrosso
Date: Fri Mar 22 11:55:27 2013
New Revision: 1459736
URL: http://svn.apache.org/r1459736
Log:
[SYNCOPE-341] Refreshing schemas, dschemas and vschemas at Users page load
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResultSetPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1459736r1=1459735r2=1459736view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
Fri Mar 22 11:55:27 2013
@@ -29,8 +29,6 @@ import org.apache.commons.lang.ArrayUtil
import org.apache.syncope.client.to.UserTO;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.rest.SchemaRestClient;
-import org.apache.syncope.types.AttributableType;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -66,105 +64,79 @@ public class DisplayAttributesModalPage
attributes, derivedAttributes, virtualAttributes, memberships,
resources,
serialVersionUID, password, propagationTOs};
-public static final ListString DEFAULT_SELECTION = Arrays.asList(new
String[]{id, username, status});
+public static final ListString DEFAULT_SELECTION = Arrays.asList(new
String[] {id, username, status});
@SpringBean
private PreferenceManager prefMan;
-/**
- * Schema rest client.
- */
-@SpringBean
-private SchemaRestClient schemaRestClient;
+private final ListString selectedDetails;
-final private IModelListString dnames = new
LoadableDetachableModelListString() {
+private final ListString selectedSchemas;
-private static final long serialVersionUID = 5275935387613157437L;
+private final ListString selectedVirSchemas;
-@Override
-protected ListString load() {
+private final ListString selectedDerSchemas;
-final ListString details = new ArrayListString();
+public DisplayAttributesModalPage(final PageReference pageRef, final
ModalWindow window,
+final ListString schemaNames, final ListString dSchemaNames,
final ListString vSchemaNames) {
-Class? clazz = UserTO.class;
+super();
-// loop on class and all superclasses searching for field
-while (clazz != null clazz != Object.class) {
-for (Field field : clazz.getDeclaredFields()) {
-if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
-details.add(field.getName());
-}
-}
-clazz = clazz.getSuperclass();
-}
+final IModelListString fnames = new
LoadableDetachableModelListString() {
-Collections.reverse(details);
-return details;
-}
-};
+private static final long serialVersionUID = 5275935387613157437L;
-final private IModelListString names = new
LoadableDetachableModelListString() {
+@Override
+protected ListString load() {
-private static final long serialVersionUID = 5275935387613157437L;
+final ListString details = new ArrayListString();
-@Override
-protected ListString load() {
+Class? clazz = UserTO.class;
-ListString schemas =
schemaRestClient.getSchemaNames(AttributableType.USER);
+// loop on class and all superclasses searching for field
+while (clazz != null clazz != Object.class) {
+for (Field field : clazz.getDeclaredFields()) {
+if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
+details.add(field.getName());
+}
+}
+clazz = clazz.getSuperclass();
+}
-if (schemas == null) {
-schemas = new ArrayListString();
+Collections.reverse(details);
+return details;
}
+};
-return schemas;
-}
-};
-
-final private IModelListString dsnames = new
svn commit: r1459775 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/syncope/console/pages/panels/ console/src/main/java/org/apache/syn
Author: ilgrosso
Date: Fri Mar 22 13:55:04 2013
New Revision: 1459775
URL: http://svn.apache.org/r1459775
Log:
[SYNCOPE-341] Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleTabPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SelectOnlyUserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserSearchResultPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/SchemaRestClient.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.html
Propchange: syncope/trunk/
--
Merged /syncope/branches/1_0_X:r1459693-1459736
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1459775r1=1459774r2=1459775view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java
Fri Mar 22 13:55:04 2013
@@ -26,10 +26,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
import org.apache.syncope.common.to.UserTO;
-import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.PreferenceManager;
-import org.apache.syncope.console.rest.SchemaRestClient;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -52,6 +50,7 @@ import org.apache.wicket.spring.injectio
/**
* Modal window with Display attributes form.
*/
+@SuppressWarnings({unchecked, rawtypes})
public class DisplayAttributesModalPage extends BaseModalPage {
private static final long serialVersionUID = -4274117450918385110L;
@@ -70,100 +69,75 @@ public class DisplayAttributesModalPage
@SpringBean
private PreferenceManager prefMan;
-/**
- * Schema rest client.
- */
-@SpringBean
-private SchemaRestClient schemaRestClient;
+private final ListString selectedDetails;
-final private IModelListString dnames = new
LoadableDetachableModelListString() {
+private final ListString selectedSchemas;
-private static final long serialVersionUID = 5275935387613157437L;
+private final ListString selectedDerSchemas;
-@Override
-protected ListString load() {
+private final ListString selectedVirSchemas;
-final ListString details = new ArrayListString();
+public DisplayAttributesModalPage(final PageReference pageRef, final
ModalWindow window,
+final ListString schemaNames, final ListString dSchemaNames,
final ListString vSchemaNames) {
-Class? clazz = UserTO.class;
+super();
-// loop on class and all superclasses searching for field
-while (clazz != null clazz != Object.class) {
-for (Field field : clazz.getDeclaredFields()) {
-if (!ArrayUtils.contains(ATTRIBUTES_TO_HIDE,
field.getName())) {
-details.add(field.getName());
-}
-}
-clazz = clazz.getSuperclass();
-}
+final IModelListString fnames = new
LoadableDetachableModelListString() {
-Collections.reverse(details);
-return details;
-}
-};
+private static final long serialVersionUID = 5275935387613157437L;
-final private IModelListString names = new
LoadableDetachableModelListString() {
+@Override
+protected ListString load() {
-private static final long serialVersionUID = 5275935387613157437L;
+final ListString details = new ArrayListString();
-@Override
-protected ListString load() {
+Class? clazz = UserTO.class;
-ListString schemas =
schemaRestClient.getSchemaNames(AttributableType.USER);
+// loop on class and all superclasses
