This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c47c541892 [SYNCOPE-1658] Allow for extensions
c47c541892 is described below
commit c47c541892bb2962c57e1e2c6c071322c09ac23f
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed May 25 10:55:51 2022 +0200
[SYNCOPE-1658] Allow for extensions
---
.../apache/syncope/client/console/pages/Connectors.java | 14 ++++----------
.../apache/syncope/client/console/pages/Resources.java | 14 ++++----------
.../syncope/client/console/panels/ConnidLocations.java | 14 +++++++++++---
.../client/console/panels/ResourceDirectoryPanel.java | 16 ++++++++--------
.../syncope/client/console/topology/TabularTopology.java | 2 +-
5 files changed, 28 insertions(+), 32 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java
index cf906f6fc5..9c8784e851 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Connectors.java
@@ -38,8 +38,6 @@ public class Connectors extends Panel {
private static final long serialVersionUID = 305521359617401936L;
- private final WizardMgtPanel<Serializable> connectorDirectoryPanel;
-
public Connectors(final String id, final PageReference pageRef) {
super(id);
@@ -72,13 +70,9 @@ public class Connectors extends Panel {
form.add(search);
form.setDefaultButton(search);
- connectorDirectoryPanel =
- new ConnectorDirectoryPanel.Builder(pageRef).
- addNewItemPanelBuilder(new ConnectorWizardBuilder(
- new ConnInstanceTO(), pageRef), true).
- build("connectorDirectoryPanel");
- connectorDirectoryPanel.setOutputMarkupId(true);
-
- content.add(connectorDirectoryPanel);
+ WizardMgtPanel<Serializable> connectorDirectoryPanel = new
ConnectorDirectoryPanel.Builder(pageRef).
+ addNewItemPanelBuilder(new ConnectorWizardBuilder(new
ConnInstanceTO(), pageRef), true).
+ build("connectorDirectoryPanel");
+ content.add(connectorDirectoryPanel.setOutputMarkupId(true));
}
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java
index df26dc3f4d..dec7fba7a0 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Resources.java
@@ -38,8 +38,6 @@ public class Resources extends Panel {
private static final long serialVersionUID = 7240865652350993779L;
- private final WizardMgtPanel<Serializable> resourceDirectoryPanel;
-
public Resources(final String id, final PageReference pageRef) {
super(id);
@@ -72,13 +70,9 @@ public class Resources extends Panel {
form.add(search);
form.setDefaultButton(search);
- resourceDirectoryPanel =
- new ResourceDirectoryPanel.Builder(pageRef).
- addNewItemPanelBuilder(new ResourceWizardBuilder(
- new ResourceTO(), pageRef), true).
- build("resourceDirectoryPanel");
- resourceDirectoryPanel.setOutputMarkupId(true);
-
- content.add(resourceDirectoryPanel);
+ WizardMgtPanel<Serializable> resourceDirectoryPanel = new
ResourceDirectoryPanel.Builder(pageRef).
+ addNewItemPanelBuilder(new ResourceWizardBuilder(new
ResourceTO(), pageRef), true).
+ build("resourceDirectoryPanel");
+ content.add(resourceDirectoryPanel.setOutputMarkupId(true));
}
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
index 5ed0e66950..61dc38c2b6 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnidLocations.java
@@ -48,10 +48,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import
org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
public class ConnidLocations extends
DirectoryPanel<Serializable, Serializable,
ConnidLocations.ConnidLocationsDataProvider, RestClient> {
-
+
+ private static final long serialVersionUID = 1L;
+
public ConnidLocations(final String id, final Builder builder) {
super(id, builder);
@@ -78,8 +81,13 @@ public class ConnidLocations extends
columns.add(new AbstractColumn<Serializable, String>(
new ResourceModel(Constants.KEY_FIELD_NAME),
Constants.KEY_FIELD_NAME) {
+
@Override
- public void populateItem(final Item cellItem, final String
componentId, final IModel rowModel) {
+ public void populateItem(
+ final Item<ICellPopulator<Serializable>> cellItem,
+ final String componentId,
+ final IModel<Serializable> rowModel) {
+
cellItem.add(new Label(componentId,
rowModel.getObject().toString()));
}
});
@@ -106,7 +114,7 @@ public class ConnidLocations extends
target.add(modal.setContent(new
ConnectorWizardBuilder(modelObject, pageRef).
build(BaseModal.CONTENT_ID, AjaxWizard.Mode.CREATE)));
- modal.header(new
Model<>(MessageFormat.format(getString("connector.new"), (String) ignore)));
+ modal.header(new
Model<>(MessageFormat.format(getString("connector.new"), ignore)));
modal.show(true);
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
index b52d995271..c05b9d0933 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDirectoryPanel.java
@@ -66,17 +66,17 @@ public class ResourceDirectoryPanel extends
private static final long serialVersionUID = -5223129956783782225L;
- private String keyword;
+ protected String keyword;
- private final ConnectorRestClient connectorRestClient = new
ConnectorRestClient();
+ protected final ConnectorRestClient connectorRestClient = new
ConnectorRestClient();
- private final BaseModal<Serializable> propTaskModal;
+ protected final BaseModal<Serializable> propTaskModal;
- private final BaseModal<Serializable> schedTaskModal;
+ protected final BaseModal<Serializable> schedTaskModal;
- private final BaseModal<Serializable> provisionModal;
+ protected final BaseModal<Serializable> provisionModal;
- private final BaseModal<Serializable> historyModal;
+ protected final BaseModal<Serializable> historyModal;
protected ResourceDirectoryPanel(final String id, final
ResourceDirectoryPanel.Builder builder) {
super(id, builder);
@@ -397,9 +397,9 @@ public class ResourceDirectoryPanel extends
private static final long serialVersionUID = 213974502541311941L;
- private final AjaxRequestTarget target;
+ protected final AjaxRequestTarget target;
- private final String keyword;
+ protected final String keyword;
public ResourceSearchEvent(final AjaxRequestTarget target, final
String keyword) {
this.target = target;
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java
index 9ba82cea31..46f3234814 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TabularTopology.java
@@ -50,7 +50,7 @@ public class TabularTopology extends BasePage {
body.add(content);
}
- private List<ITab> buildTabList() {
+ protected List<ITab> buildTabList() {
final List<ITab> tabs = new ArrayList<>();
tabs.add(new AbstractTab(new Model<>("CustomTasks")) {
