The Unified and Autonomous Development Platform
Refactor websocket rendering mechanism
robin shenc375a7527518
diff --git a/core/src/main/java/com/gitplex/server/model/support/MergeStrategy.java b/core/src/main/java/com/gitplex/server/model/support/MergeStrategy.javaindex 650e55f0ba..21e817d9e8 100644--- a/core/src/main/java/com/gitplex/server/model/support/MergeStrategy.java+++ b/core/src/main/java/com/gitplex/server/model/support/MergeStrategy.java@@ -1,13 +1,13 @@package com.gitplex.server.model.support;public enum MergeStrategy {- ALWAYS_MERGE("Always Merge",+ ALWAYS_MERGE("Create Merge Commit","Add all commits from source branch to target branch with a merge commit."),- MERGE_IF_NECESSARY("Merge If Necessary",+ MERGE_IF_NECESSARY("Create Merge Commit If Necessary","Only create merge commit if target branch can not be fast-forwarded to source branch"),- SQUASH_MERGE("Squash Merge",+ SQUASH_MERGE("Squash Source Branch Commits","Squash all commits from source branch into a single commit in target branch"),- REBASE_MERGE("Rebase Merge",+ REBASE_MERGE("Rebase Source Branch Commits","Rebase all commits from source branch onto target branch"),DO_NOT_MERGE("Do Not Merge","Do not merge now, only for review");diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.javaindex 59f0722ed5..3da3ca9d96 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/Avatar.java@@ -59,7 +59,7 @@ public class Avatar extends WebComponent {if (avatarChanged.getAccount().getId().equals(accountId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);url = avatarManager.getAvatarUrl(avatarChanged.getAccount());- avatarChanged.getPartialPageRequestHandler().add(this);+ avatarChanged.getHandler().add(this);}}}diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.javaindex b63c11de62..ebd6911c69 100644--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java@@ -107,7 +107,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {if (avatarChanged.getAccount().getId().equals(accountId)) {AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);url = avatarManager.getAvatarUrl(avatarChanged.getAccount());- avatarChanged.getPartialPageRequestHandler().add(this);+ avatarChanged.getHandler().add(this);}}}diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.javaindex fc73425866..384df57806 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java@@ -15,20 +15,23 @@ 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.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;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+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.mapper.parameter.PageParameters;import org.hibernate.StaleStateException;@@ -57,7 +60,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.Requeimport com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;+import com.gitplex.server.web.websocket.PageDataChanged;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import jersey.repackaged.com.google.common.collect.Lists;@@ -478,9 +481,18 @@ public abstract class CodeCommentPanel extends Panel {super.onInitialize();PageParameters params = RequestChangesPage.paramsOf(getComment());- Link<Void> outdatedContextLink = new BookmarkablePageLink<Void>("outdatedContext", RequestChangesPage.class,- params) {+ add(new BookmarkablePageLink<Void>("outdatedContext", RequestChangesPage.class, params) {+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);+ }+ }+@Overrideprotected void onConfigure() {super.onConfigure();@@ -498,18 +510,7 @@ public abstract class CodeCommentPanel extends Panel {}}- };- outdatedContextLink.setOutputMarkupPlaceholderTag(true);- outdatedContextLink.add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(outdatedContextLink);- }-- });-- add(outdatedContextLink);+ }.setOutputMarkupPlaceholderTag(true));add(newCommentContainer());@@ -535,61 +536,103 @@ public abstract class CodeCommentPanel extends Panel {add(newAddReplyContainer());setOutputMarkupId(true);-- add(new WebSocketRenderBehavior() {+ }- @Override- protected void onRender(WebSocketRequestHandler handler) {- Date lastActivityDate;- String prevActivityMarkupId;- if (activitiesView.size() != 0) {- @SuppressWarnings("deprecation")- Component lastActivityContainer = activitiesView.get(activitiesView.size()-1);-- CodeCommentActivity lastActivity = ((ActivityIdentity) lastActivityContainer.getDefaultModelObject()).getActivity();- lastActivityDate = lastActivity.getDate();- prevActivityMarkupId = lastActivityContainer.getMarkupId();- } else {- lastActivityDate = getComment().getDate();- prevActivityMarkupId = get("comment").getMarkupId();- }-- List<CodeCommentActivity> activities = new ArrayList<>();- for (CodeCommentReply reply: getComment().getReplies()) {- if (reply.getDate().getTime()>lastActivityDate.getTime()) {- activities.add(reply);- }- }- for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {- if (statusChange.getDate().getTime()>lastActivityDate.getTime()) {- activities.add(statusChange);- }- }- activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ IPartialPageRequestHandler handler = pageDataChanged.getHandler();++ Date lastActivityDate;+ String prevActivityMarkupId;+ if (activitiesView.size() != 0) {+ @SuppressWarnings("deprecation")+ Component lastActivityContainer = activitiesView.get(activitiesView.size()-1);- for (CodeCommentActivity activity: activities) {- Component newActivityContainer = newActivityContainer(activitiesView.newChildId(), activity);- newActivityContainer.add(AttributeAppender.append("class", "new"));- activitiesView.add(newActivityContainer);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityContainer.getMarkupId(), prevActivityMarkupId);- handler.prependJavaScript(script);- handler.add(newActivityContainer);- prevActivityMarkupId = newActivityContainer.getMarkupId();+ CodeCommentActivity lastActivity = ((ActivityIdentity) lastActivityContainer.getDefaultModelObject()).getActivity();+ lastActivityDate = lastActivity.getDate();+ prevActivityMarkupId = lastActivityContainer.getMarkupId();+ } else {+ lastActivityDate = getComment().getDate();+ prevActivityMarkupId = get("comment").getMarkupId();+ }++ List<CodeCommentActivity> activities = new ArrayList<>();+ for (CodeCommentReply reply: getComment().getReplies()) {+ if (reply.getDate().getTime()>lastActivityDate.getTime()) {+ activities.add(reply);}}-- @Override- protected void onEndInitialRequest(RequestCycle cycle) {- if (SecurityUtils.getAccount() != null) {- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getComment());+ for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {+ if (statusChange.getDate().getTime()>lastActivityDate.getTime()) {+ activities.add(statusChange);}}+ activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));- });+ for (CodeCommentActivity activity: activities) {+ Component newActivityContainer = newActivityContainer(activitiesView.newChildId(), activity);+ newActivityContainer.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityContainer);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityContainer.getMarkupId(), prevActivityMarkupId);+ handler.prependJavaScript(script);+ handler.add(newActivityContainer);+ prevActivityMarkupId = newActivityContainer.getMarkupId();+ }++ if (pageDataChanged.isOnConnect()) {+ 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) {+ if (SecurityUtils.getAccount() != null) {+ GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getComment());+ }+ }++ @Override+ public void onDetach(RequestCycle cycle) {+ }++ @Override+ public void onBeginRequest(RequestCycle cycle) {+ }+ });++ }+ }}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.javaindex 523439a86d..1c49cb2722 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java@@ -26,6 +26,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.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -43,7 +44,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;@@ -90,7 +90,7 @@ import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.util.SuggestionUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;+import com.gitplex.server.web.websocket.PageDataChanged;import com.google.common.base.Objects;import com.google.common.collect.Lists;@@ -388,7 +388,7 @@ public class RevisionDiffPanel extends Panel {public RevisionDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,String oldRev, String newRev, IModel<String> pathFilterModel, IModel<WhitespaceOption> whitespaceOptionModel,- @Nullable IModel<String> blameModel, @Nullable CommentSupport markSupport) {+ @Nullable IModel<String> blameModel, @Nullable CommentSupport commentSupport) {super(id);this.depotModel = depotModel;@@ -422,7 +422,7 @@ public class RevisionDiffPanel extends Panel {};this.whitespaceOptionModel = whitespaceOptionModel;- this.commentSupport = markSupport;+ this.commentSupport = commentSupport;WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(COOKIE_VIEW_MODE);@@ -443,19 +443,19 @@ public class RevisionDiffPanel extends Panel {super.onInitialize();add(new NoAntiCacheImage("icon",new PackageResourceReference(RevisionDiffPanel.class, "indexing.gif")));-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(getComponent());- handler.appendJavaScript("$(window).resize();");- }-- });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() {@@ -1042,7 +1042,18 @@ public class RevisionDiffPanel extends Panel {};commentContainer.setOutputMarkupPlaceholderTag(true);- WebMarkupContainer head = new WebMarkupContainer("head");+ 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);commentContainer.add(head);@@ -1183,16 +1194,6 @@ public class RevisionDiffPanel extends Panel {commentContainer.setVisible(false);}- commentContainer.add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- if (commentContainer.isVisible())- handler.add(head);- }-- });-return commentContainer;}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.javaindex a27cff8659..97a386a838 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownEditor.java@@ -89,7 +89,11 @@ public class MarkdownEditor extends FormComponentPanel<String> {WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(cookieKey);- initialSplit = cookie!=null && "true".equals(cookie.getValue());+ if (cookie!=null && "true".equals(cookie.getValue())) {+ initialSplit = true;+ } else {+ initialSplit = !compactMode;+ }}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.javaindex 1f01f5abed..7b144ef289 100644--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java@@ -36,7 +36,7 @@ import com.gitplex.server.web.behavior.dropdown.DropdownHover;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public class ReviewerListPanel extends GenericPanel<PullRequest> {@@ -53,9 +53,9 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- pullRequestChanged.getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);}}@@ -167,7 +167,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {}reviewersModel.detach();- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}}@@ -210,7 +210,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {request.clearReviewStatus();GitPlex.getInstance(ReviewManager.class).delete(reviewer, request);reviewersModel.detach();- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}});@@ -243,7 +243,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {@Overrideprotected void onSelect(AjaxRequestTarget target, Account user) {super.onSelect(target, user);- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}});diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.javaindex f1d761cf3a..e315898d30 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/MailSettingPage.java@@ -120,7 +120,7 @@ public class MailSettingPage extends AdministrationPage {if (event.getPayload() instanceof EditorChanged) {EditorChanged editorChanged = (EditorChanged) event.getPayload();- editorChanged.getPartialPageRequestHandler().add(testButton);+ editorChanged.getHandler().add(testButton);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.javaindex 49c1900637..32066e5f88 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/base/BasePage.java@@ -18,6 +18,7 @@ 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;@@ -28,6 +29,9 @@ import org.apache.wicket.markup.html.WebPage;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.FeedbackPanel;import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.protocol.ws.api.WebSocketBehavior;+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.protocol.ws.api.message.TextMessage;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -46,6 +50,7 @@ import com.gitplex.server.web.page.init.ServerInitPage;import com.gitplex.server.web.page.security.LoginPage;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;+import com.gitplex.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public abstract class BasePage extends WebPage {@@ -189,6 +194,33 @@ public abstract class BasePage extends WebPage {.add(new AjaxSelfUpdatingTimerBehavior(Duration.milliseconds(sessionTimeout*500L))));add(rootComponents = new RepeatingView("rootComponents"));++ add(new WebSocketBehavior() {++ @Override+ protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {+ super.onMessage(handler, message);++ if (message.getText().equals(WebSocketManager.RENDER_CALLBACK)) {+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(handler, false));+ } else if (message.getText().equals(WebSocketManager.CONNECT_CALLBACK)) {+ /*+ * re-render interesting parts upon websocket connecting after a page is opened,+ * this is necessary in case some web socket render request is sent between the+ * gap of opening a page and a websocket connection is established. For instance+ * when someone creates a pull request, the server will re-render integration+ * preview section of the page after preview is calculated and this may happen+ * before the web socket connection is established. Requiring the page to+ * re-render the integration preview section after connecting will make it+ * displaying correctly+ */+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(handler, true));+ }++ }++ });+}public FeedbackPanel getSessionFeedback() {diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.js b/web/src/main/java/com/gitplex/server/web/page/base/base.jsindex 2405f16152..436ad14376 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/base.js+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.js@@ -362,11 +362,28 @@ gitplex.server = {},setupWebsocketCallback: function() {+ var ajaxCalls = 0;+ Wicket.Event.subscribe('/ajax/call/beforeSend', function() {+ ajaxCalls++;+ });+ Wicket.Event.subscribe('/ajax/call/done', function() {+ ajaxCalls--;+ });Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {- if (message == "RenderCallback")- Wicket.WebSocket.send(message);- else if (message == "ErrorMessage")+ if (message == "RenderCallback") {+ function requestToRender() {+ if (ajaxCalls != 0) {+ setTimeout(function() {+ requestToRender();+ }, 10);+ } else {+ Wicket.WebSocket.send(message);+ }+ }+ requestToRender();+ } else if (message == "ErrorMessage") {$("#websocket-error").show();+ }});Wicket.Event.subscribe("/websocket/open", function(jqEvent) {Wicket.WebSocket.send("ConnectCallback");diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.javaindex 99db279433..46fe8b1b02 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java@@ -28,7 +28,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;@@ -90,10 +89,10 @@ import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;import com.gitplex.server.web.util.resource.RawBlobResourceReference;import com.gitplex.server.web.websocket.CodeCommentChangedRegion;import com.gitplex.server.web.websocket.CommitIndexedRegion;+import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.PullRequestChangedRegion;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;import com.google.common.base.Objects;import com.google.common.base.Preconditions;@@ -277,16 +276,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {}});-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(revisionIndexing);- resizeWindow(handler);- }-- });}/*@@ -1031,8 +1020,11 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {super.onEvent(event);if (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());}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.javaindex ff5b17ff33..bf51e31277 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java@@ -456,7 +456,7 @@ public class CommitOptionPanel extends Panel {super.onEvent(event);if (event.getPayload() instanceof BlobNameChanging) {BlobNameChanging payload = (BlobNameChanging) event.getPayload();- onBlobChange(payload.getPartialPageRequestHandler());+ onBlobChange(payload.getHandler());}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.javaindex c2a009279d..a8391b326a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java@@ -134,7 +134,7 @@ public abstract class BlobEditPanel extends Panel {BlobNameChanging payload = (BlobNameChanging) event.getPayload();String script = String.format("gitplex.server.blobEdit.checkClean('%s', %s);",getMarkupId(), recreateBehavior.getCallbackFunction());- payload.getPartialPageRequestHandler().appendJavaScript(script);+ payload.getHandler().appendJavaScript(script);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javaindex badf5e3713..812069621f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java@@ -25,6 +25,7 @@ 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;@@ -42,7 +43,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;@@ -97,7 +97,7 @@ import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;+import com.gitplex.server.web.websocket.PageDataChanged;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -254,7 +254,18 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc};- WebMarkupContainer head = new WebMarkupContainer("head");+ 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);commentContainer.add(head);@@ -364,16 +375,6 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, SearccommentContainer.setVisible(false);}- commentContainer.add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- if (commentContainer.isVisible())- handler.add(head);- }-- });-add(commentContainer);add(ajaxBehavior = new AbstractPostAjaxBehavior() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.javaindex 336b1c7514..81601013b3 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java@@ -32,7 +32,6 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.Depot;@@ -56,7 +55,6 @@ import com.gitplex.server.web.page.depot.commit.CommitDetailPage;import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.websocket.CodeCommentChangedRegion;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;@@ -86,8 +84,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {private static final String PARAM_WHITESPACE_OPTION = "whitespace-option";- private static final String PARAM_COMMENT = "comment";-private static final String PARAM_MARK = "mark";private static final String PARAM_PATH_FILTER = "path-filter";@@ -125,8 +121,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {params.set(PARAM_PATH_FILTER, state.pathFilter);if (state.blameFile != null)params.set(PARAM_BLAME_FILE, state.blameFile);- if (state.commentId != null)- params.set(PARAM_COMMENT, state.commentId);if (state.mark != null)params.set(PARAM_MARK, state.mark.toString());if (state.tabPanel != null)@@ -173,7 +167,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {state.blameFile = params.get(PARAM_BLAME_FILE).toString();state.whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());- state.commentId = params.get(PARAM_COMMENT).toOptionalLong();state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());state.tabPanel = TabPanel.of(params.get(PARAM_TAB).toString());@@ -244,7 +237,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {@Overrideprotected void onInitialize() {super.onInitialize();-+setOutputMarkupId(true);add(new AffinalRevisionPicker("leftRevSelector", state.leftSide.getDepotId(), state.leftSide.getRevision()) {@@ -259,7 +252,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {newState.whitespaceOption = state.whitespaceOption;newState.compareWithMergeBase = state.compareWithMergeBase;newState.mark = state.mark;- newState.commentId = state.commentId;newState.tabPanel = state.tabPanel;PageParameters params = paramsOf(depot, newState);@@ -294,7 +286,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {newState.rightSide = state.rightSide;newState.whitespaceOption = state.whitespaceOption;newState.compareWithMergeBase = !state.compareWithMergeBase;- newState.commentId = state.commentId;newState.mark = state.mark;newState.tabPanel = state.tabPanel;@@ -340,7 +331,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {newState.tabPanel = state.tabPanel;newState.whitespaceOption = state.whitespaceOption;newState.compareWithMergeBase = state.compareWithMergeBase;- newState.commentId = state.commentId;newState.mark = state.mark;newState.tabPanel = state.tabPanel;@@ -362,7 +352,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {newState.whitespaceOption = state.whitespaceOption;newState.compareWithMergeBase = state.compareWithMergeBase;newState.mark = state.mark;- newState.commentId = state.commentId;setResponsePage(RevisionComparePage.class,paramsOf(getDepot(), newState));}@@ -650,9 +639,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {@Nullablepublic String blameFile;- @Nullable- public Long commentId;-@Nullablepublic CommentPos mark;@@ -666,7 +652,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {whitespaceOption = state.whitespaceOption;pathFilter = state.pathFilter;blameFile = state.blameFile;- commentId = state.commentId;mark = state.mark;tabPanel = state.tabPanel;}@@ -693,64 +678,40 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {}@Override- public String getCommentUrl(CodeComment comment) {- State commentState = new State();- commentState.leftSide = new DepotAndRevision(state.rightSide.getDepot(),- state.compareWithMergeBase?mergeBase.name():leftCommitId.name());- commentState.rightSide = new DepotAndRevision(state.rightSide.getDepot(), rightCommitId.name());- commentState.mark = comment.getCommentPos();- commentState.commentId = comment.getId();- commentState.tabPanel = TabPanel.CHANGES;- commentState.pathFilter = state.pathFilter;- commentState.whitespaceOption = state.whitespaceOption;- commentState.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, paramsOf(commentState.rightSide.getDepot(), commentState)).toString();+ public void onMark(AjaxRequestTarget target, CommentPos mark) {+ state.mark = mark;+ pushState(target);}-+@Override- public CodeComment getOpenComment() {- if (state.commentId != null)- return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);+ public Collection<WebSocketRegion> getWebSocketRegions() {+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ if (state.compareWithMergeBase)+ regions.add(new CommitIndexedRegion(getDepot().getId(), mergeBase));else- return null;+ regions.add(new CommitIndexedRegion(getDepot().getId(), state.leftSide.getCommit()));+ regions.add(new CommitIndexedRegion(getDepot().getId(), state.rightSide.getCommit()));+ return regions;}@Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- state.mark = comment.getCommentPos();- state.commentId = comment.getId();- } else {- state.commentId = null;- state.mark = null;- }- pushState(target);- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ public String getCommentUrl(CodeComment comment) {+ throw new UnsupportedOperationException();}@Override- public void onMark(AjaxRequestTarget target, CommentPos mark) {- state.mark = mark;- pushState(target);+ public CodeComment getOpenComment() {+ return null;}@Override- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {- state.commentId = null;- state.mark = mark;- pushState(target);- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {+ throw new UnsupportedOperationException();}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(getDepot().getId(), state.leftSide.getCommit()));- regions.add(new CommitIndexedRegion(getDepot().getId(), state.rightSide.getCommit()));-- if (state.commentId != null)- regions.add(new CodeCommentChangedRegion(state.commentId));- return regions;+ public void onAddComment(AjaxRequestTarget target, CommentPos commentPos) {+ throw new UnsupportedOperationException();}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.javaindex b3831bdb61..e56c2ad29d 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java@@ -3,6 +3,7 @@ package com.gitplex.server.web.page.depot.pullrequest.newrequest;import java.io.IOException;import java.util.ArrayList;import java.util.Arrays;+import java.util.Collection;import java.util.Date;import java.util.List;import java.util.concurrent.atomic.AtomicReference;@@ -37,7 +38,6 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;-import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.CodeComment;@@ -74,7 +74,9 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailimport com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;import com.gitplex.server.web.page.security.LoginPage;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.CommitIndexedRegion;+import com.gitplex.server.web.websocket.PageDataChanged;+import com.gitplex.server.web.websocket.WebSocketRegion;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -94,8 +96,6 @@ public class NewRequestPage extends DepotPage implements CommentSupport {private IModel<PullRequest> requestModel;- private Long commentId;-private CommentPos mark;private String pathFilter;@@ -559,9 +559,9 @@ public class NewRequestPage extends DepotPage implements CommentSupport {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged payload = (PullRequestChanged) event.getPayload();- payload.getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged payload = (PageDataChanged) event.getPayload();+ payload.getHandler().add(this);}}@@ -682,7 +682,7 @@ public class NewRequestPage extends DepotPage implements CommentSupport {@Overrideprotected void onUpdate(AjaxRequestTarget target) {- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}});@@ -696,7 +696,19 @@ public class NewRequestPage extends DepotPage implements CommentSupport {return getPullRequest().getMergeStrategy().getDescription();}- }));+ }) {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged payload = (PageDataChanged) event.getPayload();+ payload.getHandler().add(this);+ }+ }++ }.setOutputMarkupId(true));form.add(new ReviewerListPanel("reviewers", requestModel));@@ -742,34 +754,17 @@ public class NewRequestPage extends DepotPage implements CommentSupport {@Overridepublic CodeComment getOpenComment() {- if (commentId != null)- return GitPlex.getInstance(CodeCommentManager.class).load(commentId);- else- return null;+ return null;}@Overridepublic void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- commentId = comment.getId();- mark = comment.getCommentPos();- } else {- commentId = null;- }+ throw new UnsupportedOperationException();}@Overridepublic String getCommentUrl(CodeComment comment) {- RevisionComparePage.State state = new RevisionComparePage.State();- mark = comment.getCommentPos();- state.commentId = comment.getId();- state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());- state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());- state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;- state.whitespaceOption = whitespaceOption;- state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();+ throw new UnsupportedOperationException();}@Override@@ -779,8 +774,15 @@ public class NewRequestPage extends DepotPage implements CommentSupport {@Overridepublic void onAddComment(AjaxRequestTarget target, CommentPos mark) {- this.commentId = null;- this.mark = mark;+ throw new UnsupportedOperationException();}+ @Override+ public Collection<WebSocketRegion> getWebSocketRegions() {+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ regions.add(new CommitIndexedRegion(getDepot().getId(), getPullRequest().getBaseCommit()));+ regions.add(new CommitIndexedRegion(getDepot().getId(), getPullRequest().getHeadCommit()));+ return regions;+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.javaindex ed88dc7604..f48668f51f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java@@ -29,7 +29,6 @@ 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.Broadcast;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -45,7 +44,9 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+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.mapper.parameter.PageParameters;import org.apache.wicket.util.visit.IVisit;@@ -87,10 +88,9 @@ import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.WicketUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.model.EntityModel;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.PullRequestChangedRegion;import com.gitplex.server.web.websocket.WebSocketRegion;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;@@ -254,8 +254,8 @@ public abstract class RequestDetailPage extends DepotPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();for (Component child: this) {if (child instanceof MarkupContainer) {MarkupContainer container = (MarkupContainer) child;@@ -268,14 +268,14 @@ public abstract class RequestDetailPage extends DepotPage {});if (form == null) {- pullRequestChanged.getPartialPageRequestHandler().add(child);+ pageDataChanged.getHandler().add(child);}} else if (!(child instanceof Form)) {- pullRequestChanged.getPartialPageRequestHandler().add(child);+ pageDataChanged.getHandler().add(child);}}WicketUtils.markLastVisibleChild(this);- pullRequestChanged.getPartialPageRequestHandler().appendJavaScript("$(window).resize();");+ pageDataChanged.getHandler().appendJavaScript("$(window).resize();");}}@@ -314,21 +314,60 @@ public abstract class RequestDetailPage extends DepotPage {tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(handler));- }-- @Override- protected void onEndInitialRequest(RequestCycle cycle) {- if (SecurityUtils.getAccount() != null)- GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(), getPullRequest());+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ if (pageDataChanged.isOnConnect()) {+ 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) {+ if (SecurityUtils.getAccount() != null) {+ GitPlex.getInstance(VisitInfoManager.class).visit(SecurityUtils.getAccount(),+ getPullRequest());+ }+ }++ @Override+ public void onDetach(RequestCycle cycle) {+ }++ @Override+ public void onBeginRequest(RequestCycle cycle) {+ }++ });}-- });+ }}private WebMarkupContainer newStatusAndBranchesContainer() {@@ -375,9 +414,9 @@ public abstract class RequestDetailPage extends DepotPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- pullRequestChanged.getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);}}@@ -890,8 +929,8 @@ public abstract class RequestDetailPage extends DepotPage {@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- ((PullRequestChanged)event.getPayload()).getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ ((PageDataChanged)event.getPayload()).getHandler().add(this);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.javaindex 905b630088..c585665de6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java@@ -51,7 +51,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailimport com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;import com.gitplex.server.web.websocket.CodeCommentChangedRegion;import com.gitplex.server.web.websocket.CommitIndexedRegion;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.WebSocketManager;import com.gitplex.server.web.websocket.WebSocketRegion;@@ -156,9 +156,9 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupppublic void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- pullRequestChanged.getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.javaindex 438233f7ac..6fd6d0b529 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/mergepreview/MergePreviewPage.java@@ -1,6 +1,7 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview;import java.io.Serializable;+import java.util.Collection;import javax.annotation.Nullable;@@ -15,6 +16,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;@@ -23,7 +25,9 @@ import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.CommitIndexedRegion;+import com.gitplex.server.web.websocket.PageDataChanged;+import com.gitplex.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class MergePreviewPage extends RequestDetailPage {@@ -84,9 +88,9 @@ public class MergePreviewPage extends RequestDetailPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- pullRequestChanged.getPartialPageRequestHandler().add(this);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);}}@@ -175,9 +179,9 @@ public class MergePreviewPage extends RequestDetailPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- newContent(pullRequestChanged.getPartialPageRequestHandler());+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ newContent(pageDataChanged.getHandler());}}@@ -202,6 +206,17 @@ public class MergePreviewPage extends RequestDetailPage {setResponsePage(RequestListPage.class, paramsOf(depot));}+ @Override+ public Collection<WebSocketRegion> getWebSocketRegions() {+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ MergePreview preview = getPullRequest().getMergePreview();+ if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {+ regions.add(new CommitIndexedRegion(getDepot().getId(), ObjectId.fromString(preview.getTargetHead())));+ regions.add(new CommitIndexedRegion(getDepot().getId(), ObjectId.fromString(preview.getMerged())));+ }+ return regions;+ }+private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {PageParameters params = paramsOf(getPullRequest(), state);CharSequence url = RequestCycle.get().urlFor(MergePreviewPage.class, params);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.javaindex ccf8d837df..8a193a3ce9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java@@ -60,7 +60,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.actiimport com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity.UpdatedActivity;import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPage;import com.gitplex.server.web.util.ConfirmOnClick;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PageDataChanged;import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -102,7 +102,7 @@ public class RequestOverviewPage extends RequestDetailPage {if (event.getPayload() instanceof RequestCommentDeleted) {RequestCommentDeleted commentRemoved = (RequestCommentDeleted) event.getPayload();remove();- commentRemoved.getPartialPageRequestHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));+ commentRemoved.getHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));}}@@ -179,9 +179,9 @@ public class RequestOverviewPage extends RequestDetailPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pullRequestChanged.getPartialPageRequestHandler();+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();@SuppressWarnings("deprecation")Component prevActivityRow = activitiesView.get(activitiesView.size()-1);@@ -408,9 +408,9 @@ public class RequestOverviewPage extends RequestDetailPage {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pullRequestChanged.getPartialPageRequestHandler();+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();partialPageRequestHandler.add(this);}@@ -453,7 +453,7 @@ public class RequestOverviewPage extends RequestDetailPage {@Overrideprotected void onUpdate(AjaxRequestTarget target) {GitPlex.getInstance(PullRequestManager.class).saveMergeStrategy(getPullRequest());- send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));}});diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.javaindex fc7811f292..43aaa7d9d0 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java@@ -12,7 +12,7 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.websocket.PullRequestChanged;+import com.gitplex.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")public class SinceChangesLink extends ViewStateAwarePageLink<Void> {@@ -56,9 +56,9 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {public void onEvent(IEvent<?> event) {super.onEvent(event);- if (event.getPayload() instanceof PullRequestChanged) {- PullRequestChanged pullRequestChanged = (PullRequestChanged) event.getPayload();- IPartialPageRequestHandler partialPageRequestHandler = pullRequestChanged.getPartialPageRequestHandler();+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ IPartialPageRequestHandler partialPageRequestHandler = pageDataChanged.getHandler();partialPageRequestHandler.add(this);}}diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.javaindex 524a1816d8..8e83a6fd44 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/LayoutPage.java@@ -11,6 +11,7 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;+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;@@ -19,7 +20,6 @@ import org.apache.wicket.markup.html.link.ExternalLink;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.protocol.ws.api.WebSocketRequestHandler;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.launcher.loader.AppLoader;@@ -45,9 +45,9 @@ import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.security.LoginPage;import com.gitplex.server.web.page.security.LogoutPage;import com.gitplex.server.web.page.security.RegisterPage;+import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.TaskChangedRegion;import com.gitplex.server.web.websocket.WebSocketRegion;-import com.gitplex.server.web.websocket.WebSocketRenderBehavior;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {@@ -110,29 +110,21 @@ public abstract class LayoutPage extends BasePage {head.add(new ViewStateAwarePageLink<Void>("tasks", TaskListPage.class, TaskListPage.paramsOf(user)) {@Override- protected void onInitialize() {- super.onInitialize();-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(getComponent());- }-- });-- setOutputMarkupPlaceholderTag(true);+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof PageDataChanged) {+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();+ pageDataChanged.getHandler().add(this);+ }}-+@Overrideprotected void onConfigure() {super.onConfigure();setVisible(!getLoginUser().getRequestTasks().isEmpty());}- });-+ }.setOutputMarkupPlaceholderTag(true));} else {head.add(new WebMarkupContainer("tasks").setVisible(false));}diff --git a/web/src/main/java/com/gitplex/server/web/util/AjaxPayload.java b/web/src/main/java/com/gitplex/server/web/util/AjaxPayload.javaindex 26428e265d..9d67406b65 100644--- a/web/src/main/java/com/gitplex/server/web/util/AjaxPayload.java+++ b/web/src/main/java/com/gitplex/server/web/util/AjaxPayload.java@@ -4,14 +4,14 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;public class AjaxPayload {- private final IPartialPageRequestHandler partialPageRequestHandler;+ private final IPartialPageRequestHandler handler;- public AjaxPayload(IPartialPageRequestHandler partialPageRequestHandler) {- this.partialPageRequestHandler = partialPageRequestHandler;+ public AjaxPayload(IPartialPageRequestHandler handler) {+ this.handler = handler;}- public IPartialPageRequestHandler getPartialPageRequestHandler() {- return partialPageRequestHandler;+ public IPartialPageRequestHandler getHandler() {+ return handler;}}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PageDataChanged.java b/web/src/main/java/com/gitplex/server/web/websocket/PageDataChanged.javanew file mode 100644index 0000000000..6fee879bc7--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/websocket/PageDataChanged.java@@ -0,0 +1,24 @@+package com.gitplex.server.web.websocket;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import com.gitplex.server.web.util.AjaxPayload;++public class PageDataChanged extends AjaxPayload {++ private final boolean onConnect;++ public PageDataChanged(IPartialPageRequestHandler handler, boolean onConnect) {+ super(handler);+ this.onConnect = onConnect;+ }++ public PageDataChanged(IPartialPageRequestHandler handler) {+ this(handler, false);+ }++ public boolean isOnConnect() {+ return onConnect;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.javadeleted file mode 100644index 93058337ee..0000000000--- a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChanged.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.websocket;--import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;--import com.gitplex.server.web.util.AjaxPayload;--public class PullRequestChanged extends AjaxPayload {-- public PullRequestChanged(IPartialPageRequestHandler partialPageRequestHandler) {- super(partialPageRequestHandler);- }--}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.javaindex 8253cf7f5a..abc063ab5c 100644--- a/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java+++ b/web/src/main/java/com/gitplex/server/web/websocket/PullRequestChangedRegion.java@@ -13,8 +13,8 @@ public class PullRequestChangedRegion implements WebSocketRegion {@Overridepublic boolean contains(WebSocketRegion region) {if (region instanceof PullRequestChangedRegion) {- PullRequestChangedRegion pullRequestChangedRegion = (PullRequestChangedRegion) region;- return requestId.equals(pullRequestChangedRegion.requestId);+ PullRequestChangedRegion pageDataChangedRegion = (PullRequestChangedRegion) region;+ return requestId.equals(pageDataChangedRegion.requestId);} else {return false;}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.javaindex a0aa344223..4c79d0d7ac 100644--- a/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java+++ b/web/src/main/java/com/gitplex/server/web/websocket/TaskChangedRegion.java@@ -13,8 +13,8 @@ public class TaskChangedRegion implements WebSocketRegion {@Overridepublic boolean contains(WebSocketRegion region) {if (region instanceof TaskChangedRegion) {- TaskChangedRegion pullRequestChangedRegion = (TaskChangedRegion) region;- return userId.equals(pullRequestChangedRegion.userId);+ TaskChangedRegion pageDataChangedRegion = (TaskChangedRegion) region;+ return userId.equals(pageDataChangedRegion.userId);} else {return false;}diff --git a/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.java b/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.javadeleted file mode 100644index a81e2ccc42..0000000000--- a/web/src/main/java/com/gitplex/server/web/websocket/WebSocketRenderBehavior.java+++ /dev/null@@ -1,96 +0,0 @@-package com.gitplex.server.web.websocket;--import org.apache.wicket.Component;-import org.apache.wicket.protocol.ws.api.WebSocketBehavior;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.protocol.ws.api.message.TextMessage;-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;--@SuppressWarnings("serial")-public abstract class WebSocketRenderBehavior extends WebSocketBehavior {-- private Component component;-- @Override- public void bind(Component component) {- super.bind(component);- this.component = component;- }-- @Override- protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {- super.onMessage(handler, message);-- if (message.getText().equals(WebSocketManager.RENDER_CALLBACK)) {- onRender(handler);- } else if (message.getText().equals(WebSocketManager.CONNECT_CALLBACK)) {- /*- * re-render interesting parts upon websocket connecting after a page is opened,- * this is necessary in case some web socket render request is sent between the- * gap of opening a page and a websocket connection is established. For instance- * when someone creates a pull request, the server will re-render integration- * preview section of the page after preview is calculated and this may happen- * before the web socket connection is established. Requiring the page to- * re-render the integration preview section after connecting will make it- * displaying correctly- */- 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) {- WebSocketRenderBehavior.this.onEndInitialRequest(cycle);- }-- @Override- public void onDetach(RequestCycle cycle) {- }-- @Override- public void onBeginRequest(RequestCycle cycle) {- }-- });-- onRender(handler);- }-- }-- protected void onEndInitialRequest(RequestCycle cycle) {- }-- public Component getComponent() {- return component;- }-- protected abstract void onRender(WebSocketRequestHandler handler);--}