syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject git commit: [SYNCOPE-568] Applying provided patch
Date Fri, 17 Oct 2014 10:02:05 GMT
Repository: syncope
Updated Branches:
  refs/heads/1_1_X 150995852 -> 6bbfc3297


[SYNCOPE-568] Applying provided patch


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6bbfc329
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6bbfc329
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6bbfc329

Branch: refs/heads/1_1_X
Commit: 6bbfc329759404bb2774280acafe6073d4167ed5
Parents: 1509958
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Fri Oct 17 12:01:54 2014 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Oct 17 12:01:54 2014 +0200

----------------------------------------------------------------------
 .../syncope/console/pages/ConnectorModalPage.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/6bbfc329/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
----------------------------------------------------------------------
diff --git a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
index e020c66..aeb0446 100644
--- a/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
+++ b/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
@@ -47,11 +47,9 @@ import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPane
 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.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;
@@ -279,8 +277,8 @@ public class ConnectorModalPage extends BaseModalPage {
                         final Label label = new Label("connPropAttrSchema",
                                 property.getSchema().getDisplayName() == null
                                 || property.getSchema().getDisplayName().isEmpty()
-                                ? property.getSchema().getName()
-                                : property.getSchema().getDisplayName());
+                                        ? property.getSchema().getName()
+                                        : property.getSchema().getDisplayName());
                         item.add(label);
 
                         final FieldPanel field;
@@ -357,17 +355,15 @@ public class ConnectorModalPage extends BaseModalPage {
         connPropView.setOutputMarkupId(true);
         connectorPropForm.add(connPropView);
 
-        final AjaxLink<String> check = new IndicatingAjaxLink<String>("check",
new ResourceModel("check")) {
+        final AjaxButton check = new IndicatingAjaxButton("check", new ResourceModel("check"))
{
 
             private static final long serialVersionUID = -7978723352517770644L;
 
             @Override
-            public void onClick(final AjaxRequestTarget target) {
-                connInstanceTO.setBundleName(bundleTO.getBundleName());
-                connInstanceTO.setVersion(bundleTO.getVersion());
-                connInstanceTO.setConnectorName(bundleTO.getConnectorName());
+            public void onSubmit(final AjaxRequestTarget target, final Form<?> form)
{
+                final ConnInstanceTO conn = (ConnInstanceTO) form.getModelObject();
 
-                if (restClient.check(connInstanceTO)) {
+                if (restClient.check(conn)) {
                     info(getString("success_connection"));
                 } else {
                     error(getString("error_connection"));


Mime
View raw message