You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/06/05 17:11:41 UTC
[06/21] syncope git commit: [SYNCOPE-660] Merge from 1_2_X - minor
fixes
[SYNCOPE-660] Merge from 1_2_X - minor fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4ded5ba2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4ded5ba2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4ded5ba2
Branch: refs/heads/SYNCOPE-666
Commit: 4ded5ba28b77069b95d61619b6f2a97eb784a4c5
Parents: 582eeb4
Author: giacomolm <gi...@hotmail.it>
Authored: Mon Jun 1 12:17:17 2015 +0200
Committer: giacomolm <gi...@hotmail.it>
Committed: Mon Jun 1 12:17:17 2015 +0200
----------------------------------------------------------------------
.../client/console/panels/RuntimePanel.java | 27 ++++++++++++++++-
.../html/repeater/data/table/JobColumn.java | 32 ++------------------
2 files changed, 28 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ded5ba2/client/old_console/src/main/java/org/apache/syncope/client/console/panels/RuntimePanel.java
----------------------------------------------------------------------
diff --git a/client/old_console/src/main/java/org/apache/syncope/client/console/panels/RuntimePanel.java b/client/old_console/src/main/java/org/apache/syncope/client/console/panels/RuntimePanel.java
index ba15f5d..4831acd 100644
--- a/client/old_console/src/main/java/org/apache/syncope/client/console/panels/RuntimePanel.java
+++ b/client/old_console/src/main/java/org/apache/syncope/client/console/panels/RuntimePanel.java
@@ -23,9 +23,11 @@ import org.apache.syncope.client.console.wicket.ajax.markup.html.ClearIndicating
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.time.Duration;
public class RuntimePanel extends Panel {
@@ -54,7 +56,7 @@ public class RuntimePanel extends Panel {
}
- public final void refresh() {
+ public final RuntimePanel refresh() {
boolean currentStatus = jobRestClient.isJobRunning(jobId);
if (currentStatus && !latestStatus) {
setRunning();
@@ -62,6 +64,7 @@ public class RuntimePanel extends Panel {
setNotRunning();
}
latestStatus = currentStatus;
+ return this;
}
public void setRunning() {
@@ -102,4 +105,26 @@ public class RuntimePanel extends Panel {
this.add(this.timer);
}
+ public void startPolling(final int seconds) {
+ AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.seconds(seconds)) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onTimer(AjaxRequestTarget target) {
+ target.add(refresh());
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getExtraParameters().put("pollingTimeout", "true");
+ }
+
+ };
+
+ panel.setTimer(timer);
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ded5ba2/client/old_console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/JobColumn.java
----------------------------------------------------------------------
diff --git a/client/old_console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/JobColumn.java b/client/old_console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/JobColumn.java
index 4cca6bf..70d7074 100644
--- a/client/old_console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/JobColumn.java
+++ b/client/old_console/src/main/java/org/apache/syncope/client/console/wicket/extensions/markup/html/repeater/data/table/JobColumn.java
@@ -20,17 +20,13 @@ package org.apache.syncope.client.console.wicket.extensions.markup.html.repeater
import org.apache.syncope.client.console.panels.RuntimePanel;
import org.apache.syncope.client.console.rest.JobRestClient;
-import org.apache.syncope.common.lib.to.AbsractTaskTO;
+import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.wicket.PageReference;
-import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,32 +59,8 @@ public class JobColumn<T, S> extends AbstractColumn<T, S> {
}
if (jobId != null) {
panel = new RuntimePanel(componentId, model, pageRef, jobId, jobRestClient);
- startPolling(10);
+ panel.startPolling(10);
item.add(panel);
}
}
-
- public void startPolling(final int seconds) {
- AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.seconds(seconds)) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onTimer(AjaxRequestTarget target) {
- panel.refresh();
- target.add(panel);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getExtraParameters().put("pollingTimeout", "true");
- }
-
- };
-
- panel.setTimer(timer);
-
- }
-
}