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 2012/03/15 11:17:24 UTC
svn commit: r1300882 [9/22] - in /incubator/syncope/trunk:
build-tools/src/main/java/org/syncope/buildtools/
client/src/main/java/org/syncope/annotation/
client/src/main/java/org/syncope/client/
client/src/main/java/org/syncope/client/http/ client/src/...
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java Thu Mar 15 10:17:12 2012
@@ -27,55 +27,38 @@ import org.syncope.client.validation.Syn
@Component
public class NotificationRestClient extends AbstractBaseRestClient {
- public List<NotificationTO> getAllNotifications()
- throws SyncopeClientCompositeErrorException {
+ public List<NotificationTO> getAllNotifications() throws SyncopeClientCompositeErrorException {
- return Arrays.asList(restTemplate.getForObject(baseURL
- + "notification/list.json", NotificationTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "notification/list.json", NotificationTO[].class));
}
- public NotificationTO readNotification(final Long id)
- throws SyncopeClientCompositeErrorException {
+ public NotificationTO readNotification(final Long id) throws SyncopeClientCompositeErrorException {
- return restTemplate.getForObject(
- baseURL + "notification/read/{notificationId}.json",
- NotificationTO.class, id);
+ return restTemplate.getForObject(baseURL + "notification/read/{notificationId}.json", NotificationTO.class, id);
}
- public void createNotification(final NotificationTO notificationTO)
- throws SyncopeClientCompositeErrorException {
+ public void createNotification(final NotificationTO notificationTO) throws SyncopeClientCompositeErrorException {
- restTemplate.postForObject(
- baseURL + "notification/create.json",
- notificationTO, NotificationTO.class);
+ restTemplate.postForObject(baseURL + "notification/create.json", notificationTO, NotificationTO.class);
}
- public void updateNotification(final NotificationTO notificationTO)
- throws SyncopeClientCompositeErrorException {
+ public void updateNotification(final NotificationTO notificationTO) throws SyncopeClientCompositeErrorException {
- restTemplate.postForObject(
- baseURL + "notification/update.json",
- notificationTO, NotificationTO.class);
+ restTemplate.postForObject(baseURL + "notification/update.json", notificationTO, NotificationTO.class);
}
- public void deleteNotification(final Long id)
- throws SyncopeClientCompositeErrorException {
+ public void deleteNotification(final Long id) throws SyncopeClientCompositeErrorException {
- restTemplate.delete(
- baseURL + "notification/delete/{notificationId}.json", id);
+ restTemplate.delete(baseURL + "notification/delete/{notificationId}.json", id);
}
- public List<String> getMailTemplates()
- throws SyncopeClientCompositeErrorException {
+ public List<String> getMailTemplates() throws SyncopeClientCompositeErrorException {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "configuration/mailTemplates.json", String[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "configuration/mailTemplates.json", String[].class));
}
- public List<String> getEvents()
- throws SyncopeClientCompositeErrorException {
+ public List<String> getEvents() throws SyncopeClientCompositeErrorException {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "workflow/tasks.json", String[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "workflow/tasks.json", String[].class));
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java Thu Mar 15 10:17:12 2012
@@ -43,8 +43,7 @@ public class PolicyRestClient extends Ab
switch (type) {
case GLOBAL_ACCOUNT:
try {
- policy = (T) restTemplate.getForObject(
- baseURL + "policy/account/global/read",
+ policy = (T) restTemplate.getForObject(baseURL + "policy/account/global/read",
AccountPolicyTO.class);
} catch (Exception e) {
LOG.debug("No account policy found", e);
@@ -53,8 +52,7 @@ public class PolicyRestClient extends Ab
break;
case GLOBAL_PASSWORD:
try {
- policy = (T) restTemplate.getForObject(
- baseURL + "policy/password/global/read",
+ policy = (T) restTemplate.getForObject(baseURL + "policy/password/global/read",
PasswordPolicyTO.class);
} catch (Exception e) {
LOG.debug("No password policy found", e);
@@ -63,9 +61,7 @@ public class PolicyRestClient extends Ab
break;
case GLOBAL_SYNC:
try {
- policy = (T) restTemplate.getForObject(
- baseURL + "policy/sync/global/read",
- SyncPolicyTO.class);
+ policy = (T) restTemplate.getForObject(baseURL + "policy/sync/global/read", SyncPolicyTO.class);
} catch (Exception e) {
LOG.debug("No password policy found", e);
policy = (T) new SyncPolicyTO();
@@ -114,9 +110,7 @@ public class PolicyRestClient extends Ab
}
try {
- policies = (T[]) restTemplate.getForObject(
- baseURL + "policy/" + policy + "/list",
- reference);
+ policies = (T[]) restTemplate.getForObject(baseURL + "policy/" + policy + "/list", reference);
} catch (Exception ignore) {
LOG.debug("No policy found", ignore);
}
@@ -128,8 +122,7 @@ public class PolicyRestClient extends Ab
PolicyTO globalPolicy = null;
try {
- globalPolicy = (T) restTemplate.getForObject(
- baseURL + "policy/" + policy + "/global/read",
+ globalPolicy = (T) restTemplate.getForObject(baseURL + "policy/" + policy + "/global/read",
globalReference);
} catch (Exception ignore) {
LOG.warn("No global policy found", ignore);
@@ -146,49 +139,37 @@ public class PolicyRestClient extends Ab
return res;
}
- public <T extends PolicyTO> T createPolicy(final T policy)
- throws InvalidPolicyType {
+ public <T extends PolicyTO> T createPolicy(final T policy) throws InvalidPolicyType {
switch (policy.getType()) {
case GLOBAL_ACCOUNT:
case ACCOUNT:
- return (T) restTemplate.postForObject(
- baseURL + "policy/account/create",
- policy, AccountPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/account/create", policy, AccountPolicyTO.class);
case GLOBAL_PASSWORD:
case PASSWORD:
- return (T) restTemplate.postForObject(
- baseURL + "policy/password/create",
- policy, PasswordPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/password/create", policy,
+ PasswordPolicyTO.class);
case GLOBAL_SYNC:
case SYNC:
- return (T) restTemplate.postForObject(
- baseURL + "policy/sync/create",
- policy, SyncPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/sync/create", policy, SyncPolicyTO.class);
default:
throw new InvalidPolicyType("Invalid type " + policy.getType());
}
}
- public <T extends PolicyTO> T updatePolicy(final T policy)
- throws InvalidPolicyType {
+ public <T extends PolicyTO> T updatePolicy(final T policy) throws InvalidPolicyType {
switch (policy.getType()) {
case GLOBAL_ACCOUNT:
case ACCOUNT:
- return (T) restTemplate.postForObject(
- baseURL + "policy/account/update",
- policy, AccountPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/account/update", policy, AccountPolicyTO.class);
case GLOBAL_PASSWORD:
case PASSWORD:
- return (T) restTemplate.postForObject(
- baseURL + "policy/password/update",
- policy, PasswordPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/password/update", policy,
+ PasswordPolicyTO.class);
case GLOBAL_SYNC:
case SYNC:
- return (T) restTemplate.postForObject(
- baseURL + "policy/sync/update",
- policy, SyncPolicyTO.class);
+ return (T) restTemplate.postForObject(baseURL + "policy/sync/update", policy, SyncPolicyTO.class);
default:
throw new InvalidPolicyType("Invalid type " + policy.getType());
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ReportRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ReportRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ReportRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ReportRestClient.java Thu Mar 15 10:17:12 2012
@@ -26,15 +26,14 @@ import org.syncope.client.to.ReportTO;
import org.syncope.client.validation.SyncopeClientCompositeErrorException;
@Component
-public class ReportRestClient extends AbstractBaseRestClient
- implements ExecutionRestClient {
+public class ReportRestClient extends AbstractBaseRestClient implements ExecutionRestClient {
public List<String> getReportletConfClasses() {
List<String> reportletClasses = null;
try {
- reportletClasses = Arrays.asList(restTemplate.getForObject(
- baseURL + "report/reportletConfClasses.json", String[].class));
+ reportletClasses = Arrays.asList(restTemplate.getForObject(baseURL + "report/reportletConfClasses.json",
+ String[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While getting available reportlet classes", e);
}
@@ -42,29 +41,24 @@ public class ReportRestClient extends Ab
}
public List<ReportTO> list() {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "report/list", ReportTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "report/list", ReportTO[].class));
}
public List<ReportTO> list(final int page, final int size) {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "report/list/{page}/{size}.json",
- ReportTO[].class, page, size));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "report/list/{page}/{size}.json", ReportTO[].class,
+ page, size));
}
public int count() {
- return restTemplate.getForObject(
- baseURL + "report/count.json", Integer.class);
+ return restTemplate.getForObject(baseURL + "report/count.json", Integer.class);
}
public ReportTO create(final ReportTO reportTO) {
- return restTemplate.postForObject(
- baseURL + "report/create", reportTO, ReportTO.class);
+ return restTemplate.postForObject(baseURL + "report/create", reportTO, ReportTO.class);
}
public ReportTO update(final ReportTO reportTO) {
- return restTemplate.postForObject(
- baseURL + "report/update", reportTO, ReportTO.class);
+ return restTemplate.postForObject(baseURL + "report/update", reportTO, ReportTO.class);
}
/**
@@ -73,8 +67,7 @@ public class ReportRestClient extends Ab
* @param reportId report to delete
*/
public void delete(final Long reportId) {
- restTemplate.delete(
- baseURL + "report/delete/{reportId}", reportId);
+ restTemplate.delete(baseURL + "report/delete/{reportId}", reportId);
}
/**
@@ -84,9 +77,7 @@ public class ReportRestClient extends Ab
*/
@Override
public void startExecution(final Long reportId) {
- restTemplate.postForObject(
- baseURL + "report/execute/{reportId}",
- null, ReportExecTO.class, reportId);
+ restTemplate.postForObject(baseURL + "report/execute/{reportId}", null, ReportExecTO.class, reportId);
}
/**
@@ -96,8 +87,7 @@ public class ReportRestClient extends Ab
*/
@Override
public void deleteExecution(final Long reportExecId) {
- restTemplate.delete(baseURL
- + "report/execution/delete/{execId}", reportExecId);
+ restTemplate.delete(baseURL + "report/execution/delete/{execId}", reportExecId);
}
/**
@@ -107,9 +97,6 @@ public class ReportRestClient extends Ab
*/
@Override
public List<ReportExecTO> listExecutions() {
- return Arrays.asList(
- restTemplate.getForObject(
- baseURL + "report/execution/list",
- ReportExecTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "report/execution/list", ReportExecTO[].class));
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java Thu Mar 15 10:17:12 2012
@@ -34,9 +34,7 @@ public class ResourceRestClient extends
List<ResourceTO> resources = null;
try {
- resources = Arrays.asList(restTemplate.getForObject(
- baseURL + "resource/list.json",
- ResourceTO[].class));
+ resources = Arrays.asList(restTemplate.getForObject(baseURL + "resource/list.json", ResourceTO[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading all resources", e);
}
@@ -45,17 +43,14 @@ public class ResourceRestClient extends
}
public void create(final ResourceTO resourceTO) {
- restTemplate.postForObject(baseURL
- + "resource/create", resourceTO, ResourceTO.class);
+ restTemplate.postForObject(baseURL + "resource/create", resourceTO, ResourceTO.class);
}
public ResourceTO read(final String name) {
ResourceTO resourceTO = null;
try {
- resourceTO = restTemplate.getForObject(
- baseURL + "resource/read/" + name + ".json",
- ResourceTO.class);
+ resourceTO = restTemplate.getForObject(baseURL + "resource/read/" + name + ".json", ResourceTO.class);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading a resource", e);
}
@@ -63,13 +58,10 @@ public class ResourceRestClient extends
}
public void update(final ResourceTO resourceTO) {
- restTemplate.postForObject(
- baseURL + "resource/update.json", resourceTO,
- ResourceTO.class);
+ restTemplate.postForObject(baseURL + "resource/update.json", resourceTO, ResourceTO.class);
}
public void delete(final String name) {
- restTemplate.delete(baseURL
- + "resource/delete/{resourceName}.json", name);
+ restTemplate.delete(baseURL + "resource/delete/{resourceName}.json", name);
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java Thu Mar 15 10:17:12 2012
@@ -35,14 +35,12 @@ public class RoleRestClient extends Abst
* Get all Roles.
* @return SchemaTOs
*/
- public List<RoleTO> getAllRoles()
- throws SyncopeClientCompositeErrorException {
+ public List<RoleTO> getAllRoles() throws SyncopeClientCompositeErrorException {
List<RoleTO> roles = null;
try {
- roles = Arrays.asList(restTemplate.getForObject(
- baseURL + "role/list.json", RoleTO[].class));
+ roles = Arrays.asList(restTemplate.getForObject(baseURL + "role/list.json", RoleTO[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While listing all roles", e);
}
@@ -55,8 +53,7 @@ public class RoleRestClient extends Abst
* @param roleTO
*/
public void createRole(RoleTO roleTO) {
- restTemplate.postForObject(
- baseURL + "role/create", roleTO, RoleTO.class);
+ restTemplate.postForObject(baseURL + "role/create", roleTO, RoleTO.class);
}
/**
@@ -68,8 +65,7 @@ public class RoleRestClient extends Abst
RoleTO roleTO = null;
try {
- roleTO = restTemplate.getForObject(
- baseURL + "role/read/{roleId}.json", RoleTO.class, id);
+ roleTO = restTemplate.getForObject(baseURL + "role/read/{roleId}.json", RoleTO.class, id);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading a role", e);
}
@@ -82,8 +78,7 @@ public class RoleRestClient extends Abst
* @return true is the opertion ends succesfully, false otherwise
*/
public void updateRole(RoleMod roleMod) {
- restTemplate.postForObject(
- baseURL + "role/update", roleMod, RoleTO.class);
+ restTemplate.postForObject(baseURL + "role/update", roleMod, RoleTO.class);
}
/**
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java Thu Mar 15 10:17:12 2012
@@ -43,8 +43,8 @@ public class SchemaRestClient extends Ab
List<SchemaTO> schemas = null;
try {
- schemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "schema/" + type.name().toLowerCase() + "/list.json", SchemaTO[].class));
+ schemas = Arrays.asList(restTemplate.getForObject(baseURL + "schema/" + type.name().toLowerCase()
+ + "/list.json", SchemaTO[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While getting all schemas", e);
}
@@ -61,8 +61,8 @@ public class SchemaRestClient extends Ab
final List<String> schemaNames = new ArrayList<String>();
try {
- final List<SchemaTO> userSchemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "schema/" + type.name().toLowerCase() + "/list.json", SchemaTO[].class));
+ final List<SchemaTO> userSchemas = Arrays.asList(restTemplate.getForObject(baseURL + "schema/"
+ + type.name().toLowerCase() + "/list.json", SchemaTO[].class));
for (SchemaTO schemaTO : userSchemas) {
schemaNames.add(schemaTO.getName());
@@ -84,8 +84,8 @@ public class SchemaRestClient extends Ab
List<DerivedSchemaTO> userDerivedSchemas = null;
try {
- userDerivedSchemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "derivedSchema/" + type.name().toLowerCase() + "/list.json", DerivedSchemaTO[].class));
+ userDerivedSchemas = Arrays.asList(restTemplate.getForObject(baseURL + "derivedSchema/"
+ + type.name().toLowerCase() + "/list.json", DerivedSchemaTO[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While getting all user derived schemas", e);
}
@@ -103,8 +103,8 @@ public class SchemaRestClient extends Ab
final List<String> userDerivedSchemasNames = new ArrayList<String>();
try {
- final List<DerivedSchemaTO> userDerivedSchemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "derivedSchema/" + type.name().toLowerCase() + "/list.json", DerivedSchemaTO[].class));
+ final List<DerivedSchemaTO> userDerivedSchemas = Arrays.asList(restTemplate.getForObject(baseURL
+ + "derivedSchema/" + type.name().toLowerCase() + "/list.json", DerivedSchemaTO[].class));
for (DerivedSchemaTO schemaTO : userDerivedSchemas) {
userDerivedSchemasNames.add(schemaTO.getName());
@@ -126,8 +126,8 @@ public class SchemaRestClient extends Ab
List<VirtualSchemaTO> userVirtualSchemas = null;
try {
- userVirtualSchemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "virtualSchema/" + type.name().toLowerCase() + "/list.json", VirtualSchemaTO[].class));
+ userVirtualSchemas = Arrays.asList(restTemplate.getForObject(baseURL + "virtualSchema/"
+ + type.name().toLowerCase() + "/list.json", VirtualSchemaTO[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While getting all user derived schemas", e);
}
@@ -144,8 +144,8 @@ public class SchemaRestClient extends Ab
final List<String> userVirtualSchemasNames = new ArrayList<String>();
try {
- final List<VirtualSchemaTO> userVirtualSchemas = Arrays.asList(restTemplate.getForObject(
- baseURL + "virtualSchema/" + type.name().toLowerCase() + "/list.json", VirtualSchemaTO[].class));
+ final List<VirtualSchemaTO> userVirtualSchemas = Arrays.asList(restTemplate.getForObject(baseURL
+ + "virtualSchema/" + type.name().toLowerCase() + "/list.json", VirtualSchemaTO[].class));
for (VirtualSchemaTO schemaTO : userVirtualSchemas) {
userVirtualSchemasNames.add(schemaTO.getName());
@@ -163,8 +163,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO
*/
public void createSchema(final AttributableType type, final SchemaTO schemaTO) {
- restTemplate.postForObject(
- baseURL + "schema/" + type.name().toLowerCase() + "/create", schemaTO, SchemaTO.class);
+ restTemplate.postForObject(baseURL + "schema/" + type.name().toLowerCase() + "/create", schemaTO,
+ SchemaTO.class);
}
/**
@@ -177,8 +177,8 @@ public class SchemaRestClient extends Ab
SchemaTO schema = null;
try {
- schema = restTemplate.getForObject(
- baseURL + "schema/" + type.name().toLowerCase() + "/read/" + name + ".json", SchemaTO.class);
+ schema = restTemplate.getForObject(baseURL + "schema/" + type.name().toLowerCase() + "/read/" + name
+ + ".json", SchemaTO.class);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading a user schema", e);
}
@@ -191,8 +191,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO updated
*/
public void updateSchema(final AttributableType type, SchemaTO schemaTO) {
- restTemplate.postForObject(
- baseURL + "schema/" + type.name().toLowerCase() + "/update", schemaTO, SchemaTO.class);
+ restTemplate.postForObject(baseURL + "schema/" + type.name().toLowerCase() + "/update", schemaTO,
+ SchemaTO.class);
}
/**
@@ -211,8 +211,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO
*/
public void createDerivedSchema(final AttributableType type, final DerivedSchemaTO schemaTO) {
- restTemplate.postForObject(
- baseURL + "derivedSchema/" + type.name().toLowerCase() + "/create", schemaTO, DerivedSchemaTO.class);
+ restTemplate.postForObject(baseURL + "derivedSchema/" + type.name().toLowerCase() + "/create", schemaTO,
+ DerivedSchemaTO.class);
}
/**
@@ -221,8 +221,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO
*/
public void createVirtualSchema(final AttributableType type, final VirtualSchemaTO schemaTO) {
- restTemplate.postForObject(
- baseURL + "virtualSchema/" + type.name().toLowerCase() + "/create", schemaTO, VirtualSchemaTO.class);
+ restTemplate.postForObject(baseURL + "virtualSchema/" + type.name().toLowerCase() + "/create", schemaTO,
+ VirtualSchemaTO.class);
}
/**
@@ -234,9 +234,8 @@ public class SchemaRestClient extends Ab
public DerivedSchemaTO readDerivedSchema(final AttributableType type, final String name) {
DerivedSchemaTO derivedSchemaTO = null;
try {
- derivedSchemaTO = restTemplate.getForObject(
- baseURL + "derivedSchema/" + type.name().toLowerCase() + "/read/" + name + ".json",
- DerivedSchemaTO.class);
+ derivedSchemaTO = restTemplate.getForObject(baseURL + "derivedSchema/" + type.name().toLowerCase()
+ + "/read/" + name + ".json", DerivedSchemaTO.class);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading a derived user schema", e);
}
@@ -249,8 +248,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO updated
*/
public void updateDerivedSchema(final AttributableType type, final DerivedSchemaTO schemaTO) {
- restTemplate.postForObject(
- baseURL + "derivedSchema/" + type.name().toLowerCase() + "/update", schemaTO, DerivedSchemaTO.class);
+ restTemplate.postForObject(baseURL + "derivedSchema/" + type.name().toLowerCase() + "/update", schemaTO,
+ DerivedSchemaTO.class);
}
/**
@@ -259,8 +258,8 @@ public class SchemaRestClient extends Ab
* @param schemaTO updated
*/
public void updateVirtualSchema(final AttributableType type, final VirtualSchemaTO schemaTO) {
- restTemplate.postForObject(baseURL
- + "virtualSchema/" + type.name().toLowerCase() + "/update", schemaTO, VirtualSchemaTO.class);
+ restTemplate.postForObject(baseURL + "virtualSchema/" + type.name().toLowerCase() + "/update", schemaTO,
+ VirtualSchemaTO.class);
}
/**
@@ -288,8 +287,8 @@ public class SchemaRestClient extends Ab
List<String> validators = null;
try {
- validators = Arrays.asList(restTemplate.getForObject(
- baseURL + "configuration/validators.json", String[].class));
+ validators = Arrays.asList(restTemplate.getForObject(baseURL + "configuration/validators.json",
+ String[].class));
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While getting all validators", e);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java Thu Mar 15 10:17:12 2012
@@ -35,8 +35,7 @@ import org.syncope.client.validation.Syn
* Console client for invoking Rest Tasks services.
*/
@Component
-public class TaskRestClient extends AbstractBaseRestClient
- implements ExecutionRestClient {
+public class TaskRestClient extends AbstractBaseRestClient implements ExecutionRestClient {
/**
* Return a list of job classes.
@@ -86,20 +85,16 @@ public class TaskRestClient extends Abst
List<T> result = Collections.EMPTY_LIST;
if (PropagationTaskTO.class == reference) {
- result = (List<T>) Arrays.asList(restTemplate.getForObject(
- baseURL + "task/propagation/list/{page}/{size}.json",
- PropagationTaskTO[].class, page, size));
+ result = (List<T>) Arrays.asList(restTemplate.getForObject(baseURL
+ + "task/propagation/list/{page}/{size}.json", PropagationTaskTO[].class, page, size));
} else if (NotificationTaskTO.class == reference) {
- result = (List<T>) Arrays.asList(restTemplate.getForObject(
- baseURL + "task/notification/list/{page}/{size}.json",
- NotificationTaskTO[].class, page, size));
+ result = (List<T>) Arrays.asList(restTemplate.getForObject(baseURL
+ + "task/notification/list/{page}/{size}.json", NotificationTaskTO[].class, page, size));
} else if (SchedTaskTO.class == reference) {
- result = (List<T>) Arrays.asList(restTemplate.getForObject(
- baseURL + "task/sched/list/{page}/{size}.json",
+ result = (List<T>) Arrays.asList(restTemplate.getForObject(baseURL + "task/sched/list/{page}/{size}.json",
SchedTaskTO[].class, page, size));
} else if (SyncTaskTO.class == reference) {
- result = (List<T>) Arrays.asList(restTemplate.getForObject(
- baseURL + "task/sync/list/{page}/{size}.json",
+ result = (List<T>) Arrays.asList(restTemplate.getForObject(baseURL + "task/sync/list/{page}/{size}.json",
SyncTaskTO[].class, page, size));
}
@@ -152,8 +147,8 @@ public class TaskRestClient extends Abst
* @param taskId task id
*/
public void startExecution(final Long taskId, boolean dryRun) {
- restTemplate.postForObject(
- baseURL + "task/execute/{taskId}?dryRun={dryRun}", null, TaskExecTO.class, taskId, dryRun);
+ restTemplate.postForObject(baseURL + "task/execute/{taskId}?dryRun={dryRun}", null, TaskExecTO.class, taskId,
+ dryRun);
}
/**
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java Thu Mar 15 10:17:12 2012
@@ -29,32 +29,26 @@ import org.syncope.client.to.UserTO;
public class UserRequestRestClient extends AbstractBaseRestClient {
public UserTO readProfile() {
- return restTemplate.getForObject(
- baseURL + "user/request/read/self", UserTO.class);
+ return restTemplate.getForObject(baseURL + "user/request/read/self", UserTO.class);
}
public List<UserRequestTO> list() {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "user/request/list", UserRequestTO[].class));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "user/request/list", UserRequestTO[].class));
}
public void delete(final Long requestId) {
- restTemplate.delete(baseURL + "user/request/deleteRequest/{requestId}",
- requestId);
+ restTemplate.delete(baseURL + "user/request/deleteRequest/{requestId}", requestId);
}
public UserRequestTO requestCreate(final UserTO userTO) {
- return restTemplate.postForObject(baseURL + "user/request/create",
- userTO, UserRequestTO.class);
+ return restTemplate.postForObject(baseURL + "user/request/create", userTO, UserRequestTO.class);
}
public UserRequestTO requestUpdate(final UserMod userMod) {
- return restTemplate.postForObject(baseURL + "user/request/update",
- userMod, UserRequestTO.class);
+ return restTemplate.postForObject(baseURL + "user/request/update", userMod, UserRequestTO.class);
}
public UserRequestTO requestDelete(final Long userId) {
- return restTemplate.postForObject(baseURL + "user/request/delete/",
- userId, UserRequestTO.class);
+ return restTemplate.postForObject(baseURL + "user/request/delete/", userId, UserRequestTO.class);
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java Thu Mar 15 10:17:12 2012
@@ -35,8 +35,7 @@ import org.syncope.console.commons.Statu
public class UserRestClient extends AbstractBaseRestClient {
public Integer count() {
- return restTemplate.getForObject(baseURL + "user/count.json",
- Integer.class);
+ return restTemplate.getForObject(baseURL + "user/count.json", Integer.class);
}
/**
@@ -47,9 +46,8 @@ public class UserRestClient extends Abst
* @return list of TaskTO objects
*/
public List<UserTO> list(final int page, final int size) {
- return Arrays.asList(restTemplate.getForObject(
- baseURL + "user/list/{page}/{size}.json",
- UserTO[].class, page, size));
+ return Arrays.asList(restTemplate.getForObject(baseURL + "user/list/{page}/{size}.json", UserTO[].class, page,
+ size));
}
/**
@@ -58,11 +56,9 @@ public class UserRestClient extends Abst
* @param userTO instance
* @throws SyncopeClientCompositeErrorException
*/
- public UserTO create(final UserTO userTO)
- throws SyncopeClientCompositeErrorException {
+ public UserTO create(final UserTO userTO) throws SyncopeClientCompositeErrorException {
- return restTemplate.postForObject(baseURL
- + "user/create", userTO, UserTO.class);
+ return restTemplate.postForObject(baseURL + "user/create", userTO, UserTO.class);
}
/**
@@ -71,26 +67,20 @@ public class UserRestClient extends Abst
* @param userTO
* @return true is the opertion ends succesfully, false otherwise
*/
- public UserTO update(UserMod userModTO)
- throws SyncopeClientCompositeErrorException {
+ public UserTO update(UserMod userModTO) throws SyncopeClientCompositeErrorException {
- return restTemplate.postForObject(baseURL + "user/update",
- userModTO, UserTO.class);
+ return restTemplate.postForObject(baseURL + "user/update", userModTO, UserTO.class);
}
- public UserTO delete(Long id)
- throws SyncopeClientCompositeErrorException {
+ public UserTO delete(Long id) throws SyncopeClientCompositeErrorException {
- return restTemplate.getForObject(
- baseURL + "user/delete/{userId}", UserTO.class, id);
+ return restTemplate.getForObject(baseURL + "user/delete/{userId}", UserTO.class, id);
}
public UserTO read(Long id) {
UserTO userTO = null;
try {
- userTO = restTemplate.getForObject(
- baseURL + "user/read/{userId}.json",
- UserTO.class, id);
+ userTO = restTemplate.getForObject(baseURL + "user/read/{userId}.json", UserTO.class, id);
} catch (SyncopeClientCompositeErrorException e) {
LOG.error("While reading a user", e);
}
@@ -98,8 +88,7 @@ public class UserRestClient extends Abst
}
public Integer searchCount(final NodeCond searchCond) {
- return restTemplate.postForObject(
- baseURL + "user/search/count.json", searchCond, Integer.class);
+ return restTemplate.postForObject(baseURL + "user/search/count.json", searchCond, Integer.class);
}
/**
@@ -108,69 +97,54 @@ public class UserRestClient extends Abst
* @param userTO
* @return UserTOs
*/
- public List<UserTO> search(final NodeCond searchCond)
- throws SyncopeClientCompositeErrorException {
+ public List<UserTO> search(final NodeCond searchCond) throws SyncopeClientCompositeErrorException {
- return Arrays.asList(restTemplate.postForObject(
- baseURL + "user/search",
- searchCond, UserTO[].class));
+ return Arrays.asList(restTemplate.postForObject(baseURL + "user/search", searchCond, UserTO[].class));
}
- public List<UserTO> search(final NodeCond searchCond,
- final int page, final int size)
+ public List<UserTO> search(final NodeCond searchCond, final int page, final int size)
throws SyncopeClientCompositeErrorException {
- return Arrays.asList(restTemplate.postForObject(
- baseURL + "user/search/{page}/{size}",
- searchCond, UserTO[].class, page, size));
+ return Arrays.asList(restTemplate.postForObject(baseURL + "user/search/{page}/{size}", searchCond,
+ UserTO[].class, page, size));
}
- public ConnObjectTO getRemoteObject(
- final String resourceName, final String objectId)
+ public ConnObjectTO getRemoteObject(final String resourceName, final String objectId)
throws SyncopeClientCompositeErrorException {
- return restTemplate.getForObject(
- baseURL + "/resource/{resourceName}/read/{objectId}.json",
- ConnObjectTO.class, resourceName, objectId);
+ return restTemplate.getForObject(baseURL + "/resource/{resourceName}/read/{objectId}.json", ConnObjectTO.class,
+ resourceName, objectId);
}
- public UserTO reactivate(long userId, List<StatusBean> statuses)
- throws SyncopeClientCompositeErrorException {
+ public UserTO reactivate(long userId, List<StatusBean> statuses) throws SyncopeClientCompositeErrorException {
return enable(userId, statuses, true);
}
- public UserTO suspend(long userId, List<StatusBean> statuses)
- throws SyncopeClientCompositeErrorException {
+ public UserTO suspend(long userId, List<StatusBean> statuses) throws SyncopeClientCompositeErrorException {
return enable(userId, statuses, false);
}
- private UserTO enable(
- final long userId,
- final List<StatusBean> statuses,
- final boolean enable)
+ private UserTO enable(final long userId, final List<StatusBean> statuses, final boolean enable)
throws SyncopeClientCompositeErrorException {
final StringBuilder query = new StringBuilder();
- query.append(baseURL).append("user/").append(
- enable ? "reactivate/" : "suspend/").append(userId).
- append("?").
- // perform on resource if and only if resources have been speciofied
- append("performRemotely=").append(!statuses.isEmpty()).
- append("&");
+ query.append(baseURL).append("user/").append(enable
+ ? "reactivate/"
+ : "suspend/").append(userId).append("?").
+ // perform on resource if and only if resources have been speciofied
+ append("performRemotely=").append(!statuses.isEmpty()).append("&");
boolean performLoacal = false;
for (StatusBean status : statuses) {
- if ((enable && !status.getStatus().isActive())
- || (!enable && status.getStatus().isActive())) {
+ if ((enable && !status.getStatus().isActive()) || (!enable && status.getStatus().isActive())) {
if ("Syncope".equals(status.getResourceName())) {
performLoacal = true;
} else {
- query.append("resourceNames=").
- append(status.getResourceName()).append("&");
+ query.append("resourceNames=").append(status.getResourceName()).append("&");
}
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java Thu Mar 15 10:17:12 2012
@@ -25,18 +25,13 @@ import org.syncope.client.validation.Syn
@Component
public class WorkflowRestClient extends AbstractBaseRestClient {
- public WorkflowDefinitionTO getDefinition()
- throws SyncopeClientCompositeErrorException {
+ public WorkflowDefinitionTO getDefinition() throws SyncopeClientCompositeErrorException {
- return restTemplate.getForObject(baseURL
- + "workflow/definition.json",
- WorkflowDefinitionTO.class);
+ return restTemplate.getForObject(baseURL + "workflow/definition.json", WorkflowDefinitionTO.class);
}
- public void updateDefinition(final WorkflowDefinitionTO workflowDef)
- throws SyncopeClientCompositeErrorException {
+ public void updateDefinition(final WorkflowDefinitionTO workflowDef) throws SyncopeClientCompositeErrorException {
- restTemplate.put(baseURL
- + "/workflow/definition.json", workflowDef);
+ restTemplate.put(baseURL + "/workflow/definition.json", workflowDef);
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/AbstractAjaxDownloadBehavior.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/AbstractAjaxDownloadBehavior.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/AbstractAjaxDownloadBehavior.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/AbstractAjaxDownloadBehavior.java Thu Mar 15 10:17:12 2012
@@ -23,8 +23,7 @@ import org.apache.wicket.behavior.Abstra
import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
import org.apache.wicket.util.resource.IResourceStream;
-public abstract class AbstractAjaxDownloadBehavior
- extends AbstractAjaxBehavior {
+public abstract class AbstractAjaxDownloadBehavior extends AbstractAjaxBehavior {
private static final long serialVersionUID = 6833760760338614245L;
@@ -40,8 +39,7 @@ public abstract class AbstractAjaxDownlo
@Override
public void onRequest() {
getComponent().getRequestCycle().scheduleRequestHandlerAfterCurrent(
- new ResourceStreamRequestHandler(
- getResourceStream(), getFileName()));
+ new ResourceStreamRequestHandler(getResourceStream(), getFileName()));
}
protected abstract String getFileName();
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java Thu Mar 15 10:17:12 2012
@@ -43,9 +43,7 @@ public abstract class IndicatingDeleteOn
@Override
public CharSequence preDecorateScript(final CharSequence script) {
- return "if (confirm('"
- + getString("confirmDelete") + "'))"
- + "{" + script + "}";
+ return "if (confirm('" + getString("confirmDelete") + "'))" + "{" + script + "}";
}
};
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java Thu Mar 15 10:17:12 2012
@@ -33,23 +33,21 @@ public class DatePropertyColumn<T> exten
private static final long serialVersionUID = 3527840552172947705L;
- public DatePropertyColumn(final IModel<String> displayModel,
- final String sortProperty, final String propertyExpression) {
+ public DatePropertyColumn(final IModel<String> displayModel, final String sortProperty,
+ final String propertyExpression) {
super(displayModel, sortProperty, propertyExpression);
}
@Override
- public void populateItem(final Item<ICellPopulator<T>> item,
- final String componentId, final IModel<T> rowModel) {
+ public void populateItem(final Item<ICellPopulator<T>> item, final String componentId, final IModel<T> rowModel) {
IModel date = (IModel<Date>) createLabelModel(rowModel);
String convertedDate = "";
if (date.getObject() != null) {
- convertedDate = SyncopeSession.get().
- getDateFormat().format(date.getObject());
+ convertedDate = SyncopeSession.get().getDateFormat().format(date.getObject());
item.add(new Label(componentId, convertedDate));
} else {
item.add(new Label(componentId, convertedDate));
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java Thu Mar 15 10:17:12 2012
@@ -36,18 +36,13 @@ public class TokenColumn extends Abstrac
}
@Override
- public void populateItem(final Item<ICellPopulator<UserTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<UserTO>> cellItem, final String componentId,
final IModel<UserTO> rowModel) {
if (StringUtils.hasText(rowModel.getObject().getToken())) {
- cellItem.add(new Label(
- componentId,
- new ResourceModel("tokenValued", "tokenValued")));
+ cellItem.add(new Label(componentId, new ResourceModel("tokenValued", "tokenValued")));
} else {
- cellItem.add(new Label(
- componentId,
- new ResourceModel("tokenNotValued", "tokenNotValued")));
+ cellItem.add(new Label(componentId, new ResourceModel("tokenNotValued", "tokenNotValued")));
}
}
}
\ No newline at end of file
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java Thu Mar 15 10:17:12 2012
@@ -43,9 +43,7 @@ public class UserAttrColumn extends Abst
private final SchemaType schemaType;
- public UserAttrColumn(
- final String name,
- final SchemaType schemaType) {
+ public UserAttrColumn(final String name, final SchemaType schemaType) {
super(new ResourceModel(name, name), name);
this.name = name;
@@ -53,9 +51,7 @@ public class UserAttrColumn extends Abst
}
@Override
- public void populateItem(
- final Item<ICellPopulator<UserTO>> cellItem,
- final String componentId,
+ public void populateItem(final Item<ICellPopulator<UserTO>> cellItem, final String componentId,
final IModel<UserTO> rowModel) {
List<String> values = null;
@@ -63,26 +59,21 @@ public class UserAttrColumn extends Abst
switch (schemaType) {
case schema:
if (rowModel.getObject().getAttributeMap().containsKey(name)) {
- values = rowModel.getObject().getAttributeMap().
- get(name).getValues();
+ values = rowModel.getObject().getAttributeMap().get(name).getValues();
}
break;
case virtualSchema:
- if (rowModel.getObject().getVirtualAttributeMap().
- containsKey(name)) {
+ if (rowModel.getObject().getVirtualAttributeMap().containsKey(name)) {
- values = rowModel.getObject().getVirtualAttributeMap().
- get(name).getValues();
+ values = rowModel.getObject().getVirtualAttributeMap().get(name).getValues();
}
break;
case derivedSchema:
- if (rowModel.getObject().getDerivedAttributeMap().
- containsKey(name)) {
+ if (rowModel.getObject().getDerivedAttributeMap().containsKey(name)) {
- values = rowModel.getObject().getDerivedAttributeMap().
- get(name).getValues();
+ values = rowModel.getObject().getDerivedAttributeMap().get(name).getValues();
}
break;
@@ -93,11 +84,9 @@ public class UserAttrColumn extends Abst
cellItem.add(new Label(componentId, ""));
} else {
if (values.size() == 1) {
- cellItem.add(
- new Label(componentId, values.get(0)));
+ cellItem.add(new Label(componentId, values.get(0)));
} else {
- cellItem.add(
- new Label(componentId, values.toString()));
+ cellItem.add(new Label(componentId, values.toString()));
}
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -29,14 +29,11 @@ public abstract class AbstractFieldPanel
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(
- AbstractFieldPanel.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(AbstractFieldPanel.class);
private static final long serialVersionUID = 5958017546318855690L;
- public AbstractFieldPanel(
- final String id,
- final IModel<T> model) {
+ public AbstractFieldPanel(final String id, final IModel<T> model) {
super(id, model);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java Thu Mar 15 10:17:12 2012
@@ -56,216 +56,162 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelExport", "emptyFragment", this));
}
- public void add(
- final ActionLink link,
- final ActionLink.ActionType type,
- final String pageId,
- final String actionId) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId, final String actionId) {
- add(link, type,
- xmlRolesReader.getAllAllowedRoles(pageId, actionId), true);
+ add(link, type, xmlRolesReader.getAllAllowedRoles(pageId, actionId), true);
}
- public void add(
- final ActionLink link,
- final ActionLink.ActionType type,
- final String pageId,
- final String actionId,
- final boolean enabled) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String pageId,
+ final String actionId, final boolean enabled) {
- add(link, type,
- xmlRolesReader.getAllAllowedRoles(pageId, actionId), enabled);
+ add(link, type, xmlRolesReader.getAllAllowedRoles(pageId, actionId), enabled);
}
- public void add(
- final ActionLink link,
- final ActionLink.ActionType type,
- final String roles) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String roles) {
add(link, type, roles, true);
}
- public void add(
- final ActionLink link,
- final ActionLink.ActionType type,
- final String roles,
- final boolean enabled) {
+ public void add(final ActionLink link, final ActionLink.ActionType type, final String roles, final boolean enabled) {
Fragment fragment = null;
switch (type) {
case CLAIM:
- fragment = new Fragment(
- "panelClaim", "fragmentClaim", this);
+ fragment = new Fragment("panelClaim", "fragmentClaim", this);
- fragment.addOrReplace(
- new IndicatingAjaxLink("claimLink") {
+ fragment.addOrReplace(new IndicatingAjaxLink("claimLink") {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+
+ link.onClick(target);
+ }
+ });
break;
case CREATE:
- fragment = new Fragment(
- "panelCreate", "fragmentCreate", this);
+ fragment = new Fragment("panelCreate", "fragmentCreate", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("createLink") {
- fragment.addOrReplace(
- new IndicatingAjaxLink("createLink") {
+ private static final long serialVersionUID = -7978723352517770644L;
- private static final long serialVersionUID =
- -7978723352517770644L;
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ link.onClick(target);
+ }
+ });
break;
case EDIT:
- fragment = new Fragment(
- "panelEdit", "fragmentEdit", this);
+ fragment = new Fragment("panelEdit", "fragmentEdit", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("editLink") {
- fragment.addOrReplace(
- new IndicatingAjaxLink("editLink") {
+ private static final long serialVersionUID = -7978723352517770644L;
- private static final long serialVersionUID =
- -7978723352517770644L;
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ link.onClick(target);
+ }
+ });
break;
case TEMPLATE:
- fragment = new Fragment(
- "panelTemplate", "fragmentTemplate", this);
+ fragment = new Fragment("panelTemplate", "fragmentTemplate", this);
- fragment.addOrReplace(
- new IndicatingAjaxLink("templateLink") {
+ fragment.addOrReplace(new IndicatingAjaxLink("templateLink") {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+
+ link.onClick(target);
+ }
+ });
break;
case SEARCH:
- fragment = new Fragment(
- "panelSearch", "fragmentSearch", this);
+ fragment = new Fragment("panelSearch", "fragmentSearch", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("searchLink") {
- fragment.addOrReplace(
- new IndicatingAjaxLink("searchLink") {
+ private static final long serialVersionUID = -7978723352517770644L;
- private static final long serialVersionUID =
- -7978723352517770644L;
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ link.onClick(target);
+ }
+ });
break;
case EXECUTE:
- fragment = new Fragment(
- "panelExecute", "fragmentExecute", this);
+ fragment = new Fragment("panelExecute", "fragmentExecute", this);
- fragment.addOrReplace(
- new IndicatingAjaxLink("executeLink") {
+ fragment.addOrReplace(new IndicatingAjaxLink("executeLink") {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+
+ link.onClick(target);
+ }
+ });
break;
case DRYRUN:
- fragment = new Fragment(
- "panelDryRun", "fragmentDryRun", this);
+ fragment = new Fragment("panelDryRun", "fragmentDryRun", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("dryRunLink") {
- fragment.addOrReplace(
- new IndicatingAjaxLink("dryRunLink") {
+ private static final long serialVersionUID = -7978723352517770644L;
- private static final long serialVersionUID =
- -7978723352517770644L;
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ link.onClick(target);
+ }
+ });
break;
case DELETE:
- fragment = new Fragment(
- "panelDelete", "fragmentDelete", this);
+ fragment = new Fragment("panelDelete", "fragmentDelete", this);
- fragment.addOrReplace(
- new IndicatingDeleteOnConfirmAjaxLink("deleteLink") {
+ fragment.addOrReplace(new IndicatingDeleteOnConfirmAjaxLink("deleteLink") {
- private static final long serialVersionUID =
- -7978723352517770644L;
+ private static final long serialVersionUID = -7978723352517770644L;
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+
+ link.onClick(target);
+ }
+ });
break;
case EXPORT:
- fragment = new Fragment(
- "panelExport", "fragmentExport", this);
+ fragment = new Fragment("panelExport", "fragmentExport", this);
+
+ fragment.addOrReplace(new IndicatingAjaxLink("exportLink") {
- fragment.addOrReplace(
- new IndicatingAjaxLink("exportLink") {
+ private static final long serialVersionUID = -7978723352517770644L;
- private static final long serialVersionUID =
- -7978723352517770644L;
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
- @Override
- public void onClick(
- final AjaxRequestTarget target) {
-
- link.onClick(target);
- }
- });
+ link.onClick(target);
+ }
+ });
break;
default:
- // do nothink
+ // do nothink
}
if (fragment != null) {
fragment.setEnabled(enabled);
- MetaDataRoleAuthorizationStrategy.authorize(
- fragment, ENABLE, roles);
+ MetaDataRoleAuthorizationStrategy.authorize(fragment, ENABLE, roles);
super.addOrReplace(fragment);
}
}
@@ -273,45 +219,36 @@ public class ActionLinksPanel extends Pa
public void remove(ActionLink.ActionType type) {
switch (type) {
case CLAIM:
- super.addOrReplace(
- new Fragment("panelClaim", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelClaim", "emptyFragment", this));
break;
case CREATE:
- super.addOrReplace(
- new Fragment("panelCreate", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelCreate", "emptyFragment", this));
break;
case EDIT:
- super.addOrReplace(
- new Fragment("panelEdit", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelEdit", "emptyFragment", this));
break;
case TEMPLATE:
- super.addOrReplace(
- new Fragment("panelTemplate", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelTemplate", "emptyFragment", this));
break;
case SEARCH:
- super.addOrReplace(
- new Fragment("panelSearch", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelSearch", "emptyFragment", this));
break;
case EXECUTE:
- super.addOrReplace(
- new Fragment("panelExecute", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelExecute", "emptyFragment", this));
break;
case DRYRUN:
- super.addOrReplace(
- new Fragment("panelDryRun", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelDryRun", "emptyFragment", this));
break;
case DELETE:
- super.addOrReplace(
- new Fragment("panelDelete", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelDelete", "emptyFragment", this));
break;
case EXPORT:
- super.addOrReplace(
- new Fragment("panelExport", "emptyFragment", this));
+ super.addOrReplace(new Fragment("panelExport", "emptyFragment", this));
break;
default:
- // do nothink
+ // do nothink
}
}
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxCheckBoxPanel.java Thu Mar 15 10:17:12 2012
@@ -31,10 +31,7 @@ public class AjaxCheckBoxPanel extends F
private static final long serialVersionUID = 5664138233103884310L;
- public AjaxCheckBoxPanel(
- final String id,
- final String name,
- final IModel<Boolean> model) {
+ public AjaxCheckBoxPanel(final String id, final String name, final IModel<Boolean> model) {
super(id, name, model);
@@ -44,8 +41,7 @@ public class AjaxCheckBoxPanel extends F
if (!isReadOnly()) {
field.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget target) {
@@ -76,8 +72,7 @@ public class AjaxCheckBoxPanel extends F
public Serializable getObject() {
Boolean value = null;
- if (list != null && !list.isEmpty()
- && StringUtils.hasText(list.get(0).toString())) {
+ if (list != null && !list.isEmpty() && StringUtils.hasText(list.get(0).toString())) {
value = "true".equalsIgnoreCase(list.get(0).toString());
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDecoratedCheckbox.java Thu Mar 15 10:17:12 2012
@@ -50,8 +50,7 @@ public abstract class AjaxDecoratedCheck
@Override
protected IAjaxCallDecorator getAjaxCallDecorator() {
- return new CancelEventIfNoAjaxDecorator(
- AjaxDecoratedCheckbox.this.getAjaxCallDecorator());
+ return new CancelEventIfNoAjaxDecorator(AjaxDecoratedCheckbox.this.getAjaxCallDecorator());
}
});
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java Thu Mar 15 10:17:12 2012
@@ -32,10 +32,7 @@ public class AjaxDropDownChoicePanel<T>
private static final long serialVersionUID = -4716376580659196095L;
- public AjaxDropDownChoicePanel(
- final String id,
- final String name,
- final IModel<T> model) {
+ public AjaxDropDownChoicePanel(final String id, final String name, final IModel<T> model) {
super(id, name, model);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -28,11 +28,7 @@ public class AjaxNumberFieldPanel extend
private static final long serialVersionUID = 238940918106696068L;
- public AjaxNumberFieldPanel(
- final String id,
- final String name,
- final IModel<Number> model,
- final Class reference) {
+ public AjaxNumberFieldPanel(final String id, final String name, final IModel<Number> model, final Class reference) {
super(id, name, model);
@@ -43,8 +39,7 @@ public class AjaxNumberFieldPanel extend
if (!isReadOnly()) {
field.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(AjaxRequestTarget art) {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPalettePanel.java Thu Mar 15 10:17:12 2012
@@ -32,29 +32,19 @@ public class AjaxPalettePanel<T> extends
final Palette<T> palette;
- public AjaxPalettePanel(
- final String id,
- final IModel<List<T>> model,
- final ListModel<T> choices) {
+ public AjaxPalettePanel(final String id, final IModel<List<T>> model, final ListModel<T> choices) {
this(id, model, choices, false);
}
- public AjaxPalettePanel(
- final String id,
- final IModel<List<T>> model,
- final ListModel<T> choices,
+ public AjaxPalettePanel(final String id, final IModel<List<T>> model, final ListModel<T> choices,
final boolean allowOrder) {
this(id, model, choices, new SelectChoiceRenderer(), allowOrder);
}
- public AjaxPalettePanel(
- final String id,
- final IModel<List<T>> model,
- final ListModel<T> choices,
- final IChoiceRenderer<T> renderer,
- final boolean allowOrder) {
+ public AjaxPalettePanel(final String id, final IModel<List<T>> model, final ListModel<T> choices,
+ final IChoiceRenderer<T> renderer, final boolean allowOrder) {
super(id, model);
@@ -63,19 +53,10 @@ public class AjaxPalettePanel<T> extends
setOutputMarkupId(true);
}
- private Palette<T> createPalette(
- final IModel<List<T>> model,
- final ListModel<T> choices,
- final IChoiceRenderer<T> renderer,
- final boolean allowOrder) {
+ private Palette<T> createPalette(final IModel<List<T>> model, final ListModel<T> choices,
+ final IChoiceRenderer<T> renderer, final boolean allowOrder) {
- return new Palette(
- "paletteField",
- model,
- choices,
- renderer,
- 8,
- allowOrder);
+ return new Palette("paletteField", model, choices, renderer, 8, allowOrder);
}
@Override
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -28,10 +28,7 @@ public class AjaxPasswordFieldPanel exte
private static final long serialVersionUID = -5490115280336667460L;
- public AjaxPasswordFieldPanel(
- final String id,
- final String name,
- final IModel<String> model) {
+ public AjaxPasswordFieldPanel(final String id, final String name, final IModel<String> model) {
super(id, name, model);
@@ -44,8 +41,7 @@ public class AjaxPasswordFieldPanel exte
if (!isReadOnly()) {
field.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
@Override
protected void onUpdate(final AjaxRequestTarget art) {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -36,10 +36,7 @@ public class AjaxTextFieldPanel extends
private List<String> choices = Collections.EMPTY_LIST;
- public AjaxTextFieldPanel(
- final String id,
- final String name,
- final IModel<String> model) {
+ public AjaxTextFieldPanel(final String id, final String name, final IModel<String> model) {
super(id, name, model);
@@ -49,9 +46,7 @@ public class AjaxTextFieldPanel extends
@Override
protected Iterator<String> getChoices(String input) {
- final Pattern pattern = Pattern.compile(
- Pattern.quote(input) + ".*",
- Pattern.CASE_INSENSITIVE);
+ final Pattern pattern = Pattern.compile(Pattern.quote(input) + ".*", Pattern.CASE_INSENSITIVE);
final List<String> result = new ArrayList<String>();
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -30,8 +30,7 @@ public class CheckBoxMultipleChoiceField
private final CheckBoxMultipleChoice field;
- public CheckBoxMultipleChoiceFieldPanel(final String id, final IModel<Collection> model,
- final IModel<List> choices) {
+ public CheckBoxMultipleChoiceFieldPanel(final String id, final IModel<Collection> model, final IModel<List> choices) {
super(id, model);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/DateTextFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/DateTextFieldPanel.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/DateTextFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/DateTextFieldPanel.java Thu Mar 15 10:17:12 2012
@@ -39,11 +39,7 @@ public class DateTextFieldPanel extends
private final String datePattern;
- public DateTextFieldPanel(
- final String id,
- final String name,
- final IModel<Date> model,
- final String datePattern) {
+ public DateTextFieldPanel(final String id, final String name, final IModel<Date> model, final String datePattern) {
super(id, name, model);
@@ -52,17 +48,15 @@ public class DateTextFieldPanel extends
field = DateTextField.forDatePattern("field", model, datePattern);
if (!isReadOnly()) {
- field.add(
- new AjaxFormComponentUpdatingBehavior("onchange") {
+ field.add(new AjaxFormComponentUpdatingBehavior("onchange") {
- private static final long serialVersionUID =
- -1107858522700306810L;
+ private static final long serialVersionUID = -1107858522700306810L;
- @Override
- protected void onUpdate(AjaxRequestTarget art) {
- // nothing to do
- }
- });
+ @Override
+ protected void onUpdate(AjaxRequestTarget art) {
+ // nothing to do
+ }
+ });
}
field.add(getDatePicker());
@@ -95,8 +89,7 @@ public class DateTextFieldPanel extends
IModel<Date> model = new Model() {
- private static final long serialVersionUID =
- 6799404673615637845L;
+ private static final long serialVersionUID = 6799404673615637845L;
@Override
public Serializable getObject() {
@@ -106,8 +99,7 @@ public class DateTextFieldPanel extends
if (item.getModelObject() instanceof String) {
// Parse string using datePattern
try {
- date = formatter.parse(
- (String) item.getModelObject());
+ date = formatter.parse((String) item.getModelObject());
} catch (ParseException e) {
LOG.error("While parsing date", e);
}
@@ -128,8 +120,7 @@ public class DateTextFieldPanel extends
if (object != null) {
if (item.getModelObject() instanceof String) {
// Parse string using datePattern
- item.setModelObject(
- (String) formatter.format((Date) object));
+ item.setModelObject((String) formatter.format((Date) object));
} else if (item.getModelObject() instanceof Date) {
// Don't parse anything
item.setModelObject((Date) object);
@@ -153,15 +144,13 @@ public class DateTextFieldPanel extends
private static final long serialVersionUID = 527651414610325237L;
- private final DateFormat formatter =
- new SimpleDateFormat(datePattern);
+ private final DateFormat formatter = new SimpleDateFormat(datePattern);
@Override
public Serializable getObject() {
Date date = null;
- if (list != null && !list.isEmpty()
- && StringUtils.hasText(list.get(0).toString())) {
+ if (list != null && !list.isEmpty() && StringUtils.hasText(list.get(0).toString())) {
try {
// Parse string using datePattern
date = formatter.parse(list.get(0).toString());