You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2016/06/17 16:58:34 UTC
[1/2] syncope git commit: [SYNCOPE-865] provides one notification
panel per page
Repository: syncope
Updated Branches:
refs/heads/master 9df34b024 -> 636a13638
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index f8e3354..52ea88d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -32,6 +32,7 @@ import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
import org.apache.syncope.client.console.notifications.TemplateContentModal;
import org.apache.syncope.client.console.notifications.TemplateModal;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -72,7 +73,7 @@ public class ReportTemplateDirectoryPanel
modal.size(Modal.Size.Small);
modal.addSubmitButton();
setFooterVisibility(true);
-
+
modal.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
private static final long serialVersionUID = 8804221891699487139L;
@@ -199,7 +200,7 @@ public class ReportTemplateDirectoryPanel
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.MAIL_TEMPLATE_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index e9d738d..f00463c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -36,6 +36,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.search.SearchClause;
@@ -177,10 +178,10 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
customActionOnCloseCallback(target);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", reportlet.getName(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.REPORT_UPDATE).build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
index 63f67b2..44e4dd7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
@@ -28,6 +28,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
@@ -138,10 +139,10 @@ public abstract class ExecutionsDirectoryPanel
restClient.deleteExecution(taskExecutionTO.getKey());
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientException scce) {
- SyncopeConsoleSession.get().error(scce.getMessage());
+ SyncopeConsoleSession.get().error(scce.getMessage());
}
target.add(ExecutionsDirectoryPanel.this);
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.TASK_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index aef3ba2..1bc48a2 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.TaskDataProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -127,11 +128,11 @@ public abstract class NotificationTaskDirectoryPanel
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
target.add(container);
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
LOG.error("While running {}", taskTO.getKey(), e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.EXECUTE, StandardEntitlement.TASK_EXECUTE).
add(new ActionLink<NotificationTaskTO>() {
@@ -147,10 +148,10 @@ public abstract class NotificationTaskDirectoryPanel
target.add(container);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", taskTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.TASK_DELETE).build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index cb6ed3f..5ef0dba 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.TaskDataProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -128,11 +129,11 @@ public abstract class PropagationTaskDirectoryPanel
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
target.add(container);
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
LOG.error("While running {}", taskTO.getKey(), e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.EXECUTE, StandardEntitlement.TASK_EXECUTE).
add(new ActionLink<PropagationTaskTO>() {
@@ -147,10 +148,10 @@ public abstract class PropagationTaskDirectoryPanel
target.add(container);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", taskTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.TASK_DELETE).build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index 19d6f6e..4d57831 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.TaskDataProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.rest.TaskRestClient;
@@ -73,8 +74,8 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
private static final long serialVersionUID = 4984337552918213290L;
- private static final String GROUP_MEMBER_PROVISION_TASKJOB =
- "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
+ private static final String GROUP_MEMBER_PROVISION_TASKJOB
+ = "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
protected final Class<T> reference;
@@ -107,7 +108,7 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
initResultTable();
- startAt = new TaskStartAtTogglePanel(container);
+ startAt = new TaskStartAtTogglePanel(container, pageRef);
addInnerObject(startAt);
templates = new TemplatesTogglePanel(getActualId(), this, pageRef) {
@@ -250,11 +251,11 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
target.add(container);
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
LOG.error("While deleting propagation task {}", taskTO.getKey(), e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.TASK_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java
index b90b5af..ff71ade 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java
@@ -21,9 +21,11 @@ package org.apache.syncope.client.console.tasks;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.StartAtTogglePanel;
import org.apache.syncope.client.console.rest.TaskRestClient;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -33,8 +35,8 @@ public class TaskStartAtTogglePanel extends StartAtTogglePanel {
private static final long serialVersionUID = -3195479265440591519L;
- public TaskStartAtTogglePanel(final WebMarkupContainer container) {
- super(container);
+ public TaskStartAtTogglePanel(final WebMarkupContainer container, final PageReference pageRef) {
+ super(container, pageRef);
form.add(new AjaxSubmitLink("dryRun", form) {
@@ -53,12 +55,12 @@ public class TaskStartAtTogglePanel extends StartAtTogglePanel {
: e.getMessage());
LOG.error("While running task {}", key, e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java
index bccb69e..32c171e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java
@@ -28,6 +28,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.layout.AnyObjectFormLayoutInfo;
import org.apache.syncope.client.console.layout.GroupFormLayoutInfo;
import org.apache.syncope.client.console.layout.UserFormLayoutInfo;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.TogglePanel;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
@@ -80,8 +81,7 @@ public abstract class TemplatesTogglePanel extends TogglePanel<Serializable> {
};
public TemplatesTogglePanel(final String targetId, final MarkupContainer container, final PageReference pageRef) {
- super("toggleTemplates");
- this.pageRef = pageRef;
+ super("toggleTemplates", pageRef);
form = new Form<>("templatesForm");
addInnerObject(form);
@@ -172,12 +172,12 @@ public abstract class TemplatesTogglePanel extends TogglePanel<Serializable> {
: e.getMessage());
LOG.error("While editing template for {}", typeModel.getObject(), e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index 9177301..d1ef0d2 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
@@ -24,6 +24,7 @@ import java.text.MessageFormat;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.ConnObjects;
import org.apache.syncope.client.console.wizards.resources.ConnectorWizardBuilder;
import org.apache.syncope.client.console.wizards.resources.ResourceWizardBuilder;
@@ -73,8 +74,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
protected final BaseModal<Serializable> provisionModal;
public TopologyTogglePanel(final String id, final PageReference pageRef) {
- super(id);
- this.pageRef = pageRef;
+ super(id, pageRef);
modal.size(Modal.Size.Large);
setFooterVisibility(false);
@@ -158,7 +158,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
SyncopeConsoleSession.get().error(
StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
fragment.add(reload);
@@ -232,7 +232,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
MetaDataRoleAuthorizationStrategy.authorize(delete, ENABLE, StandardEntitlement.CONNECTOR_DELETE);
@@ -312,7 +312,7 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
MetaDataRoleAuthorizationStrategy.authorize(delete, ENABLE, StandardEntitlement.RESOURCE_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index f77e940..b59e14c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.wicket.markup.html.form;
import java.util.List;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.ajax.markup.html.IndicatorAjaxSubmitLink;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.Broadcast;
@@ -109,9 +110,9 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List<
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR));
+ SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR));
super.onError(target, form);
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
index 670c587..bdaf0dd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.ajax.markup.html.IndicatorAjaxLink;
import org.apache.syncope.common.lib.to.JobTO;
import org.apache.syncope.common.lib.types.JobAction;
@@ -80,7 +81,7 @@ public class JobActionPanel extends Panel {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName()
: e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
});
} else {
@@ -117,7 +118,7 @@ public class JobActionPanel extends Panel {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName()
: e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
index 3fec490..27ec099 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ReconciliationWidget.java
@@ -41,6 +41,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.rest.BaseRestClient;
import org.apache.syncope.client.console.rest.ReportRestClient;
@@ -160,7 +161,7 @@ public class ReconciliationWidget extends BaseWidget {
LOG.error("While starting reconciliation report", e);
SyncopeConsoleSession.get().error("Could not start reconciliation report");
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
MetaDataRoleAuthorizationStrategy.authorize(refresh, Component.RENDER, StandardEntitlement.REPORT_EXECUTE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
index b0fddce..5669599 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.Broadcast;
@@ -40,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.syncope.client.console.panels.SubmitableModalPanel;
import org.apache.syncope.client.console.panels.WizardModalPanel;
+import org.apache.wicket.PageReference;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
@@ -67,6 +69,8 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
private IEventSink eventSink = null;
+ private final PageReference pageRef;
+
/**
* Construct.
*
@@ -74,11 +78,18 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
* @param item model object.
* @param model wizard model
* @param mode <tt>true</tt> if edit mode.
+ * @param pageRef caller page reference.
*/
- public AjaxWizard(final String id, final T item, final WizardModel model, final Mode mode) {
+ public AjaxWizard(
+ final String id,
+ final T item,
+ final WizardModel model,
+ final Mode mode,
+ final PageReference pageRef) {
super(id);
this.item = item;
this.mode = mode;
+ this.pageRef = pageRef;
if (mode == Mode.READONLY) {
model.setCancelVisible(false);
@@ -157,7 +168,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
LOG.warn("Wizard error on cancel", e);
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
@@ -178,7 +189,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
LOG.error("Wizard error on finish", e);
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
@@ -331,6 +342,6 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
@Override
public void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
index de4a4e1..82aa7ab 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardBuilder.java
@@ -90,7 +90,7 @@ public abstract class AjaxWizardBuilder<T extends Serializable> extends Abstract
// ge the specified item if available
final T modelObject = newModelObject();
- return new AjaxWizard<T>(id, modelObject, buildModelSteps(modelObject, new WizardModel()), mode) {
+ return new AjaxWizard<T>(id, modelObject, buildModelSteps(modelObject, new WizardModel()), mode, this.pageRef) {
private static final long serialVersionUID = 7770507663760640735L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java
index 2b70466..152f204 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizardMgtButtonBar.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.wizards;
import java.io.Serializable;
-import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -88,7 +88,7 @@ public class AjaxWizardMgtButtonBar<T extends Serializable> extends WizardButton
protected void onError(final AjaxRequestTarget target) {
target.add(findParent(Wizard.class));
button.onError();
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
index c6a5f01..86d0e38 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/WizardMgtPanel.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.NotificationPanel;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wizards.any.ResultPage;
@@ -212,7 +213,7 @@ public abstract class WizardMgtPanel<T extends Serializable> extends Panel imple
}
} else if (event.getPayload() instanceof AjaxWizard.NewItemFinishEvent) {
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
if (wizardInModal && showResultPage) {
modal.setContent(new ResultPage<T>(
@@ -322,7 +323,7 @@ public abstract class WizardMgtPanel<T extends Serializable> extends Panel imple
}
protected WizardMgtPanel<T> addNotificationPanel(final NotificationPanel notificationPanel) {
- this.notificationPanel = SyncopeConsoleSession.get().getNotificationPanel();
+ this.notificationPanel = ((BasePage) pageRef.getPage()).getNotificationPanel();
return this;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java
index 4ec59f2..215c275 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.markup.html.list.ConnConfPropertyListView;
import org.apache.syncope.common.lib.AbstractBaseBean;
import org.apache.syncope.common.lib.types.ConnConfProperty;
@@ -63,9 +64,9 @@ public abstract class AbstractConnConfPanel<T extends AbstractBaseBean> extends
if (result.getLeft()) {
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} else {
- SyncopeConsoleSession.get().error(getString("error_connection") + ": " + result.getRight());
+ SyncopeConsoleSession.get().error(getString("error_connection") + ": " + result.getRight());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
};
propertiesContainer.add(check);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java
index d777af5..759b708 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.panels.TogglePanel;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
import org.apache.syncope.common.lib.to.MappingItemTO;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -38,8 +39,8 @@ public class JEXLTransformersTogglePanel extends TogglePanel<Serializable> {
private final AjaxTextFieldPanel pullJEXLTransformer;
- public JEXLTransformersTogglePanel(final WebMarkupContainer container) {
- super("outer", "jexlTransformersTogglePanel");
+ public JEXLTransformersTogglePanel(final WebMarkupContainer container, final PageReference pageRef) {
+ super("outer", "jexlTransformersTogglePanel", pageRef);
Form<?> form = new Form<>("form");
addInnerObject(form);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/MappingItemTransformersTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/MappingItemTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/MappingItemTransformersTogglePanel.java
index 4889c2b..3298d20 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/MappingItemTransformersTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/MappingItemTransformersTogglePanel.java
@@ -27,6 +27,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.panels.TogglePanel;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.common.lib.to.MappingItemTO;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -42,8 +43,8 @@ public class MappingItemTransformersTogglePanel extends TogglePanel<Serializable
private MappingItemTO mapItem;
- public MappingItemTransformersTogglePanel(final WebMarkupContainer container) {
- super("outer", "mappingItemTransformersTogglePanel");
+ public MappingItemTransformersTogglePanel(final WebMarkupContainer container, final PageReference pageRef) {
+ super("outer", "mappingItemTransformersTogglePanel", pageRef);
final LoadableDetachableModel<List<String>> model = new LoadableDetachableModel<List<String>>() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
index e342659..2fbde76 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ProvisionWizardBuilder.java
@@ -241,9 +241,10 @@ public class ProvisionWizardBuilder extends AjaxWizardBuilder<ProvisionTO> imple
Mapping mapping = new Mapping(modelObject);
mapping.setOutputMarkupId(true);
- MappingItemTransformersTogglePanel mapItemTransformers = new MappingItemTransformersTogglePanel(mapping);
+ MappingItemTransformersTogglePanel mapItemTransformers
+ = new MappingItemTransformersTogglePanel(mapping, pageRef);
addOuterObject(mapItemTransformers);
- JEXLTransformersTogglePanel jexlTransformers = new JEXLTransformersTogglePanel(mapping);
+ JEXLTransformersTogglePanel jexlTransformers = new JEXLTransformersTogglePanel(mapping, pageRef);
addOuterObject(jexlTransformers);
mapping.add(new ResourceMappingPanel(
"mapping", resourceTO, modelObject, mapItemTransformers, jexlTransformers));
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
index 22e5e58..873f728 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
@@ -29,6 +29,7 @@ import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.panels.ListViewPanel;
import org.apache.syncope.client.console.panels.ListViewPanel.ListViewReload;
@@ -122,7 +123,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.SET_LATEST_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
addAction(new ActionLink<ProvisionTO>() {
@@ -141,7 +142,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.REMOVE_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
addAction(new ActionLink<ProvisionTO>() {
@@ -218,6 +219,6 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
index 8568b1a..c4a33f9 100644
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
@@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.pages.CamelRoutes;
import org.apache.syncope.client.console.panels.CamelRoutesDirectoryPanel.CamelRoutesProvider;
import org.apache.syncope.client.console.rest.CamelRoutesRestClient;
@@ -96,7 +96,7 @@ public class CamelRoutesDirectoryPanel extends DirectoryPanel<
LOG.error("While creating or updating CamelRouteTO", e);
error(getString(Constants.ERROR) + ": " + e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
}
[2/2] syncope git commit: [SYNCOPE-865] provides one notification
panel per page
Posted by fm...@apache.org.
[SYNCOPE-865] provides one notification panel per page
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/636a1363
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/636a1363
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/636a1363
Branch: refs/heads/master
Commit: 636a136389d8a9334fdbbbddba1e0ef83426f99d
Parents: 9df34b0
Author: fmartelli <fa...@gmail.com>
Authored: Fri Jun 17 18:58:14 2016 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Fri Jun 17 18:58:14 2016 +0200
----------------------------------------------------------------------
.../client/console/SyncopeConsoleSession.java | 9 ---------
.../approvals/ApprovalDirectoryPanel.java | 5 +++--
.../client/console/approvals/ApprovalModal.java | 10 +++++++---
.../syncope/client/console/bulk/BulkContent.java | 3 ++-
.../console/layout/ConsoleLayoutInfoModal.java | 3 ++-
.../MailTemplateDirectoryPanel.java | 3 ++-
.../NotificationDirectoryPanel.java | 3 ++-
.../notifications/TemplateContentModal.java | 3 ++-
.../console/notifications/TemplateModal.java | 3 ++-
.../syncope/client/console/pages/BasePage.java | 13 +++++++++----
.../syncope/client/console/pages/Realms.java | 4 ++--
.../client/console/panels/AbstractLogsPanel.java | 3 ++-
.../console/panels/AbstractModalPanel.java | 6 +++---
.../console/panels/AjaxDataTablePanel.java | 4 ++--
.../console/panels/AnyObjectDirectoryPanel.java | 3 ++-
.../console/panels/AnyTypeClassesPanel.java | 5 +++--
.../client/console/panels/AnyTypesPanel.java | 5 +++--
.../client/console/panels/DirectoryPanel.java | 1 +
.../panels/DisplayAttributesModalPanel.java | 5 +++--
.../console/panels/GroupDirectoryPanel.java | 7 ++++---
.../console/panels/MembersTogglePanel.java | 8 ++++----
.../console/panels/ParametersEditModalPanel.java | 3 ++-
.../client/console/panels/ParametersPanel.java | 3 ++-
.../client/console/panels/RealmModalPanel.java | 3 ++-
.../console/panels/RelationshipTypesPanel.java | 5 +++--
.../console/panels/RoleDirectoryPanel.java | 3 ++-
.../client/console/panels/SchemaTypePanel.java | 5 +++--
.../panels/SecurityQuestionsModalPanel.java | 3 ++-
.../console/panels/SecurityQuestionsPanel.java | 3 ++-
.../console/panels/StartAtTogglePanel.java | 10 ++++++----
.../client/console/panels/TogglePanel.java | 8 +++++---
.../panels/TypeExtensionDirectoryPanel.java | 9 +++++----
.../console/panels/UserDirectoryPanel.java | 5 +++--
.../console/panels/WorkflowTogglePanel.java | 6 +++---
.../panels/XMLWorkflowEditorModalPanel.java | 3 ++-
.../console/policies/PolicyDirectoryPanel.java | 5 +++--
.../policies/PolicyModalPanelBuilder.java | 3 ++-
.../policies/PolicyRuleDirectoryPanel.java | 5 +++--
.../policies/PolicyRuleWizardBuilder.java | 3 +--
.../console/policies/PolicySpecModalPanel.java | 3 ++-
.../console/reports/ReportDirectoryPanel.java | 7 ++++---
.../reports/ReportStartAtTogglePanel.java | 5 +++--
.../reports/ReportTemplateDirectoryPanel.java | 5 +++--
.../console/reports/ReportletDirectoryPanel.java | 5 +++--
.../console/tasks/ExecutionsDirectoryPanel.java | 5 +++--
.../tasks/NotificationTaskDirectoryPanel.java | 9 +++++----
.../tasks/PropagationTaskDirectoryPanel.java | 9 +++++----
.../console/tasks/SchedTaskDirectoryPanel.java | 11 ++++++-----
.../console/tasks/TaskStartAtTogglePanel.java | 10 ++++++----
.../console/tasks/TemplatesTogglePanel.java | 8 ++++----
.../console/topology/TopologyTogglePanel.java | 10 +++++-----
.../markup/html/form/AbstractMultiPanel.java | 5 +++--
.../client/console/widgets/JobActionPanel.java | 5 +++--
.../console/widgets/ReconciliationWidget.java | 3 ++-
.../client/console/wizards/AjaxWizard.java | 19 +++++++++++++++----
.../console/wizards/AjaxWizardBuilder.java | 2 +-
.../console/wizards/AjaxWizardMgtButtonBar.java | 4 ++--
.../client/console/wizards/WizardMgtPanel.java | 5 +++--
.../wizards/resources/AbstractConnConfPanel.java | 5 +++--
.../resources/JEXLTransformersTogglePanel.java | 5 +++--
.../MappingItemTransformersTogglePanel.java | 5 +++--
.../resources/ProvisionWizardBuilder.java | 5 +++--
.../resources/ResourceProvisionPanel.java | 7 ++++---
.../panels/CamelRoutesDirectoryPanel.java | 4 ++--
64 files changed, 207 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index 95ff320..f92f836 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -37,7 +37,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.panels.NotificationPanel;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
@@ -252,14 +251,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
return FastDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale);
}
- public NotificationPanel getNotificationPanel() {
- if (notificationPanel == null) {
- notificationPanel = new NotificationPanel(Constants.FEEDBACK);
- notificationPanel.setOutputMarkupId(true);
- }
- return notificationPanel;
- }
-
public boolean isCheckReconciliationJob() {
return checkReconciliationJob;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
index b5987fe..97f56a4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.rest.UserWorkflowRestClient;
import org.apache.syncope.client.console.approvals.ApprovalDirectoryPanel.ApprovalProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
@@ -104,9 +105,9 @@ public class ApprovalDirectoryPanel
restClient.claimForm(model.getObject().getTaskId());
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientException scee) {
- SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + scee.getMessage());
+ SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + scee.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
target.add(container);
}
}, ActionLink.ActionType.CLAIM, StandardEntitlement.WORKFLOW_FORM_CLAIM);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java
index d2b4d65..c42203a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.approvals;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.rest.UserWorkflowRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -40,10 +41,13 @@ public class ApprovalModal extends Panel implements SubmitableModalPanel, Wizard
private final WorkflowFormTO formTO;
+ private final PageReference pageRef;
+
public ApprovalModal(final BaseModal<?> modal, final PageReference pageRef, final WorkflowFormTO formTO) {
super(BaseModal.CONTENT_ID);
this.modal = modal;
this.formTO = formTO;
+ this.pageRef = pageRef;
final MultilevelPanel mlp = new MultilevelPanel("approval");
add(mlp);
@@ -69,14 +73,14 @@ public class ApprovalModal extends Panel implements SubmitableModalPanel, Wizard
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
+ SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
public void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
index 23346cd..11891e5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java
@@ -29,6 +29,7 @@ import java.util.Map;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.status.StatusBean;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.rest.AbstractAnyRestClient;
import org.apache.syncope.client.console.rest.RestClient;
@@ -222,7 +223,7 @@ public class BulkContent<T extends Serializable, S> extends MultilevelPanel.Seco
SyncopeConsoleSession.get().error("Operation " + actionToBeAddresed.getActionId()
+ " not supported");
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
}, action, StandardEntitlement.CONFIGURATION_LIST, !items.isEmpty());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/layout/ConsoleLayoutInfoModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/layout/ConsoleLayoutInfoModal.java b/client/console/src/main/java/org/apache/syncope/client/console/layout/ConsoleLayoutInfoModal.java
index fdc8e46..4436dd9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/layout/ConsoleLayoutInfoModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/layout/ConsoleLayoutInfoModal.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.RoleRestClient;
@@ -85,7 +86,7 @@ public class ConsoleLayoutInfoModal extends AbstractModalPanel<Serializable> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
public static class ConsoleLayoutInfo implements Serializable {
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index 218ff3b..9760c93 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
import org.apache.syncope.client.console.notifications.MailTemplateDirectoryPanel.MailTemplateProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.rest.NotificationRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -177,7 +178,7 @@ public class MailTemplateDirectoryPanel
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.MAIL_TEMPLATE_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
index 0bcee83..2eddbdb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
import org.apache.syncope.client.console.notifications.NotificationDirectoryPanel.NotificationProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.rest.NotificationRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -150,7 +151,7 @@ public class NotificationDirectoryPanel
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.NOTIFICATION_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateContentModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateContentModal.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateContentModal.java
index 62eabf7..f462388 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateContentModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateContentModal.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.rest.TemplateRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -88,7 +89,7 @@ public class TemplateContentModal<T extends EntityTO, F> extends AbstractModalPa
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
public static class TemplateContent<F> implements Serializable {
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
index 7b164e8..57bb761 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.notifications;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.rest.TemplateRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -71,6 +72,6 @@ public class TemplateModal<T extends EntityTO, F> extends AbstractModalPanel<T>
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index 6b06aea..8bff8cb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -119,7 +119,8 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
}
add(body);
- body.addOrReplace(SyncopeConsoleSession.get().getNotificationPanel());
+ notificationPanel = new NotificationPanel(Constants.FEEDBACK);
+ body.addOrReplace(notificationPanel.setOutputMarkupId(true));
// header, footer
body.add(new Label("version", SyncopeConsoleApplication.get().getVersion()));
@@ -155,7 +156,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
getRequestCycle().scheduleRequestHandlerAfterCurrent(rsrh);
} catch (Exception e) {
- SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
+ SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
}
}
};
@@ -304,8 +305,8 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
}
// Extensions
- ClassPathScanImplementationLookup classPathScanImplementationLookup =
- (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
+ ClassPathScanImplementationLookup classPathScanImplementationLookup
+ = (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
getServletContext().getAttribute(ConsoleInitializer.CLASSPATH_LOOKUP);
List<Class<? extends BaseExtPage>> extPageClasses = classPathScanImplementationLookup.getExtPageClasses();
@@ -394,6 +395,10 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
return "veil";
}
+ public NotificationPanel getNotificationPanel() {
+ return notificationPanel;
+ }
+
/**
* Set a WindowClosedCallback for a Modal instance.
*
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
index f73839f..780a06f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java
@@ -165,7 +165,7 @@ public class Realms extends BasePage {
templateModal.close(newItemEvent.getTarget());
} else if (event.getPayload() instanceof AjaxWizard.NewItemFinishEvent) {
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- SyncopeConsoleSession.get().getNotificationPanel().refresh(newItemEvent.getTarget());
+ ((BasePage) getPage()).getNotificationPanel().refresh(newItemEvent.getTarget());
templateModal.close(newItemEvent.getTarget());
}
}
@@ -242,7 +242,7 @@ public class Realms extends BasePage {
// Escape line breaks
SyncopeConsoleSession.get().error(e.getMessage().replace("\n", " "));
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
});
return content;
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractLogsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractLogsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractLogsPanel.java
index 233b493..272b655 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractLogsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractLogsPanel.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.common.lib.AbstractBaseBean;
@@ -83,7 +84,7 @@ public abstract class AbstractLogsPanel<T extends AbstractBaseBean> extends Pane
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
});
return loggerTOs;
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java
index fe84533..415751f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java
@@ -19,7 +19,7 @@
package org.apache.syncope.client.console.panels;
import java.io.Serializable;
-import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.markup.head.MetaHeaderItem;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.wicket.PageReference;
@@ -67,12 +67,12 @@ public class AbstractModalPanel<T extends Serializable> extends Panel
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
public void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java
index e06090a..d540316 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.rest.BaseRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormChoiceComponentUpdatingBehavior;
import org.apache.syncope.client.console.bulk.BulkActionModal;
import org.apache.syncope.client.console.bulk.BulkContent;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel.EventDataWrapper;
import org.apache.syncope.client.console.rest.RestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.CheckGroupColumn;
@@ -172,7 +172,7 @@ public final class AjaxDataTablePanel<T extends Serializable, S> extends DataTab
data.setRows(builder.rowsPerPage);
send(builder.pageRef.getPage(), Broadcast.BREADTH, data);
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) getPage()).getNotificationPanel().refresh(target);
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
index 5e9c314..749bdca 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.notifications.NotificationTasks;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyObjectRestClient;
import org.apache.syncope.client.console.status.AnyStatusModal;
import org.apache.syncope.client.console.tasks.AnyPropagationTasks;
@@ -156,7 +157,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyO
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.DELETE, AnyEntitlement.DELETE.getFor(type));
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java
index 46f84c3..19b9663 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.BooleanPropertyColumn;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
@@ -87,7 +88,7 @@ public class AnyTypeClassesPanel extends TypesDirectoryPanel<AnyTypeClassTO, Any
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
}
@@ -185,7 +186,7 @@ public class AnyTypeClassesPanel extends TypesDirectoryPanel<AnyTypeClassTO, Any
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.ANYTYPECLASS_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
index 38f9de0..848448d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AnyTypesPanel.AnyTypeProvider;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -91,7 +92,7 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypeProvide
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
}
@@ -190,7 +191,7 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypeProvide
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.ANYTYPE_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
index 330590e..5951936 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
@@ -135,6 +135,7 @@ public abstract class DirectoryPanel<
addOuterObject(altDefaultModal);
addOuterObject(displayAttributeModal);
+ setPageRef(builder.getPageRef());
this.page = (BasePage) builder.getPageRef().getPage();
this.filtered = builder.filtered;
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
index 927309d..bbe8a19 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
@@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.syncope.client.console.PreferenceManager;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPalettePanel;
import org.apache.syncope.common.lib.search.SearchableFields;
@@ -152,7 +153,7 @@ public abstract class DisplayAttributesModalPanel<T extends Serializable> extend
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
if (selectedDetails.size() + selectedPlainSchemas.size() + selectedDerSchemas.size() > MAX_SELECTIONS) {
- SyncopeConsoleSession.get().error(getString("tooManySelections"));
+ SyncopeConsoleSession.get().error(getString("tooManySelections"));
onError(target, form);
} else {
final Map<String, List<String>> prefs = new HashMap<>();
@@ -164,7 +165,7 @@ public abstract class DisplayAttributesModalPanel<T extends Serializable> extend
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
modal.close(target);
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
index f960936..facbd0a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java
@@ -30,6 +30,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.layout.FormLayoutInfoUtils;
import org.apache.syncope.client.console.notifications.NotificationTasks;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -322,7 +323,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.DELETE, StandardEntitlement.GROUP_DELETE).add(new ActionLink<GroupTO>() {
@@ -339,7 +340,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.PROVISION_MEMBERS,
String.format("%s,%s", StandardEntitlement.TASK_CREATE, StandardEntitlement.TASK_EXECUTE)).add(
@@ -358,7 +359,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.DEPROVISION_MEMBERS,
String.format("%s,%s", StandardEntitlement.TASK_CREATE, StandardEntitlement.TASK_EXECUTE));
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java
index bf44efa..ebde283 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java
@@ -25,6 +25,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.client.console.wicket.markup.html.form.FieldPanel;
@@ -68,8 +69,7 @@ public abstract class MembersTogglePanel extends TogglePanel<Serializable> {
};
public MembersTogglePanel(final PageReference pageRef) {
- super("outer", "groupMembers");
- this.pageRef = pageRef;
+ super("outer", "groupMembers", pageRef);
form = new Form<>("membersForm");
addInnerObject(form);
@@ -97,12 +97,12 @@ public abstract class MembersTogglePanel extends TogglePanel<Serializable> {
: e.getMessage());
LOG.error("While inspecting group memebers of type {}", typeModel.getObject(), e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java
index 71d34c7..a791229 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.panels;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.rest.api.service.ConfigurationService;
@@ -63,6 +64,6 @@ public class ParametersEditModalPanel extends AbstractModalPanel<AttrTO> {
? e.getClass().getName()
: e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java
index e1fbfe1..9a09934 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersPanel.java
@@ -29,6 +29,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.ParametersPanel.ParametersProvider;
import org.apache.syncope.client.console.rest.BaseRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -176,7 +177,7 @@ public class ParametersPanel extends DirectoryPanel<
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.CONFIGURATION_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java
index 00a84a2..a4bdd55 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RealmModalPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.panels;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.RealmRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.RealmTO;
@@ -88,6 +89,6 @@ public class RealmModalPanel extends AbstractModalPanel<RealmTO> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java
index a068e0f..a90797c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java
@@ -31,6 +31,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.RelationshipTypesPanel.RelationshipTypeProvider;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.BooleanPropertyColumn;
@@ -91,7 +92,7 @@ public class RelationshipTypesPanel extends TypesDirectoryPanel<RelationshipType
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
}
@@ -189,7 +190,7 @@ public class RelationshipTypesPanel extends TypesDirectoryPanel<RelationshipType
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.RELATIONSHIPTYPE_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
index 1bcd7bb..23b5086 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
@@ -30,6 +30,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.RoleDataProvider;
import org.apache.syncope.client.console.layout.FormLayoutInfoUtils;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.RoleRestClient;
@@ -215,7 +216,7 @@ public class RoleDirectoryPanel extends DirectoryPanel<RoleTO, RoleWrapper, Role
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.ROLE_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index c955b52..f493b08 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -34,6 +34,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.SchemaTypePanel.SchemaProvider;
import org.apache.syncope.client.console.rest.SchemaRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -123,7 +124,7 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
};
}
@@ -230,7 +231,7 @@ public class SchemaTypePanel extends TypesDirectoryPanel<AbstractSchemaTO, Schem
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.SCHEMA_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java
index 86c0545..6fc7abc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.panels;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.SecurityQuestionTO;
import org.apache.syncope.common.rest.api.service.SecurityQuestionService;
@@ -64,6 +65,6 @@ public class SecurityQuestionsModalPanel extends AbstractModalPanel<SecurityQues
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
index 03af4fe..256e55c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
@@ -29,6 +29,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.SecurityQuestionsPanel.SecurityQuestionsProvider;
import org.apache.syncope.client.console.rest.SecurityQuestionRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -156,7 +157,7 @@ public class SecurityQuestionsPanel extends DirectoryPanel<
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.TASK_DELETE).
build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
index 0addeb8..7fe0594 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
@@ -23,12 +23,14 @@ import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.ExecutionRestClient;
import org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.client.console.wicket.markup.html.form.DateTimeFieldPanel;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.SyncopeConstants;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -45,8 +47,8 @@ public abstract class StartAtTogglePanel extends TogglePanel<Serializable> {
protected final Model<Date> startAtDateModel = new Model<>();
- public StartAtTogglePanel(final WebMarkupContainer container) {
- super("startAt");
+ public StartAtTogglePanel(final WebMarkupContainer container, final PageReference pageRef) {
+ super("startAt", pageRef);
form = new Form<>("startAtForm");
addInnerObject(form);
@@ -88,12 +90,12 @@ public abstract class StartAtTogglePanel extends TogglePanel<Serializable> {
getMessage());
LOG.error("While running task {}", key, e);
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
});
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
index 5ff6540..f82d433 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TogglePanel.java
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.wicket.Component;
+import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -56,16 +57,17 @@ public abstract class TogglePanel<T extends Serializable> extends WizardMgtPanel
private final String activeId;
- public TogglePanel(final String id) {
- this(id, id);
+ public TogglePanel(final String id, final PageReference pageRef) {
+ this(id, id, pageRef);
}
- public TogglePanel(final String id, final String markupId) {
+ public TogglePanel(final String id, final String markupId, final PageReference pageRef) {
super(id, true);
this.activeId = markupId;
setRenderBodyOnly(true);
setOutputMarkupId(true);
disableContainerAutoRefresh();
+ setPageRef(pageRef);
container = new WebMarkupContainer("togglePanelContainer");
super.addInnerObject(container.setMarkupId(markupId == null ? id : markupId));
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
index 670a651..0ac39e1 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.TypeExtensionDirectoryPanel.TypeExtensionDataProvider;
import org.apache.syncope.client.console.rest.BaseRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -99,16 +100,16 @@ public class TypeExtensionDirectoryPanel
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
} catch (Exception e) {
LOG.error("Group update failure", e);
- SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
+ SyncopeConsoleSession.get().error(getString(Constants.ERROR) + ": " + e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
public void onError(final AjaxRequestTarget target, final Form<?> form) {
- SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR));
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR));
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 2884049..db1d0a3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.notifications.NotificationTasks;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.UserRestClient;
import org.apache.syncope.client.console.status.AnyStatusModal;
import org.apache.syncope.client.console.tasks.AnyPropagationTasks;
@@ -142,7 +143,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.MUSTCHANGEPASSWORD, StandardEntitlement.USER_UPDATE).add(new ActionLink<UserTO>() {
@@ -188,7 +189,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionType.DELETE, StandardEntitlement.USER_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
index 9c1076f..92e3bb6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowTogglePanel.java
@@ -46,7 +46,7 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
protected final BaseModal<String> modal;
public WorkflowTogglePanel(final String id, final PageReference pageRef, final Image workflowDefDiagram) {
- super(id);
+ super(id, pageRef);
modal = new BaseModal<>("outer");
addOuterObject(modal);
modal.size(Modal.Size.Large);
@@ -55,8 +55,8 @@ public class WorkflowTogglePanel extends TogglePanel<String> {
container.setOutputMarkupPlaceholderTag(true);
addInnerObject(container);
- BookmarkablePageLink<Void> activitiModeler =
- new BookmarkablePageLink<>("activitiModeler", ActivitiModelerPopupPage.class);
+ BookmarkablePageLink<Void> activitiModeler = new BookmarkablePageLink<>("activitiModeler",
+ ActivitiModelerPopupPage.class);
activitiModeler.setPopupSettings(new VeilPopupSettings().setHeight(600).setWidth(800));
MetaDataRoleAuthorizationStrategy.authorize(activitiModeler, ENABLE, StandardEntitlement.WORKFLOW_DEF_READ);
container.add(activitiModeler);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/panels/XMLWorkflowEditorModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/XMLWorkflowEditorModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/XMLWorkflowEditorModalPanel.java
index 7c7d712..b1eb97e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/XMLWorkflowEditorModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/XMLWorkflowEditorModalPanel.java
@@ -23,6 +23,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.WorkflowRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.SyncopeClientException;
@@ -81,7 +82,7 @@ public class XMLWorkflowEditorModalPanel extends AbstractModalPanel<String> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index a7c226c..b20bb05 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -30,6 +30,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.rest.PolicyRestClient;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
@@ -175,10 +176,10 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO>
target.add(container);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", policyTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.POLICY_DELETE);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
index 57868ea..b5bf2af 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
@@ -25,6 +25,7 @@ import org.apache.commons.collections4.Transformer;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.panels.WizardModalPanel;
import org.apache.syncope.client.console.rest.PolicyRestClient;
@@ -163,7 +164,7 @@ public class PolicyModalPanelBuilder<T extends AbstractPolicyTO> extends Abstrac
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
index 402b9d1..141fe81 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
@@ -33,6 +33,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.policies.PolicyRuleDirectoryPanel.PolicyRuleWrapper;
@@ -174,10 +175,10 @@ public class PolicyRuleDirectoryPanel<T extends AbstractPolicyTO> extends Direct
customActionOnCloseCallback(target);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", rule.getName(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.POLICY_UPDATE).build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
index 168195f..698c3f5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java
@@ -80,8 +80,7 @@ public class PolicyRuleWizardBuilder
if (modelObject.isNew()) {
composable.getRuleConfs().add(modelObject.getConf());
} else {
- CollectionUtils.filter(
- composable.getRuleConfs(), new Predicate<RuleConf>() {
+ CollectionUtils.filter(composable.getRuleConfs(), new Predicate<RuleConf>() {
@Override
public boolean evaluate(final RuleConf object) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
index 957d33f..4758d0e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicySpecModalPanel.java
@@ -31,6 +31,7 @@ import org.apache.commons.collections4.Transformer;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.AbstractModalPanel;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.PolicyRestClient;
@@ -139,7 +140,7 @@ public class PolicySpecModalPanel extends AbstractModalPanel<PullPolicyTO> {
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
public static class CorrelationRulePanel extends Panel {
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index 93bb739..5b1571e 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -30,6 +30,7 @@ import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.rest.ReportRestClient;
@@ -77,7 +78,7 @@ public abstract class ReportDirectoryPanel
modal.size(Modal.Size.Large);
initResultTable();
- startAt = new ReportStartAtTogglePanel(container);
+ startAt = new ReportStartAtTogglePanel(container, pageRef);
addInnerObject(startAt);
}
@@ -191,10 +192,10 @@ public abstract class ReportDirectoryPanel
target.add(container);
} catch (SyncopeClientException e) {
LOG.error("While deleting {}", reportTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
? e.getClass().getName() : e.getMessage());
}
- SyncopeConsoleSession.get().getNotificationPanel().refresh(target);
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.REPORT_DELETE).build(componentId);
http://git-wip-us.apache.org/repos/asf/syncope/blob/636a1363/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportStartAtTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportStartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportStartAtTogglePanel.java
index 04022fa..6cec05c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportStartAtTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportStartAtTogglePanel.java
@@ -21,14 +21,15 @@ package org.apache.syncope.client.console.reports;
import org.apache.syncope.client.console.panels.StartAtTogglePanel;
import org.apache.syncope.client.console.rest.ExecutionRestClient;
import org.apache.syncope.client.console.rest.ReportRestClient;
+import org.apache.wicket.PageReference;
import org.apache.wicket.markup.html.WebMarkupContainer;
public class ReportStartAtTogglePanel extends StartAtTogglePanel {
private static final long serialVersionUID = -3195479265440591519L;
- public ReportStartAtTogglePanel(final WebMarkupContainer container) {
- super(container);
+ public ReportStartAtTogglePanel(final WebMarkupContainer container, final PageReference pageRef) {
+ super(container, pageRef);
}
@Override