The Unified and Autonomous Development Platform
Refactoring websocket notification mechanism to be easier and clearer
Robin Shen91f6c8dbfec5
diff --git a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex 761483f4c6..9c478d6b73 100644--- a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -55,6 +55,7 @@ import org.apache.wicket.util.time.Duration;import de.agilecoders.wicket.core.settings.BootstrapSettings;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.server.OneDev;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.error.ErrorPage;import io.onedev.server.web.page.layout.UICustomization;@@ -117,7 +118,7 @@ public class OneWebApplication extends WebApplication {&& !(component instanceof AbstractErrorPage)&& !(component instanceof BasePage)&& !(component instanceof BrowserInfoPage)) {-// throw new RuntimeException("Page classes should extend from BasePage.");+ throw new RuntimeException("Page classes should extend from BasePage.");}}});@@ -138,6 +139,11 @@ public class OneWebApplication extends WebApplication {@Overridepublic void onAfterRespond(Map<String, Component> map, IJavaScriptResponse response) {+ if (!map.isEmpty()) {+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ if (target != null)+ OneDev.getInstance(WebSocketManager.class).observe((BasePage) target.getPage());+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex cf19dbdd02..a25ad779c6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -1,10 +1,12 @@package io.onedev.server.web.component.codecomment;import java.util.ArrayList;+import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;import java.util.List;+import java.util.Set;import javax.annotation.Nullable;@@ -15,7 +17,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -35,6 +36,8 @@ import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Sets;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;@@ -52,6 +55,7 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.asset.caret.CaretResourceReference;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.project.comment.CommentInput;@@ -62,7 +66,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.QueryPosition;-import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public abstract class CodeCommentPanel extends Panel {@@ -410,6 +413,7 @@ public abstract class CodeCommentPanel extends Panel {protected void onInitialize() {super.onInitialize();+ Component outdatedLink;if (getPullRequest() != null) {QueryPosition position;if (getPage() instanceof PullRequestDetailPage)@@ -417,18 +421,9 @@ public abstract class CodeCommentPanel extends Panel {elseposition = null;PageParameters params = PullRequestChangesPage.paramsOf(getPullRequest(), position, getComment());- add(new BookmarkablePageLink<Void>("outdatedContext", PullRequestChangesPage.class, params) {- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);+ add(outdatedLink = new BookmarkablePageLink<Void>("outdatedContext", PullRequestChangesPage.class, params) {- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }- }-@Overrideprotected void onConfigure() {super.onConfigure();@@ -451,6 +446,7 @@ public abstract class CodeCommentPanel extends Panel {}.setOutputMarkupPlaceholderTag(true));} else {add(new WebMarkupContainer("outdatedContext").setVisible(false));+ outdatedLink = null;}add(newCommentContainer());@@ -471,6 +467,58 @@ public abstract class CodeCommentPanel extends Panel {add(repliesView);add(newAddReplyContainer());+ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ Date lastReplyDate;+ String prevReplyMarkupId;+ if (repliesView.size() != 0) {+ @SuppressWarnings("deprecation")+ Component lastReplyContainer = repliesView.get(repliesView.size()-1);++ CodeCommentReply lastReply = getReply((Long) lastReplyContainer.getDefaultModelObject());+ lastReplyDate = lastReply.getDate();+ prevReplyMarkupId = lastReplyContainer.getMarkupId();+ } else {+ lastReplyDate = getComment().getCreateDate();+ prevReplyMarkupId = get("comment").getMarkupId();+ }++ List<CodeCommentReply> replies = new ArrayList<>();+ for (CodeCommentReply reply: getComment().getReplies()) {+ if (reply.getDate().getTime()>lastReplyDate.getTime()) {+ replies.add(reply);+ }+ }+ replies.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));++ for (CodeCommentReply reply: replies) {+ Component newReplyContainer = newReplyContainer(repliesView.newChildId(), reply);+ newReplyContainer.add(AttributeAppender.append("class", "new"));+ repliesView.add(newReplyContainer);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newReplyContainer.getMarkupId(), prevReplyMarkupId);+ handler.prependJavaScript(script);+ handler.add(newReplyContainer);+ prevReplyMarkupId = newReplyContainer.getMarkupId();+ }++ if (outdatedLink != null)+ handler.add(outdatedLink);+ }++ @Override+ public Collection<String> getObservables() {+ Set<String> observables = Sets.newHashSet(CodeComment.getWebSocketObservable(commentId));+ if (getPullRequest() != null)+ observables.add(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ return observables;+ }++ });+RequestCycle.get().getListeners().add(new IRequestCycleListener() {@Override@@ -512,56 +560,11 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onBeginRequest(RequestCycle cycle) {}- });+ });setOutputMarkupId(true);}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- IPartialPageRequestHandler handler = pageDataChanged.getHandler();-- Date lastReplyDate;- String prevReplyMarkupId;- if (repliesView.size() != 0) {- @SuppressWarnings("deprecation")- Component lastReplyContainer = repliesView.get(repliesView.size()-1);-- CodeCommentReply lastReply = getReply((Long) lastReplyContainer.getDefaultModelObject());- lastReplyDate = lastReply.getDate();- prevReplyMarkupId = lastReplyContainer.getMarkupId();- } else {- lastReplyDate = getComment().getCreateDate();- prevReplyMarkupId = get("comment").getMarkupId();- }-- List<CodeCommentReply> replies = new ArrayList<>();- for (CodeCommentReply reply: getComment().getReplies()) {- if (reply.getDate().getTime()>lastReplyDate.getTime()) {- replies.add(reply);- }- }- replies.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));-- for (CodeCommentReply reply: replies) {- Component newReplyContainer = newReplyContainer(repliesView.newChildId(), reply);- newReplyContainer.add(AttributeAppender.append("class", "new"));- repliesView.add(newReplyContainer);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newReplyContainer.getMarkupId(), prevReplyMarkupId);- handler.prependJavaScript(script);- handler.add(newReplyContainer);- prevReplyMarkupId = newReplyContainer.getMarkupId();- }-- }- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex defc7720df..3d29789608 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -26,7 +26,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;@@ -163,7 +163,7 @@ public abstract class CommitStatusPanel extends Panel {@Overridepublic Collection<String> getObservables() {- return CommitStatusPanel.this.getWebSocketObservables();+ return getWebSocketObservables();}});@@ -206,7 +206,7 @@ public abstract class CommitStatusPanel extends Panel {}private Collection<String> getWebSocketObservables() {- return Lists.newArrayList("commit-status:" + getProject().getId() + ":" + commitId.name());+ return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 250dc1d143..d5c1ca391e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -24,7 +24,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -57,6 +57,7 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Objects;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.codeassist.InputSuggestion;@@ -76,6 +77,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;+import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.IndexManager;import io.onedev.server.util.PathComparator;import io.onedev.server.util.ProjectAndRevision;@@ -88,6 +90,7 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.PatternSetAssistBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.codecomment.CodeCommentPanel;import io.onedev.server.web.component.diff.blob.BlobDiffPanel;import io.onedev.server.web.component.diff.blob.SourceAware;@@ -101,7 +104,6 @@ import io.onedev.server.web.component.revisionpicker.RevisionSelector;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.SuggestionUtils;-import io.onedev.server.web.websocket.PageDataChanged;/*** Make sure to add only one revision diff panel on a page@@ -439,19 +441,23 @@ public class RevisionDiffPanel extends Panel {add(new NoAntiCacheImage("icon",new PackageResourceReference(RevisionDiffPanel.class, "indexing.gif")));+ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ handler.appendJavaScript("$(window).resize();");+ }++ @Override+ public Collection<String> getObservables() {+ return getWebSocketObservables();+ }+ });+setOutputMarkupPlaceholderTag(true);}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- pageDataChanged.getHandler().appendJavaScript("$(window).resize();");- }- }-@Overrideprotected void onConfigure() {super.onConfigure();@@ -1092,18 +1098,21 @@ public class RevisionDiffPanel extends Panel {};commentContainer.setOutputMarkupPlaceholderTag(true);- WebMarkupContainer head = new WebMarkupContainer("head") {-+ WebMarkupContainer head = new WebMarkupContainer("head");+ head.add(new WebSocketObserver() {+@Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }+ public Collection<String> getObservables() {+ return getWebSocketObservables();}- };+ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ if (commentContainer.isVisible())+ handler.add(component);+ }++ });head.setOutputMarkupId(true);commentContainer.add(head);@@ -1359,6 +1368,13 @@ public class RevisionDiffPanel extends Panel {response.render(JavaScriptHeaderItem.forReference(new RevisionDiffResourceReference()));}+ private Set<String> getWebSocketObservables() {+ Project project = projectModel.getObject();+ return Sets.newHashSet(+ CommitIndexed.getWebSocketObservable(project.getObjectId(oldRev, true).name()),+ CommitIndexed.getWebSocketObservable(project.getObjectId(newRev, true).name()));+ }+private static class ChangesAndCount {private final List<BlobChange> changes;diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex 0e3036ce7d..55aee9bc08 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.review;import java.util.ArrayList;+import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;@@ -11,7 +12,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -22,6 +23,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import com.google.common.collect.Sets;+import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;@@ -32,10 +35,10 @@ import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.ajaxlistener.ConfirmListener;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public class ReviewListPanel extends GenericPanel<PullRequest> {@@ -78,16 +81,6 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {return getModelObject();}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (isVisibleInHierarchy() && event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }- }-@Overrideprotected void onDetach() {reviewsModel.detach();@@ -211,6 +204,21 @@ public class ReviewListPanel extends GenericPanel<PullRequest> {});+ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ if (isVisibleInHierarchy())+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ });+setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 8e1ec2d9d1..220f216547 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -20,7 +20,6 @@ import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.Broadcast;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -52,7 +51,6 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.security.LoginPage;-import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")@@ -187,20 +185,6 @@ public abstract class BasePage extends WebPage {}});-- add(new WebSocketObserver() {-- @Override- public Collection<String> getObservables() {- return getWebSocketObservables();- }-- @Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- send(BasePage.this, Broadcast.BREADTH, new PageDataChanged(handler));- }-- });} else {add(new WebMarkupContainer("keepSessionAlive"));}@@ -243,7 +227,7 @@ public abstract class BasePage extends WebPage {@Overridepublic void component(Component object, IVisit<Void> visit) {- observers.addAll(object.getBehaviors(io.onedev.server.web.behavior.WebSocketObserver.class));+ observers.addAll(object.getBehaviors(WebSocketObserver.class));}});@@ -257,10 +241,6 @@ public abstract class BasePage extends WebPage {return observables;}- public Collection<String> getWebSocketObservables() {- return new HashSet<>();- }-private void checkReady() {if (!OneDev.getInstance().isReady() && getClass() != ServerInitPage.class)throw new RestartResponseAtInterceptPageException(ServerInitPage.class);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 8d5da86801..340202fd3c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -8,8 +8,10 @@ import java.net.URISyntaxException;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;import javax.annotation.Nullable;@@ -89,6 +91,7 @@ import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.commit.status.CommitStatusPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.ArchiveMenuLink;@@ -112,7 +115,6 @@ import io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.util.EditParamsAware;-import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")@@ -256,6 +258,23 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}}+ });+ revisionIndexing.add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(revisionIndexing);+ resizeWindow(handler);+ }++ @Override+ public Collection<String> getObservables() {+ Set<String> observables = new HashSet<>();+ if (resolvedRevision != null)+ observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));+ return observables;+ }+});newBuildSupportNote(null);@@ -1099,14 +1118,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sstate.commentId = null;state.position = null;}- OneDev.getInstance(WebSocketManager.class).observe(this);pushState(target);}@Overridepublic void onAddComment(AjaxRequestTarget target, PlanarRange range) {state.commentId = null;- OneDev.getInstance(WebSocketManager.class).observe(this);state.position = SourceRendererProvider.getPosition(range);pushState(target);}@@ -1124,21 +1141,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sreturn null;}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> observables = super.getWebSocketObservables();- if (resolvedRevision != null) {- observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));- observables.add("commit-status:" + getProject().getId() + ":" + resolvedRevision.name());- }- if (state.requestId != null)- observables.add(PullRequest.getWebSocketObservable(state.requestId));- if (state.commentId != null)- observables.add(CodeComment.getWebSocketObservable(state.commentId));-- return observables;- }-public static class State implements Serializable {private static final long serialVersionUID = 1L;@@ -1354,11 +1356,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sif (event.getPayload() instanceof RevisionResolved) {RevisionResolved revisionResolveEvent = (RevisionResolved) event.getPayload();resolvedRevision = revisionResolveEvent.getResolvedRevision();- } else if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(revisionIndexing);- resizeWindow(pageDataChanged.getHandler());- }+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex f06ebbe531..eae2ee0c63 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -22,7 +22,6 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.IEvent;import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;@@ -107,7 +106,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.WicketUtils;-import io.onedev.server.web.websocket.PageDataChanged;/*** Make sure to add only one source view panel per page@@ -262,19 +260,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear};- WebMarkupContainer head = new WebMarkupContainer("head") {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }- }-- };- head.setOutputMarkupId(true);+ WebMarkupContainer head = new WebMarkupContainer("head");commentContainer.add(head);head.add(new DropdownLink("context") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 70775a4f31..0e94b9f869 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -60,7 +60,6 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.WebSocketObserver;@@ -590,7 +589,6 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {@Overrideprotected void onPopState(AjaxRequestTarget target, Serializable data) {super.onPopState(target, data);-state = (State) data;newRevisionDiff(target);}@@ -691,14 +689,6 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {return objectIdCache;}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> observables = super.getWebSocketObservables();- observables.add(CommitIndexed.getWebSocketObservable(resolvedRevision.name()));- observables.add(CommitIndexed.getWebSocketObservable(getCompareWith().name()));- return observables;- }-@Overrideprotected boolean isPermitted() {return SecurityUtils.canReadCode(getProject());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 92c68bf92a..46e4b31fa5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.compare;import java.io.Serializable;import java.util.ArrayList;-import java.util.Collection;import java.util.List;import javax.annotation.Nullable;@@ -36,7 +35,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;@@ -752,7 +750,6 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,state.mark = null;}pushState(target);- OneDev.getInstance(WebSocketManager.class).observe(this);}@Override@@ -771,7 +768,6 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,state.commentId = null;state.mark = mark;pushState(target);- OneDev.getInstance(WebSocketManager.class).observe(this);}@Override@@ -788,23 +784,6 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,return urlFor(RevisionComparePage.class, paramsOf(markState.rightSide.getProject(), markState)).toString();}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> observables = super.getWebSocketObservables();- if (getProject().getDefaultBranch() != null) {- if (state.compareWithMergeBase) {- if (mergeBase != null)- observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));- } else {- observables.add(CommitIndexed.getWebSocketObservable(state.leftSide.getCommit().name()));- }- observables.add(CommitIndexed.getWebSocketObservable(state.rightSide.getCommit().name()));- if (state.commentId != null)- observables.add(CodeComment.getWebSocketObservable(state.commentId));- }- return observables;- }-@Overridepublic PageParameters getParamsBeforeEdit() {return paramsOf(getProject(), state);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex a8bddd6949..9370e88c0a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.pullrequests.create;import java.util.ArrayList;import java.util.Arrays;-import java.util.Collection;import java.util.Comparator;import java.util.Date;import java.util.List;@@ -55,7 +54,6 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;@@ -802,17 +800,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> regions = super.getWebSocketObservables();- PullRequest request = getPullRequest();- if (request != null) {- regions.add(CommitIndexed.getWebSocketObservable(request.getBaseCommit().name()));- regions.add(CommitIndexed.getWebSocketObservable(request.getHeadCommit().name()));- }- return regions;- }-@Overridepublic void onMark(AjaxRequestTarget target, MarkPos mark) {this.mark = mark;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex e9f4f40d8e..94a01a4385 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -44,7 +44,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -75,6 +74,7 @@ import org.apache.wicket.util.visit.IVisitor;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import edu.emory.mathcs.backport.java.util.Collections;@@ -106,6 +106,7 @@ import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;@@ -140,7 +141,6 @@ import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;import io.onedev.server.web.util.ReferenceTransformer;import io.onedev.server.web.util.WicketUtils;-import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {@@ -311,41 +311,44 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRWebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {@Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);+ protected void onBeforeRender() {+ super.onBeforeRender();+ WicketUtils.markLastVisibleChild(this);+ }++ };+ summaryContainer.add(new WebSocketObserver() {- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- for (Component child: this) {- if (child instanceof MarkupContainer) {- MarkupContainer container = (MarkupContainer) child;- Form<?> form = container.visitChildren(Form.class, new IVisitor<Form<?>, Form<?>>() {+ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }- @Override- public void component(Form<?> object, IVisit<Form<?>> visit) {- visit.stop(object);- }-- });- if (form == null) {- pageDataChanged.getHandler().add(child);+ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ for (Component child: summaryContainer) {+ if (child instanceof MarkupContainer) {+ MarkupContainer container = (MarkupContainer) child;+ Form<?> form = container.visitChildren(Form.class, new IVisitor<Form<?>, Form<?>>() {++ @Override+ public void component(Form<?> object, IVisit<Form<?>> visit) {+ visit.stop(object);}- } else if (!(child instanceof Form)) {- pageDataChanged.getHandler().add(child);++ });+ if (form == null) {+ handler.add(child);}+ } else if (!(child instanceof Form)) {+ handler.add(child);}- WicketUtils.markLastVisibleChild(this);- pageDataChanged.getHandler().appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}+ WicketUtils.markLastVisibleChild(summaryContainer);+ handler.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}-- @Override- protected void onBeforeRender() {- super.onBeforeRender();- WicketUtils.markLastVisibleChild(this);- }-- };++ });summaryContainer.setOutputMarkupPlaceholderTag(true);add(summaryContainer);@@ -448,21 +451,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected Component newContent(String componentId) {- Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this) {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();- partialPageRequestHandler.add(this);- }-- }-- };+ Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this);fragment.add(new EntityNavPanel<PullRequest>("requestNav") {@Override@@ -629,6 +618,20 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});fragment.add(newManageContainer());++ fragment.add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ });fragment.setOutputMarkupId(true);return fragment;@@ -764,8 +767,20 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected void onInitialize() {super.onInitialize();-- setOutputMarkupId(true);++ add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ });add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {@@ -781,16 +796,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}}));- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }+ setOutputMarkupId(true);}});@@ -1268,13 +1274,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn position;}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> observables = super.getWebSocketObservables();- observables.add(PullRequest.getWebSocketObservable(getPullRequest().getId()));- return observables;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -1298,17 +1297,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRpublic Component render(String componentId) {if (getMainPageClass() == PullRequestCodeCommentsPage.class) {Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", PullRequestDetailPage.this);- Link<Void> link = new ViewStateAwarePageLink<Void>("link", PullRequestCodeCommentsPage.class, paramsOf(getPullRequest(), position)) {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof PageDataChanged) {- ((PageDataChanged)event.getPayload()).getHandler().add(this);- }- }-- };+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ PullRequestCodeCommentsPage.class, paramsOf(getPullRequest(), position));link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {@Override@@ -1323,6 +1313,19 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}}));+ link.add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ });link.setOutputMarkupId(true);fragment.add(link);return fragment;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex f3b75e00a5..0b0159f730 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -17,7 +17,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -26,9 +25,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestHandler;-import org.apache.wicket.request.Url;-import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;@@ -37,6 +33,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.joda.time.DateTime;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;@@ -57,6 +54,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.user.ident.Mode;@@ -69,8 +67,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.activityimport io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.DeleteCallback;import io.onedev.server.web.util.ProjectAttachmentSupport;-import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")public class PullRequestActivitiesPage extends PullRequestDetailPage {@@ -194,117 +190,6 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {return activities;}-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();-- @SuppressWarnings("deprecation")- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);- PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();- List<PullRequestActivity> newActivities = new ArrayList<>();- for (PullRequestActivity activity: getActivities()) {- if (activity.getDate().after(lastActivity.getDate()))- newActivities.add(activity);- }-- Component sinceChangesRow = null;- for (Component row: activitiesView) {- if (row.getDefaultModelObject() == null) {- sinceChangesRow = row;- break;- }- }-- if (sinceChangesRow == null && !newActivities.isEmpty()) {- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();- sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);- activitiesView.add(sinceChangesRow);- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());- partialPageRequestHandler.prependJavaScript(script);- partialPageRequestHandler.add(sinceChangesRow);- prevActivityRow = sinceChangesRow;- }-- Collection<ObjectId> commitIds = new HashSet<>();-- for (PullRequestActivity activity: newActivities) {- Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);- newActivityRow.add(AttributeAppender.append("class", "new"));- activitiesView.add(newActivityRow);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());- partialPageRequestHandler.prependJavaScript(script);- partialPageRequestHandler.add(newActivityRow);-- if (activity instanceof PullRequestUpdatedActivity) {- partialPageRequestHandler.appendJavaScript("$('tr.since-changes').addClass('visible');");- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;- commitIds.addAll(updatedActivity.getUpdate().getCommits()- .stream().map(it->it.copy()).collect(Collectors.toSet()));- }- prevActivityRow = newActivityRow;- }-- PullRequest request = getPullRequest();- Project project = request.getTargetProject();- project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));-- if (!commitIds.isEmpty()) {- RequestCycle.get().getListeners().add(new IRequestCycleListener() {-- @Override- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {- }-- @Override- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {- }-- @Override- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {- }-- @Override- public IRequestHandler onException(RequestCycle cycle, Exception ex) {- return null;- }-- @Override- public void onEndRequest(RequestCycle cycle) {- notifyWebSocketObserverChange();- }-- @Override- public void onDetach(RequestCycle cycle) {- }-- @Override- public void onBeginRequest(RequestCycle cycle) {- }-- });- }- }- }-- private void notifyWebSocketObserverChange() {- OneDev.getInstance(WebSocketManager.class).observe(this);- }private Component newSinceChangesRow(String id, Date sinceDate) {WebMarkupContainer row = new WebMarkupContainer(id);@@ -469,6 +354,71 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {});container.add(fragment);}++ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ @SuppressWarnings("deprecation")+ Component prevActivityRow = activitiesView.get(activitiesView.size()-1);+ PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();+ List<PullRequestActivity> newActivities = new ArrayList<>();+ for (PullRequestActivity activity: getActivities()) {+ if (activity.getDate().after(lastActivity.getDate()))+ newActivities.add(activity);+ }++ Component sinceChangesRow = null;+ for (Component row: activitiesView) {+ if (row.getDefaultModelObject() == null) {+ sinceChangesRow = row;+ break;+ }+ }++ if (sinceChangesRow == null && !newActivities.isEmpty()) {+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();+ sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);+ activitiesView.add(sinceChangesRow);+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());+ handler.prependJavaScript(script);+ handler.add(sinceChangesRow);+ prevActivityRow = sinceChangesRow;+ }++ Collection<ObjectId> commitIds = new HashSet<>();++ for (PullRequestActivity activity: newActivities) {+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);+ newActivityRow.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());+ handler.prependJavaScript(script);+ handler.add(newActivityRow);++ if (activity instanceof PullRequestUpdatedActivity) {+ handler.appendJavaScript("$('tr.since-changes').addClass('visible');");+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;+ commitIds.addAll(updatedActivity.getUpdate().getCommits()+ .stream().map(it->it.copy()).collect(Collectors.toSet()));+ }+ prevActivityRow = newActivityRow;+ }++ PullRequest request = getPullRequest();+ Project project = request.getTargetProject();+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));+ }++ });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.javaindex 9686708ff0..5a46ddf5bd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java@@ -1,19 +1,21 @@package io.onedev.server.web.page.project.pullrequests.detail.activities;+import java.util.Collection;import java.util.Date;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Sets;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;-import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public class SinceChangesLink extends ViewStateAwarePageLink<Void> {@@ -26,7 +28,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {@Overrideprotected String load() {- PullRequest request = requestModel.getObject();+ PullRequest request = getPullRequest();String commit = request.getBaseCommitHash();for (PullRequestUpdate update: request.getSortedUpdates()) {if (update.getDate().before(sinceDate))@@ -45,7 +47,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {@Overridepublic PageParameters getPageParameters() {- PullRequest request = requestModel.getObject();+ PullRequest request = getPullRequest();PullRequestChangesPage.State state = new PullRequestChangesPage.State();state.oldCommit = oldCommitModel.getObject();state.newCommit = request.getHeadCommitHash();@@ -53,27 +55,35 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {return PullRequestChangesPage.paramsOf(request, page.getPosition(), state);}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();- partialPageRequestHandler.add(this);- }- }-@Overrideprotected void onInitialize() {super.onInitialize();++ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ });+setOutputMarkupPlaceholderTag(true);}++ private PullRequest getPullRequest() {+ return requestModel.getObject();+ }@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!oldCommitModel.getObject().equals(requestModel.getObject().getHeadCommitHash()));+ setVisible(!oldCommitModel.getObject().equals(getPullRequest().getHeadCommitHash()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 255c9bd0b0..9bfb60d342 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -14,7 +14,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -32,6 +31,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.GitUtils;@@ -39,9 +40,9 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.support.MarkPos;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -49,7 +50,6 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.util.EditParamsAware;import io.onedev.server.web.util.QueryPosition;-import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")@@ -145,16 +145,17 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Comprotected void onInitialize() {super.onInitialize();- add(head = new WebMarkupContainer("changesHead") {+ add(head = new WebMarkupContainer("changesHead"));+ head.add(new WebSocketObserver() {@Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- }+ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);}});@@ -554,16 +555,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements ComonRegionChange();}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> observables = super.getWebSocketObservables();- observables.add(CommitIndexed.getWebSocketObservable(state.oldCommit));- observables.add(CommitIndexed.getWebSocketObservable((state.newCommit)));- if (state.commentId != null)- observables.add(CodeComment.getWebSocketObservable(state.commentId));- return observables;- }-@Overridepublic PageParameters getParamsBeforeEdit() {return paramsOf(getPullRequest(), getPosition(), state);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.htmlindex cb0e29546f..691b546369 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.html@@ -29,6 +29,6 @@</div></wicket:fragment><wicket:fragment wicket:id="notAvailableFrag">- <div class="not-available"><i class="fa fa-info-circle"></i> No merge preview</div>+ <div class="not-available alert alert-warning"><i class="fa fa-info-circle"></i> Merge preview not available</div></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex 4ae3d4c160..081fba6ab6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -9,7 +9,6 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -22,13 +21,14 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.OneDev;+import com.google.common.collect.Sets;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.commit.status.CommitStatusPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;@@ -37,8 +37,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.util.EditParamsAware;import io.onedev.server.web.util.QueryPosition;-import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")public class MergePreviewPage extends PullRequestDetailPage implements EditParamsAware {@@ -93,7 +91,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamnewContent(target);}- private void newContent(IPartialPageRequestHandler target) {+ private void newContent(IPartialPageRequestHandler handler) {Fragment fragment;MergePreview preview = getPullRequest().getMergePreview();if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {@@ -118,7 +116,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam@Overrideprotected String getCssClasses() {- return "btn btn-default";+ return "btn btn-default btn-sm";}@Override@@ -132,6 +130,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam@Overrideprotected void onInitialize() {super.onInitialize();+add(new AjaxLink<Void>("link") {@Override@@ -140,17 +139,20 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam}});- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- pageDataChanged.getHandler().add(this);- OneDev.getInstance(WebSocketManager.class).observe(MergePreviewPage.this);- }++ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ });}@Override@@ -227,26 +229,26 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamrevisionDiff.setOutputMarkupId(true);fragment.add(revisionDiff);} else {- fragment = new Fragment("content", "notAvailableFrag", this) {-+ fragment = new Fragment("content", "notAvailableFrag", this);+ fragment.add(new WebSocketObserver() {+@Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PageDataChanged) {- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();- newContent(pageDataChanged.getHandler());- OneDev.getInstance(WebSocketManager.class).observe(MergePreviewPage.this);- }+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ newContent(handler);}- };+ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ });}fragment.setOutputMarkupId(true);- if (target != null) {+ if (handler != null) {replace(fragment);- target.add(fragment);+ handler.add(fragment);} else {add(fragment);}@@ -256,17 +258,6 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamreturn state;}- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> regions = super.getWebSocketObservables();- MergePreview preview = getPullRequest().getMergePreview();- if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {- regions.add(CommitIndexed.getWebSocketObservable(preview.getTargetHead()));- regions.add(CommitIndexed.getWebSocketObservable(preview.getMerged()));- }- return regions;- }-private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {PageParameters params = paramsOf(getPullRequest(), getPosition(), state);CharSequence url = RequestCycle.get().urlFor(MergePreviewPage.class, params);diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.javaindex 6f58855c8b..df83d04158 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java@@ -82,7 +82,14 @@ public class DefaultWebSocketManager implements WebSocketManager {sessionPages = new ConcurrentHashMap<>();registeredObservables.put(sessionId, sessionPages);}- sessionPages.put(new PageIdKey(page.getPageId()), page.findWebSocketObservables());+ IKey pageKey = new PageIdKey(page.getPageId());+ Collection<String> observables = page.findWebSocketObservables();+ Collection<String> prevObservables = sessionPages.put(pageKey, observables);+ if (prevObservables != null && !prevObservables.containsAll(observables)) {+ IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, pageKey);+ if (connection != null)+ notifyPastObservables(connection);+ }}}@@ -196,6 +203,10 @@ public class DefaultWebSocketManager implements WebSocketManager {*/@Overridepublic void onConnect(IWebSocketConnection connection) {+ notifyPastObservables(connection);+ }++ private void notifyPastObservables(IWebSocketConnection connection) {Collection<String> registeredObservables = getRegisteredObservables(connection);if (registeredObservables != null) {Set<String> observables = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/PageDataChanged.java b/server-core/src/main/java/io/onedev/server/web/websocket/PageDataChanged.javadeleted file mode 100644index b5e6263716..0000000000--- a/server-core/src/main/java/io/onedev/server/web/websocket/PageDataChanged.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.websocket;--import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;--import io.onedev.server.web.util.AjaxPayload;--public class PageDataChanged extends AjaxPayload {-- public PageDataChanged(IPartialPageRequestHandler handler) {- super(handler);- }--}diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.javanew file mode 100644index 0000000000..6af62723c9--- /dev/null+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketRequestHandler.java@@ -0,0 +1,282 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.wicket.protocol.ws.api;++import java.io.IOException;+import java.util.Collection;+import java.util.Collections;++import org.apache.wicket.Component;+import org.apache.wicket.MarkupContainer;+import org.apache.wicket.Page;+import org.apache.wicket.core.request.handler.logger.PageLogData;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.page.PartialPageUpdate;+import org.apache.wicket.page.XmlPartialPageUpdate;+import org.apache.wicket.request.ILogData;+import org.apache.wicket.request.IRequestCycle;+import org.apache.wicket.request.Response;+import org.apache.wicket.request.component.IRequestablePage;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.util.lang.Args;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.server.OneDev;+import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.websocket.WebSocketManager;++/**+ * A handler of WebSocket requests.+ *+ * @since 6.0+ */+public class WebSocketRequestHandler implements IWebSocketRequestHandler+{+ private static final Logger LOG = LoggerFactory.getLogger(WebSocketRequestHandler.class);++ private final Page page;++ private final IWebSocketConnection connection;++ private PartialPageUpdate update;++ private PageLogData logData;++ public WebSocketRequestHandler(final Component component, final IWebSocketConnection connection)+ {+ this.page = Args.notNull(component, "component").getPage();+ this.connection = Args.notNull(connection, "connection");+ }++ @Override+ public void push(CharSequence message)+ {+ if (connection.isOpen())+ {+ Args.notNull(message, "message");+ try+ {+ connection.sendMessage(message.toString());+ } catch (IOException iox)+ {+ LOG.error("An error occurred while pushing text message.", iox);+ }+ }+ else+ {+ LOG.warn("The websocket connection is already closed. Cannot push the text message '{}'", message);+ }+ }++ @Override+ public void push(byte[] message, int offset, int length)+ {+ if (connection.isOpen())+ {+ Args.notNull(message, "message");+ try+ {+ connection.sendMessage(message, offset, length);+ } catch (IOException iox)+ {+ LOG.error("An error occurred while pushing binary message.", iox);+ }+ }+ else+ {+ LOG.warn("The websocket connection is already closed. Cannot push the binary message '{}'", message);+ }+ }++ @Override+ public void add(Component component, String markupId)+ {+ getUpdate().add(component, markupId);+ }++ private PartialPageUpdate getUpdate() {+ if (update == null) {+ update = new XmlPartialPageUpdate(page) {++ @Override+ protected void onBeforeRespond(Response response) {+ super.onBeforeRespond(response);+ BasePage page = (BasePage) getPage();+ if (page.getSessionFeedback().anyMessage())+ WebSocketRequestHandler.this.add(page.getSessionFeedback());++ for (Component component: markupIdToComponent.values()) {+ prependJavaScript((String.format("$(document).trigger('beforeElementReplace', '%s');", component.getMarkupId())));+ appendJavaScript((String.format("$(document).trigger('afterElementReplace', '%s');", component.getMarkupId())));+ }+ }++ @Override+ protected void onAfterRespond(Response response) {+ if (!markupIdToComponent.isEmpty())+ OneDev.getInstance(WebSocketManager.class).observe((BasePage) getPage());+ super.onAfterRespond(response);+ }++ };+ }+ return update;+ }++ @Override+ public void add(Component... components)+ {+ for (final Component component : components)+ {+ Args.notNull(component, "component");++ if (component.getOutputMarkupId() == false)+ {+ throw new IllegalArgumentException(+ "cannot update component that does not have setOutputMarkupId property set to true. Component: " ++ component.toString());+ }+ add(component, component.getMarkupId());+ }+ }++ @Override+ public final void addChildren(MarkupContainer parent, Class<?> childCriteria)+ {+ Args.notNull(parent, "parent");+ Args.notNull(childCriteria, "childCriteria");++ parent.visitChildren(childCriteria, new IVisitor<Component, Void>()+ {+ @Override+ public void component(final Component component, final IVisit<Void> visit)+ {+ add(component);+ visit.dontGoDeeper();+ }+ });+ }++ @Override+ public void appendJavaScript(CharSequence javascript)+ {+ getUpdate().appendJavaScript(javascript);+ }++ @Override+ public void prependJavaScript(CharSequence javascript)+ {+ getUpdate().prependJavaScript(javascript);+ }++ @Override+ public Collection<? extends Component> getComponents()+ {+ if (update == null) {+ return Collections.emptyList();+ } else {+ return update.getComponents();+ }+ }++ @Override+ public final void focusComponent(Component component)+ {+ if (component != null && component.getOutputMarkupId() == false)+ {+ throw new IllegalArgumentException(+ "cannot update component that does not have setOutputMarkupId property set to true. Component: " ++ component.toString());+ }+ final String id = component != null ? ("'" + component.getMarkupId() + "'") : "null";+ appendJavaScript("Wicket.Focus.setFocusOnId(" + id + ");");+ }++ @Override+ public IHeaderResponse getHeaderResponse()+ {+ return getUpdate().getHeaderResponse();+ }++ @Override+ public Page getPage()+ {+ return page;+ }++ @Override+ public Integer getPageId()+ {+ return page.getPageId();+ }++ @Override+ public boolean isPageInstanceCreated()+ {+ return true;+ }++ @Override+ public Integer getRenderCount()+ {+ return page.getRenderCount();+ }++ @Override+ public ILogData getLogData()+ {+ return logData;+ }++ @Override+ public Class<? extends IRequestablePage> getPageClass()+ {+ return page.getPageClass();+ }++ @Override+ public PageParameters getPageParameters()+ {+ return page.getPageParameters();+ }++ @Override+ public void respond(IRequestCycle requestCycle)+ {+ if (update != null)+ {+ update.writeTo(requestCycle.getResponse(), "UTF-8");+ }+ }++ @Override+ public void detach(IRequestCycle requestCycle)+ {+ if (logData == null)+ {+ logData = new PageLogData(page);+ }++ if (update != null) {+ update.detach(requestCycle);+ update = null;+ }+ }+}