Author: ilgrosso
Date: Mon Feb 18 10:09:49 2013
New Revision: 1447180
URL: http://svn.apache.org/r1447180
Log:
[SYNCOPE-315] Fixing ajax warning during connector check
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1447180&r1=1447179&r2=1447180&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
Mon Feb 18 10:09:49 2013
@@ -29,8 +29,6 @@ import org.apache.syncope.client.to.Conn
import org.apache.syncope.client.to.ConnInstanceTO;
import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.console.rest.ConnectorRestClient;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxButton;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
@@ -47,6 +45,8 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -314,12 +314,12 @@ public class ConnectorModalPage extends
connectorForm.add(propertiesContainer);
connectorPropForm.add(view);
- final AjaxLink check = new ClearIndicatingAjaxLink("check", new
ResourceModel("check"), pageRef) {
+ final AjaxLink check = new IndicatingAjaxLink("check", new
ResourceModel("check")) {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- protected void onClickInternal(final AjaxRequestTarget target) {
+ public void onClick(final AjaxRequestTarget target) {
connectorTO.setBundleName(bundleTO.getBundleName());
connectorTO.setVersion(bundleTO.getVersion());
@@ -335,12 +335,12 @@ public class ConnectorModalPage extends
connectorPropForm.add(check);
- final AjaxButton submit = new ClearIndicatingAjaxButton("apply", new
Model(getString("submit")), pageRef) {
+ final AjaxButton submit = new IndicatingAjaxButton("apply", new
Model(getString("submit"))) {
private static final long serialVersionUID = -958724007591692537L;
@Override
- protected void onSubmitInternal(final AjaxRequestTarget target,
final Form form) {
+ protected void onSubmit(final AjaxRequestTarget target, final Form
form) {
final ConnInstanceTO conn = (ConnInstanceTO)
form.getDefaultModelObject();
conn.setBundleName(bundleTO.getBundleName());
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1447180&r1=1447179&r2=1447180&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Mon Feb 18 10:09:49 2013
@@ -80,7 +80,7 @@ public class ResourceModalPage extends B
//--------------------------------
// Resource mapping panle
//--------------------------------
- form.add(new ResourceConnConfPanel("connconf", resourceTO, createFlag,
pageref));
+ form.add(new ResourceConnConfPanel("connconf", resourceTO,
createFlag));
//--------------------------------
//--------------------------------
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1447180&r1=1447179&r2=1447180&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java
Mon Feb 18 10:09:49 2013
@@ -27,7 +27,6 @@ import org.apache.syncope.console.pages.
import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent;
import
org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent;
import org.apache.syncope.console.rest.ConnectorRestClient;
-import
org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel;
import
org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
@@ -36,12 +35,12 @@ import org.apache.syncope.console.wicket
import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel;
import
org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent;
import org.apache.syncope.types.ConnConfProperty;
-import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -94,8 +93,7 @@ public class ResourceConnConfPanel exten
private ResourceTO resourceTO;
- public ResourceConnConfPanel(final String id, final ResourceTO resourceTO,
final boolean createFlag,
- final PageReference pageRef) {
+ public ResourceConnConfPanel(final String id, final ResourceTO resourceTO,
final boolean createFlag) {
super(id);
setOutputMarkupId(true);
@@ -109,12 +107,12 @@ public class ResourceConnConfPanel exten
connConfPropContainer.setOutputMarkupId(true);
add(connConfPropContainer);
- check = new ClearIndicatingAjaxLink("check", new
ResourceModel("check"), pageRef) {
+ check = new IndicatingAjaxLink("check", new ResourceModel("check")) {
private static final long serialVersionUID = -4199438518229098169L;
@Override
- protected void onClickInternal(final AjaxRequestTarget target) {
+ public void onClick(final AjaxRequestTarget target) {
if (connRestClient.check(resourceTO)) {
info(getString("success_connection"));
} else {
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1447180&r1=1447179&r2=1447180&view=diff
==============================================================================
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
Mon Feb 18 10:09:49 2013
@@ -138,11 +138,11 @@ public class ResourceMappingPanel extend
/**
* Attribute Mapping Panel.
*
- * @param panelid panel id.
- * @param resourceTO external resource.
+ * @param panelid panel id
+ * @param resourceTO external resource
+ * @param pageRef caller page reference
*/
public ResourceMappingPanel(final String panelid, final ResourceTO
resourceTO, final PageReference pageRef) {
-
super(panelid);
setOutputMarkupId(true);
