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 2016/03/31 17:54:29 UTC
syncope git commit: [SYNCOPE-802] Now using the AjaxPalettePanel for
connector capabilities
Repository: syncope
Updated Branches:
refs/heads/master 3e8912c35 -> ab0551c8d
[SYNCOPE-802] Now using the AjaxPalettePanel for connector capabilities
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ab0551c8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ab0551c8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ab0551c8
Branch: refs/heads/master
Commit: ab0551c8d12ba7736bab0020226f9e7cce67c1ab
Parents: 3e8912c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 31 17:54:23 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 31 17:54:23 2016 +0200
----------------------------------------------------------------------
.../panels/ConnectorCapabilitiesPanel.java | 31 ++++-------
.../client/console/panels/ConnectorModal.java | 12 ++---
.../markup/html/form/AjaxPalettePanel.java | 6 +--
.../form/CheckBoxMultipleChoiceFieldPanel.java | 57 --------------------
.../panels/ConnectorCapabilitiesPanel.html | 11 ++--
.../form/CheckBoxMultipleChoiceFieldPanel.html | 35 ------------
6 files changed, 23 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.java
index fbb8059..ffcf163 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.java
@@ -20,39 +20,30 @@ package org.apache.syncope.client.console.panels;
import java.util.Arrays;
import java.util.List;
-import org.apache.syncope.client.console.wicket.markup.html.form.CheckBoxMultipleChoiceFieldPanel;
+import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.types.ConnectorCapability;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.util.ListModel;
-/**
- * Modal window with Connector form.
- */
public class ConnectorCapabilitiesPanel extends Panel {
private static final long serialVersionUID = -2025535531121434050L;
public ConnectorCapabilitiesPanel(final String id, final IModel<ConnInstanceTO> model) {
-
super(id, model);
setOutputMarkupId(true);
- final IModel<List<ConnectorCapability>> all = new LoadableDetachableModel<List<ConnectorCapability>>() {
-
- private static final long serialVersionUID = 5275935387613157437L;
-
- @Override
- protected List<ConnectorCapability> load() {
- return Arrays.asList(ConnectorCapability.values());
- }
- };
-
- add(new CheckBoxMultipleChoiceFieldPanel<>(
- "capabilitiesPalette",
- new PropertyModel<List<ConnectorCapability>>(model.getObject(), "capabilities"),
- all));
+ AjaxPalettePanel<ConnectorCapability> capabilitiesPalette =
+ new AjaxPalettePanel.Builder<ConnectorCapability>().
+ setAllowMoveAll(true).
+ build("capabilitiesPalette",
+ new PropertyModel<List<ConnectorCapability>>(model.getObject(), "capabilities"),
+ new ListModel<>(Arrays.asList(ConnectorCapability.values())));
+ capabilitiesPalette.hideLabel();
+ capabilitiesPalette.setOutputMarkupId(true);
+ add(capabilitiesPalette);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java
index 33b04bc..f47d9bb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnectorModal.java
@@ -70,9 +70,9 @@ public class ConnectorModal extends AbstractResourceModal<Serializable> {
}, new ArrayList<ConnBundleTO>());
//--------------------------------
- // Connector details panel
+ // Connector details
//--------------------------------
- tabs.add(new AbstractTab(new ResourceModel("general", "general")) {
+ tabs.add(new AbstractTab(new ResourceModel("general")) {
private static final long serialVersionUID = -5861786415855103549L;
@@ -84,9 +84,9 @@ public class ConnectorModal extends AbstractResourceModal<Serializable> {
//--------------------------------
//--------------------------------
- // Connector configuration panel
+ // Connector configuration
//--------------------------------
- tabs.add(new AbstractTab(new ResourceModel("configuration", "configuration")) {
+ tabs.add(new AbstractTab(new ResourceModel("configuration")) {
private static final long serialVersionUID = -5861786415855103549L;
@@ -112,9 +112,9 @@ public class ConnectorModal extends AbstractResourceModal<Serializable> {
//--------------------------------
//--------------------------------
- // Connector configuration panel
+ // Connector capabilities
//--------------------------------
- tabs.add(new AbstractTab(new ResourceModel("capabilities", "capabilities")) {
+ tabs.add(new AbstractTab(new ResourceModel("capabilities")) {
private static final long serialVersionUID = -5861786415855103549L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
index ebbb191..d84397d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
@@ -62,7 +62,7 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
choicesModel = new PaletteLoadableDetachableModel(builder) {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -108100712154481840L;
@Override
protected List<T> getChoices() {
@@ -86,7 +86,7 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
? getFilteredList(choices.getObject(), getFilter().replaceAll("\\*", "\\.\\*"))
: choices.getObject();
}
- };
+ };
initialize(model, builder);
}
@@ -209,7 +209,7 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
private String availableLabel;
private boolean filtered;
-
+
private final AjaxPaletteConf conf = new AjaxPaletteConf();
private String filter = conf.getDefaultFilter();
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java
deleted file mode 100644
index 9d0afea..0000000
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.wicket.markup.html.form;
-
-import java.util.List;
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.form.AbstractChoice;
-
-import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
-import org.apache.wicket.model.IModel;
-
-public class CheckBoxMultipleChoiceFieldPanel<E> extends AbstractFieldPanel<List<E>> {
-
- private static final long serialVersionUID = 4124935025837737298L;
-
- private final CheckBoxMultipleChoice<E> field;
-
- public CheckBoxMultipleChoiceFieldPanel(
- final String id, final IModel<List<E>> model, final IModel<List<E>> choices) {
-
- super(id, id, model);
-
- field = new CheckBoxMultipleChoice<E>("checkBoxMultipleChoice", model, choices);
- add(field.
- setPrefix("<div class=\"checkbox\">").
- setSuffix("</div>").
- setLabelPosition(AbstractChoice.LabelPosition.WRAP_AFTER));
- }
-
- @Override
- public AbstractFieldPanel<List<E>> setModelObject(final List<E> object) {
- field.setModelObject(object);
- return this;
- }
-
- @Override
- public Component add(final Behavior... behaviors) {
- return field.add(behaviors);
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html
index b5aa95d..ed50fa5 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html
@@ -17,12 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head>
- <title>Connector capabilities panel</title>
- </head>
- <body>
- <wicket:panel>
- <span wicket:id="capabilitiesPalette"/>
- </wicket:panel>
- </body>
+ <wicket:panel>
+ <span wicket:id="capabilitiesPalette"/>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/ab0551c8/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html
deleted file mode 100644
index 6053d17..0000000
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head>
- <title>Checkbox multi-choice field panel</title>
- </head>
- <body>
- <wicket:extend>
- <wicket:enclosure child="field-label">
- <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/>
- <span wicket:id="externalAction"/>
- </wicket:enclosure>
- <div class="form-group">
- <span wicket:id="checkBoxMultipleChoice" />
- </div>
- </wicket:extend>
- </body>
-</html>
-