The Unified and Autonomous Development Platform
Refactor blob view and blob edit page
robin shena91eb57b4b6f
diff --git a/core/src/main/java/com/gitplex/server/git/Blob.java b/core/src/main/java/com/gitplex/server/git/Blob.javaindex 1d06e83c3b..ad8fec6ac5 100644--- a/core/src/main/java/com/gitplex/server/git/Blob.java+++ b/core/src/main/java/com/gitplex/server/git/Blob.java@@ -27,8 +27,8 @@ public class Blob {private transient Optional<Text> optionalText;- public Blob(BlobIdent ident, ObjectId id, byte[] bytes) {- this(ident, id, bytes, bytes.length);+ public Blob(BlobIdent ident, ObjectId blobId, byte[] bytes) {+ this(ident, blobId, bytes, bytes.length);}public Blob(BlobIdent ident, ObjectId blobId, byte[] bytes, long size) {diff --git a/core/src/main/java/com/gitplex/server/git/FileEdit.java b/core/src/main/java/com/gitplex/server/git/BlobEdit.javasimilarity index 93%rename from core/src/main/java/com/gitplex/server/git/FileEdit.javarename to core/src/main/java/com/gitplex/server/git/BlobEdit.javaindex 2e662ea142..81ae4b1155 100644--- a/core/src/main/java/com/gitplex/server/git/FileEdit.java+++ b/core/src/main/java/com/gitplex/server/git/BlobEdit.java@@ -30,19 +30,19 @@ import com.gitplex.server.git.exception.ObsoleteCommitException;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;-public class FileEdit implements Serializable {+public class BlobEdit implements Serializable {private static final long serialVersionUID = 1L;private final String oldPath;- private final PathAndContent newFile;+ private final PathAndContent newBlob;- public FileEdit(@Nullable String oldPath, @Nullable PathAndContent newFile) {+ public BlobEdit(@Nullable String oldPath, @Nullable PathAndContent newBlob) {this.oldPath = GitUtils.normalizePath(oldPath);- this.newFile = newFile;+ this.newBlob = newBlob;- Preconditions.checkArgument(this.oldPath != null || this.newFile != null,+ Preconditions.checkArgument(this.oldPath != null || this.newBlob != null,"Either oldPath or newFile should be defined");}@@ -50,8 +50,8 @@ public class FileEdit implements Serializable {return oldPath;}- public PathAndContent getNewFile() {- return newFile;+ public PathAndContent getNewBlob() {+ return newBlob;}private ObjectId insertTree(RevTree revTree, TreeWalk treeWalk, ObjectInserter inserter,@@ -65,7 +65,7 @@ public class FileEdit implements Serializable {if (name.equals(currentOldPath)) {if (name.equals(currentNewPath)) {newPathFound = true;- ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, newFile.getContent());+ ObjectId blobId = inserter.insert(Constants.OBJ_BLOB, newBlob.getContent());entries.add(new TreeFormatterEntry(name, newFileMode, blobId));}} else if (name.equals(currentNewPath)) {@@ -113,7 +113,7 @@ public class FileEdit implements Serializable {for (int i=splitted.size()-1; i>=0; i--) {if (childId == null) {childName = splitted.get(i);- childId = inserter.insert(Constants.OBJ_BLOB, newFile.getContent());+ childId = inserter.insert(Constants.OBJ_BLOB, newBlob.getContent());childMode = newFileMode;} else {TreeFormatter childFormatter = new TreeFormatter();@@ -200,8 +200,8 @@ public class FileEdit implements Serializable {}String newPath;- if (newFile != null)- newPath = GitUtils.normalizePath(newFile.getPath());+ if (newBlob != null)+ newPath = GitUtils.normalizePath(newBlob.getPath());elsenewPath = null;ObjectId treeId = insertTree(revTree, treeWalk, inserter, oldPath, newPath, newFileMode);diff --git a/core/src/main/java/com/gitplex/server/git/BlobIdent.java b/core/src/main/java/com/gitplex/server/git/BlobIdent.javaindex 191c5ed746..b83ae6f473 100644--- a/core/src/main/java/com/gitplex/server/git/BlobIdent.java+++ b/core/src/main/java/com/gitplex/server/git/BlobIdent.java@@ -80,6 +80,7 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {return (FileMode.TYPE_MASK & mode) == FileMode.TYPE_FILE;}+ @Nullablepublic String getName() {if (path != null) {return path.substring(path.lastIndexOf('/')+1);diff --git a/core/src/main/java/com/gitplex/server/util/FileUtils.java b/core/src/main/java/com/gitplex/server/util/FileUtils.javaindex 11127e0951..f92db0c6c3 100644--- a/core/src/main/java/com/gitplex/server/util/FileUtils.java+++ b/core/src/main/java/com/gitplex/server/util/FileUtils.java@@ -332,4 +332,5 @@ public class FileUtils extends org.apache.commons.io.FileUtils {return result;}+}diff --git a/core/src/main/java/com/gitplex/server/util/Provider.java b/core/src/main/java/com/gitplex/server/util/Provider.javanew file mode 100644index 0000000000..424fe4e107--- /dev/null+++ b/core/src/main/java/com/gitplex/server/util/Provider.java@@ -0,0 +1,7 @@+package com.gitplex.server.util;++import java.io.Serializable;++public interface Provider<T> extends Serializable {+ T get();+}\ No newline at end of filediff --git a/core/src/test/java/com/gitplex/server/git/FileEditTest.java b/core/src/test/java/com/gitplex/server/git/BlobEditTest.javasimilarity index 93%rename from core/src/test/java/com/gitplex/server/git/FileEditTest.javarename to core/src/test/java/com/gitplex/server/git/BlobEditTest.javaindex 5af51b9338..cc26053541 100644--- a/core/src/test/java/com/gitplex/server/git/FileEditTest.java+++ b/core/src/test/java/com/gitplex/server/git/BlobEditTest.java@@ -12,7 +12,7 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;import org.junit.Test;-import com.gitplex.server.git.FileEdit;+import com.gitplex.server.git.BlobEdit;import com.gitplex.server.git.PathAndContent;import com.gitplex.server.git.exception.ObjectAlreadyExistsException;import com.gitplex.server.git.exception.ObjectNotFoundException;@@ -20,7 +20,7 @@ import com.gitplex.server.git.exception.NotFileException;import com.gitplex.server.git.exception.NotTreeException;import com.gitplex.server.git.exception.ObsoleteCommitException;-public class FileEditTest extends AbstractGitTest {+public class BlobEditTest extends AbstractGitTest {@Testpublic void testRemoveFile() throws IOException {@@ -36,7 +36,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit("/server/src/com/example/a//a.java", null);+ BlobEdit edit = new BlobEdit("/server/src/com/example/a//a.java", null);ObjectId newCommitId = edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test delete");try (RevWalk revWalk = new RevWalk(git.getRepository())) {@@ -62,7 +62,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit("/server/src/com/example/c//c.java", null);+ BlobEdit edit = new BlobEdit("/server/src/com/example/c//c.java", null);try {edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test delete");assertTrue("An ObjectNotExistException should be thrown", false);@@ -84,7 +84,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit("server/src/com/example/a/a.java",+ BlobEdit edit = new BlobEdit("server/src/com/example/a/a.java",new PathAndContent.Immutable("client/c.java", "a".getBytes()));ObjectId newCommitId = edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename");try (RevWalk revWalk = new RevWalk(git.getRepository())) {@@ -111,7 +111,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit("server/src/com/example/a",+ BlobEdit edit = new BlobEdit("server/src/com/example/a",new PathAndContent.Immutable("client/c.java", "a".getBytes()));try {edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename tree");@@ -134,7 +134,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit("server/src/com/example/a/a.java",+ BlobEdit edit = new BlobEdit("server/src/com/example/a/a.java",new PathAndContent.Immutable("client/a.java/a.java", "a".getBytes()));try {edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename tree");@@ -157,7 +157,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit(null, new PathAndContent.Immutable("/server/src/com/example/c/c.java", "c".getBytes()));+ BlobEdit edit = new BlobEdit(null, new PathAndContent.Immutable("/server/src/com/example/c/c.java", "c".getBytes()));ObjectId newCommitId = edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");try (RevWalk revWalk = new RevWalk(git.getRepository())) {@@ -170,7 +170,7 @@ public class FileEditTest extends AbstractGitTest {}oldCommitId = newCommitId;- edit = new FileEdit(null, new PathAndContent.Immutable("/common/common.java", "common".getBytes()));+ edit = new BlobEdit(null, new PathAndContent.Immutable("/common/common.java", "common".getBytes()));newCommitId = edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");try (RevWalk revWalk = new RevWalk(git.getRepository())) {@@ -198,7 +198,7 @@ public class FileEditTest extends AbstractGitTest {String refName = "refs/heads/master";ObjectId oldCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit(null, new PathAndContent.Immutable("client/a.java", "a".getBytes()));+ BlobEdit edit = new BlobEdit(null, new PathAndContent.Immutable("client/a.java", "a".getBytes()));try {edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test rename tree");assertTrue("An ObjectAlreadyExistException should be thrown", false);@@ -217,7 +217,7 @@ public class FileEditTest extends AbstractGitTest {ObjectId newCommitId = git.getRepository().resolve(refName);- FileEdit edit = new FileEdit(null, new PathAndContent.Immutable("/server/src/com/example/c/c.java", "c".getBytes()));+ BlobEdit edit = new BlobEdit(null, new PathAndContent.Immutable("/server/src/com/example/c/c.java", "c".getBytes()));try {edit.commit(git.getRepository(), refName, oldCommitId, oldCommitId, user, "test add");assertTrue("An ObsoleteCommitException should be thrown", false);diff --git a/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java b/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.javaindex f754a511d5..036c0153ce 100644--- a/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java+++ b/search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java@@ -123,14 +123,16 @@ public class SymbolQuery extends BlobQuery {}if (tooGeneral)throw new TooGeneralQueryException();-- String fieldName;- if (primary)- fieldName = BLOB_PRIMARY_SYMBOLS.name();- else- fieldName = BLOB_SECONDARY_SYMBOLS.name();-- query.add(new WildcardQuery(new Term(fieldName, term.toLowerCase())), Occur.MUST);++ if (primary != null) {+ String fieldName;+ if (primary)+ fieldName = BLOB_PRIMARY_SYMBOLS.name();+ else+ fieldName = BLOB_SECONDARY_SYMBOLS.name();++ query.add(new WildcardQuery(new Term(fieldName, term.toLowerCase())), Occur.MUST);+ }}public static class Builder {diff --git a/web/src/main/java/com/gitplex/server/web/ComponentRenderer.java b/web/src/main/java/com/gitplex/server/web/ComponentRenderer.javanew file mode 100644index 0000000000..e8770e22b8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/ComponentRenderer.java@@ -0,0 +1,11 @@+package com.gitplex.server.web;++import java.io.Serializable;++import org.apache.wicket.Component;++public interface ComponentRenderer extends Serializable {++ Component render(String componentId);++}diff --git a/web/src/main/java/com/gitplex/server/web/WicketConfig.java b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/WicketConfig.javarename to web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.javaindex af1e2b54c7..db00d88cd4 100644--- a/web/src/main/java/com/gitplex/server/web/WicketConfig.java+++ b/web/src/main/java/com/gitplex/server/web/GitPlexWebApplication.java@@ -62,7 +62,7 @@ import com.gitplex.server.web.websocket.WebSocketManager;import de.agilecoders.wicket.core.settings.BootstrapSettings;@Singleton-public class WicketConfig extends WebApplication {+public class GitPlexWebApplication extends WebApplication {private final Set<ExpectedExceptionContribution> expectedExceptionContributions;@@ -206,12 +206,12 @@ public class WicketConfig extends WebApplication {}@Inject- public WicketConfig(Set<ExpectedExceptionContribution> expectedExceptionContributions) {+ public GitPlexWebApplication(Set<ExpectedExceptionContribution> expectedExceptionContributions) {this.expectedExceptionContributions = expectedExceptionContributions;}- public static WicketConfig get() {- return (WicketConfig) Application.get();+ public static GitPlexWebApplication get() {+ return (GitPlexWebApplication) Application.get();}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/PrioritizedComponentRenderer.java b/web/src/main/java/com/gitplex/server/web/PrioritizedComponentRenderer.javanew file mode 100644index 0000000000..e7d5fc91e8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/PrioritizedComponentRenderer.java@@ -0,0 +1,12 @@+package com.gitplex.server.web;++import org.apache.wicket.Component;++public interface PrioritizedComponentRenderer extends ComponentRenderer {++ @Override+ Component render(String componentId);++ int getPriority();++}diff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.javaindex 126ccb62e8..1c7bd0d55c 100644--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java+++ b/web/src/main/java/com/gitplex/server/web/UrlMapper.java@@ -33,13 +33,13 @@ import com.gitplex.server.web.page.admin.SystemSettingPage;import com.gitplex.server.web.page.admin.account.NewUserPage;import com.gitplex.server.web.page.admin.account.UserListPage;import com.gitplex.server.web.page.depot.NoBranchesPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;import com.gitplex.server.web.page.depot.comments.CodeCommentPage;import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@@ -153,7 +153,7 @@ public class UrlMapper extends CompoundRequestMapper {}private void addDepotPages() {- add(new WebPageMapper("${account}/${depot}", DepotFilePage.class) {+ add(new WebPageMapper("${account}/${depot}", DepotBlobPage.class) {@Overridepublic IRequestHandler mapRequest(Request request) {@@ -165,7 +165,7 @@ public class UrlMapper extends CompoundRequestMapper {});- add(new DepotMapper("${account}/${depot}/blob/#{revision}/#{path}", DepotFilePage.class));+ add(new DepotMapper("${account}/${depot}/blob/#{revision}/#{path}", DepotBlobPage.class));add(new DepotMapper("${account}/${depot}/commit/${revision}", CommitDetailPage.class));add(new DepotMapper("${account}/${depot}/commits", DepotCommitsPage.class));add(new DepotMapper("${account}/${depot}/compare", RevisionComparePage.class));diff --git a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java b/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.javaindex 07974204a0..b939ec7930 100644--- a/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java+++ b/web/src/main/java/com/gitplex/server/web/WebAccountNameReservation.java@@ -25,10 +25,10 @@ public class WebAccountNameReservation implements AccountNameReservation {private final Provider<ServletContextHandler> servletContextHandlerProvider;- private final WicketConfig webApp;+ private final GitPlexWebApplication webApp;@Inject- public WebAccountNameReservation(Provider<ServletContextHandler> servletContextHandlerProvider, WicketConfig webApp) {+ public WebAccountNameReservation(Provider<ServletContextHandler> servletContextHandlerProvider, GitPlexWebApplication webApp) {this.servletContextHandlerProvider = servletContextHandlerProvider;this.webApp = webApp;}diff --git a/web/src/main/java/com/gitplex/server/web/WebModule.java b/web/src/main/java/com/gitplex/server/web/WebModule.javaindex 2d5393ea9c..ca8267518b 100644--- a/web/src/main/java/com/gitplex/server/web/WebModule.java+++ b/web/src/main/java/com/gitplex/server/web/WebModule.java@@ -30,12 +30,12 @@ import com.gitplex.server.util.validation.TeamNameReservation;import com.gitplex.server.web.behavior.markdown.EmojiTransformer;import com.gitplex.server.web.component.comment.MentionTransformer;import com.gitplex.server.web.component.comment.PullRequestTransformer;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;import com.gitplex.server.web.component.diff.DiffRenderer;import com.gitplex.server.web.editable.DefaultEditSupportRegistry;import com.gitplex.server.web.editable.EditSupport;import com.gitplex.server.web.editable.EditSupportLocator;import com.gitplex.server.web.editable.EditSupportRegistry;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;import com.gitplex.server.web.util.avatar.AvatarManager;import com.gitplex.server.web.util.avatar.DefaultAvatarManager;import com.gitplex.server.web.util.commitmessagetransform.CommitMessageTransformer;@@ -93,8 +93,8 @@ public class WebModule extends AbstractPluginModule {}});- bind(WebApplication.class).to(WicketConfig.class);- bind(Application.class).to(WicketConfig.class);+ bind(WebApplication.class).to(GitPlexWebApplication.class);+ bind(Application.class).to(GitPlexWebApplication.class);bind(AvatarManager.class).to(DefaultAvatarManager.class);bind(WebSocketManager.class).to(DefaultWebSocketManager.class);@@ -107,7 +107,7 @@ public class WebModule extends AbstractPluginModule {bind(CommitIndexedBroadcaster.class);contributeFromPackage(DiffRenderer.class, DiffRenderer.class);- contributeFromPackage(BlobRenderer.class, BlobRenderer.class);+ contributeFromPackage(BlobRendererContribution.class, BlobRendererContribution.class);contribute(MarkdownExtension.class, new MarkdownExtension() {diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.javaindex 7b1271058e..99a59cb662 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/assets/js/align/AlignResourceReference.java@@ -21,7 +21,8 @@ public class AlignResourceReference extends JavaScriptResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = new ArrayList<>();- dependencies.add(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(+ Application.get().getJavaScriptLibrarySettings().getJQueryReference()));dependencies.add(JavaScriptHeaderItem.forReference(new TextareaCaretPositionResourceReference()));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js b/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.jsindex 448e2be8ab..82685b76db 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js+++ b/web/src/main/java/com/gitplex/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js@@ -22,7 +22,7 @@'silent' : false,'addRemoveFieldsMarksDirty' : false,'fieldEvents' : 'change keyup propertychange input',- 'fieldSelector': ":input:not(input[type=submit]):not(input[type=button]):not(button)"+ 'fieldSelector': ":input:not(.no-dirtytrack):not(input[type=submit]):not(input[type=button]):not(button)"}, options);var getValue = function($field) {diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/BootstrapMarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/BootstrapMarkdownResourceReference.javanew file mode 100644index 0000000000..0cd51cee22--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/BootstrapMarkdownResourceReference.java@@ -0,0 +1,31 @@+package com.gitplex.server.web.assets.js.bootstrapmarkdown;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Application;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.request.resource.CssResourceReference;+import org.apache.wicket.request.resource.JavaScriptResourceReference;++public class BootstrapMarkdownResourceReference extends JavaScriptResourceReference {++ private static final long serialVersionUID = 1L;++ public BootstrapMarkdownResourceReference() {+ super(BootstrapMarkdownResourceReference.class, "bootstrap-markdown.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = new ArrayList<>();+ dependencies.add(JavaScriptHeaderItem.forReference(+ Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(+ BootstrapMarkdownResourceReference.class, "bootstrap-markdown.min.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.js b/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/bootstrap-markdown.jssimilarity index 99%rename from web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.jsrename to web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/bootstrap-markdown.jsindex 94f317f508..d3417bc518 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.js+++ b/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/bootstrap-markdown.js@@ -216,12 +216,16 @@$editor.addClass('md-fullscreen-mode');$('body').addClass('md-nooverflow');this.$options.onFullscreen(this);+ if (autosize)+ autosize.destroy($editor.find("textarea"));} else {$editor.removeClass('md-fullscreen-mode');$('body').removeClass('md-nooverflow');if (this.$isPreview == true) this.hidePreview().showPreview()this.$options.onExitFullscreen(this);+ if (autosize)+ autosize($editor.find("textarea"));}this.$isFullscreen = mode;diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.min.css b/web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/bootstrap-markdown.min.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/behavior/markdown/bootstrap-markdown.min.cssrename to web/src/main/java/com/gitplex/server/web/assets/js/bootstrapmarkdown/bootstrap-markdown.min.cssdiff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.javaindex af2e70c391..bc7ff06318 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/CodeMirrorResourceReference.java@@ -43,6 +43,7 @@ public class CodeMirrorResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/selection/active-line.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/scroll/annotatescrollbar.js")));dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/display/fullscreen.js")));+ dependencies.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("codemirror/current/addon/selection/mark-selection.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "annotatescrollbar2.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "simplescrollbars.js")));dependencies.add(JavaScriptHeaderItem.forReference(new BaseDependentResourceReference(CodeMirrorResourceReference.class, "gotoline.js")));diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.jsindex 8ca00074aa..e517a1a20a 100644--- a/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js+++ b/web/src/main/java/com/gitplex/server/web/assets/js/codemirror/codemirror.js@@ -47,29 +47,17 @@ gitplex.server.codemirror = {var scroll = {left: scrollInfo.left, top: scrollInfo.top};return {cursor: cursor, scroll: scroll};},- initState: function(cm, viewState) {- if (!viewState) {- viewState = gitplex.server.history.getViewState();- }-- if (viewState) {- if (viewState.cursor) {- cm.setCursor(viewState.cursor);- if (!viewState.scroll) {- var h = cm.getScrollInfo().clientHeight;- var coords = cm.charCoords({line: viewState.cursor.line, ch: 0}, "local");- cm.scrollTo(null, (coords.top + coords.bottom - h) / 2);- }- }- if (viewState.scroll) {- // use a timeout to make sure we scroll after possible viewport resize- setTimeout(function() {- cm.scrollTo(viewState.scroll.left, viewState.scroll.top);- }, 10);- }- }-- CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";- cm.focus();+ setViewState: function(cm, viewState) {+ if (viewState.cursor) {+ cm.setCursor(viewState.cursor);+ if (!viewState.scroll) {+ var h = cm.getScrollInfo().clientHeight;+ var coords = cm.charCoords({line: viewState.cursor.line, ch: 0}, "local");+ cm.scrollTo(null, (coords.top + coords.bottom - h) / 2);+ }+ }+ if (viewState.scroll) {+ cm.scrollTo(viewState.scroll.left, viewState.scroll.top);+ }}};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/MarkdownPreviewResourceReference.javasimilarity index 50%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.javarename to web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/MarkdownPreviewResourceReference.javaindex abfc318bc7..b3fe7c0838 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/MarkdownPreviewResourceReference.java@@ -1,30 +1,29 @@-package com.gitplex.server.web.component.depotfile.fileedit;+package com.gitplex.server.web.assets.js.markdownpreview;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;-import com.gitplex.server.web.assets.js.diffmatchpatch.DiffMatchPatchResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class FileEditResourceReference extends BaseDependentResourceReference {+public class MarkdownPreviewResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public FileEditResourceReference() {- super(FileEditResourceReference.class, "file-edit.js");+ public MarkdownPreviewResourceReference() {+ super(MarkdownPreviewResourceReference.class, "markdown-preview.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new DiffMatchPatchResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(FileEditResourceReference.class, "file-edit.css")));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ MarkdownPreviewResourceReference.class, "markdown-preview.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/markdown-preview.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/markdown/markdown.cssrename to web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/markdown-preview.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/markdown-preview.jssimilarity index 91%rename from web/src/main/java/com/gitplex/server/web/component/markdown/markdown.jsrename to web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/markdown-preview.jsindex 9027c5c8a7..9ce123ccaa 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/gitplex/server/web/assets/js/markdownpreview/markdown-preview.js@@ -1,4 +1,4 @@-gitplex.server.initMarkdownPanel = function($preview, taskCallback) {+gitplex.server.initMarkdownPreview = function($preview, taskCallback) {gitplex.server.highlight($preview);var $task = $preview.find('.task-list-item input');if (taskCallback) {@@ -8,7 +8,7 @@ gitplex.server.initMarkdownPanel = function($preview, taskCallback) {} else {$task.attr("disabled", "disabled");}-+$preview.find("h1, h2, h3, h4, h5, h6").each(function() {var $this = $(this);var $anchor = $this.find(">a[name]");@@ -22,4 +22,4 @@ gitplex.server.initMarkdownPanel = function($preview, taskCallback) {$this.append("<a href='#" + anchorName + "' class='permalink'><i class='fa fa-link'></i></a>");}});-};\ No newline at end of file+};diff --git a/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.javadeleted file mode 100644index 73d0b42881..0000000000--- a/web/src/main/java/com/gitplex/server/web/behavior/ViewStateAwareBehavior.java+++ /dev/null@@ -1,31 +0,0 @@-package com.gitplex.server.web.behavior;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;--import com.gitplex.server.web.assets.js.uri.URIResourceReference;--@SuppressWarnings("serial")-public class ViewStateAwareBehavior extends Behavior {-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- response.render(JavaScriptHeaderItem.forReference(new URIResourceReference()));- String script = String.format(""- + "var viewState = gitplex.server.history.getViewState();"- + "if (viewState) {"- + " var link = document.getElementById('%s');"- + " var uri = new URI(link);"- + " uri.removeSearch('view_state');"- + " uri.addSearch('view_state', JSON.stringify(viewState));"- + " $(link).attr('href', uri.href());"- + "}", component.getMarkupId(true));- response.render(OnDomReadyHeaderItem.forScript(script));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.javaindex 3683512f67..1af334a388 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java@@ -57,7 +57,7 @@ public class MarkdownBehavior extends AbstractPostAjaxBehavior {String script = String.format(""+ "var $preview=$('#%s~.md-preview');"+ "$preview.html('%s');"- + "gitplex.server.initMarkdownPanel($preview);",+ + "gitplex.server.initMarkdownPreview($preview);",getComponent().getMarkupId(), StringEscapeUtils.escapeEcmaScript(preview));target.appendJavaScript(script);} else if (type.equals("emojiQuery")){diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.javaindex 9620a0dc7f..42ffe8434c 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownResourceReference.java@@ -6,12 +6,12 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import org.apache.wicket.request.resource.JavaScriptResourceReference;import com.gitplex.server.web.assets.js.atwho.AtWhoResourceReference;+import com.gitplex.server.web.assets.js.bootstrapmarkdown.BootstrapMarkdownResourceReference;import com.gitplex.server.web.assets.js.caret.CaretResourceReference;-import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;import com.gitplex.server.web.assets.js.hotkeys.HotkeysResourceReference;+import com.gitplex.server.web.assets.js.markdownpreview.MarkdownPreviewResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;public class MarkdownResourceReference extends BaseDependentResourceReference {@@ -27,11 +27,11 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CaretResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AtWhoResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));- dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(MarkdownResourceReference.class, "bootstrap-markdown.js")));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(MarkdownResourceReference.class, "bootstrap-markdown.min.css")));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(MarkdownResourceReference.class, "markdown.css")));+ dependencies.add(JavaScriptHeaderItem.forReference(new BootstrapMarkdownResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new MarkdownPreviewResourceReference()));+ dependencies.add(CssHeaderItem.forReference(+ new CssResourceReference(MarkdownResourceReference.class, "markdown.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.cssindex 88681ed7b3..115465981c 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.css+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.css@@ -100,4 +100,4 @@}.md-control-fullscreen, .exit-fullscreen {display: none;-}\ No newline at end of file+}diff --git a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.javaindex b0f5ec305f..e5bfb60501 100644--- a/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/DepotPicker.java@@ -10,8 +10,8 @@ import org.apache.wicket.model.Model;import com.gitplex.server.GitPlex;import com.gitplex.server.model.Depot;import com.gitplex.server.persistence.dao.Dao;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.depotselector.DepotSelector;+import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")public abstract class DepotPicker extends DropdownLink {diff --git a/web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.java b/web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.javadeleted file mode 100644index a06eeb656a..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/ViewStateAwareAjaxLink.java+++ /dev/null@@ -1,46 +0,0 @@-package com.gitplex.server.web.component;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.cycle.RequestCycle;--@SuppressWarnings("serial")-public abstract class ViewStateAwareAjaxLink<T> extends PreventDefaultAjaxLink<T> {-- public ViewStateAwareAjaxLink(String id) {- super(id);- }-- public ViewStateAwareAjaxLink(String id, IModel<T> model) {- super(id, model);- }-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setMethod(Method.POST);-- String script = ""- + "$('.autofit:visible').first().trigger('storeViewState');"- + "var viewState = gitplex.server.history.getViewState();"- + "return viewState?JSON.stringify(viewState):'';";- attributes.getDynamicExtraParameters().add("return {view_state: function() {" + script + "}}");- }-- @Override- public final void onClick(AjaxRequestTarget target) {- String value = RequestCycle.get().getRequest().getPostParameters()- .getParameterValue("view_state").toString();- if (StringUtils.isNotBlank(value))- onClick(target, value);- else- onClick(target, null);- }-- protected abstract void onClick(AjaxRequestTarget target, @Nullable String viewState);-}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 b908bb6f76..87d01498c0 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@@ -6,7 +6,6 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -16,6 +15,7 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.model.Account;import com.gitplex.server.web.behavior.TooltipBehavior;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.util.avatar.AvatarManager;@@ -23,7 +23,7 @@ import com.gitplex.server.web.util.avatar.AvatarManager;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;@SuppressWarnings("serial")-public class AvatarLink extends BookmarkablePageLink<Void> {+public class AvatarLink extends ViewStateAwarePageLink<Void> {private final Long accountId;diff --git a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.javaindex d9988065d1..296cf0daef 100644--- a/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/branchpicker/BranchPicker.java@@ -7,7 +7,7 @@ import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;import com.gitplex.server.model.Depot;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")public abstract class BranchPicker extends DropdownLink {diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javaindex 91d792013f..8816e5493a 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java@@ -42,11 +42,11 @@ import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.util.DateUtils;@@ -145,7 +145,7 @@ public abstract class CodeCommentListPanel extends Panel {if (!compareContext.getCompareCommit().equals(comment.getCommentPos().getCommit())) {setResponsePage(RevisionComparePage.class, RevisionComparePage.paramsOf(depot, comment, null));} else {- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot, comment, null));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot, comment, null));}}}diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.htmlindex 3b5f814fb7..403507d7a1 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html@@ -9,11 +9,11 @@<div class="detail"><div class="head clearfix"><a wicket:id="userName" class="user-name pull-left"></a>- <a wicket:id="compareContext" class="compare-context pull-right"><i class="fa fa-chain-broken"></i></a><span class="activity pull-right"><span wicket:id="activityDescription" class="description"></span><span wicket:id="activityDate" class="date"></span></span>+ <a wicket:id="compareContext" class="compare-context pull-right"><i class="fa fa-chain-broken"></i></a></div><div class="body"><div wicket:id="content"></div>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 034a9e7059..a6f72d16ce 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@@ -49,10 +49,10 @@ import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.ClassUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.markdown.MarkdownEditSupport;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.util.DateUtils;@@ -176,7 +176,7 @@ public abstract class CodeCommentPanel extends Panel {} else {editSupport = null;}- commentContainer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {+ commentContainer.add(new MarkdownViewer("content", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -397,7 +397,7 @@ public abstract class CodeCommentPanel extends Panel {} else {editSupport = null;}- activityContainer.add(new MarkdownPanel("content", new LoadableDetachableModel<String>() {+ activityContainer.add(new MarkdownViewer("content", new LoadableDetachableModel<String>() {@Overrideprotected String load() {diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.cssindex 4d9b5edbe4..bb73309d6a 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css+++ b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css@@ -43,7 +43,7 @@color: #666;font-size: 14px;line-height: 12px;- margin-left: 8px;+ margin: 4px 8px 0 0;}.code-comment>.section>.detail>.body {padding-top: 8px;diff --git a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.javaindex 77570b75ec..c011b400bc 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitlist/CommitListPanel.java@@ -11,7 +11,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -37,8 +36,9 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReferenceimport com.gitplex.server.web.component.commitgraph.CommitGraphUtils;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.util.model.CommitRefsModel;@SuppressWarnings("serial")@@ -146,15 +146,15 @@ public class CommitListPanel extends Panel {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- DepotFilePage.State browseState = new DepotFilePage.State();+ DepotBlobPage.State browseState = new DepotBlobPage.State();browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- fragment.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));+ params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);+ fragment.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));item.add(AttributeAppender.append("class", "commit clearfix commit-item-" + itemIndex++));} else {diff --git a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.javaindex 4b7d22733b..de5d7ecb8a 100644--- a/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/commitmessage/ExpandableCommitMessagePanel.java@@ -9,7 +9,6 @@ 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.link.AbstractLink;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;@@ -21,6 +20,7 @@ import com.gitplex.server.git.GitUtils;import com.gitplex.server.model.Depot;import com.gitplex.server.util.Highlighter;import com.gitplex.server.util.Transformer;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;@SuppressWarnings("serial")@@ -74,7 +74,7 @@ public class ExpandableCommitMessagePanel extends Panel {protected void onInitialize() {super.onInitialize();- AbstractLink link = new BookmarkablePageLink<Void>("link",+ AbstractLink link = new ViewStateAwarePageLink<Void>("link",CommitDetailPage.class,CommitDetailPage.paramsOf(depotModel.getObject(), commitModel.getObject().name()));diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.javaindex c738208781..99f58beb68 100644--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeletePanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;+import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")abstract class ConfirmDeletePanel extends Panel {diff --git a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.javaindex 1b7c2e2e86..dd45919d68 100644--- a/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/contributorpanel/ContributorPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import org.eclipse.jgit.lib.PersonIdent;-import com.gitplex.server.web.component.AccountLink;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.util.DateUtils;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.javadeleted file mode 100644index a231f1bc2e..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobNameChangeCallback.java+++ /dev/null@@ -1,11 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview;--import java.io.Serializable;--import org.apache.wicket.ajax.AjaxRequestTarget;--public interface BlobNameChangeCallback extends Serializable {-- void onChange(AjaxRequestTarget target, String blobName);--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.javadeleted file mode 100644index 71347ff539..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobRenderer.java+++ /dev/null@@ -1,12 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview;--import javax.annotation.Nullable;--import com.gitplex.launcher.loader.ExtensionPoint;--@ExtensionPoint-public interface BlobRenderer {-- @Nullable BlobViewPanel render(String panelId, BlobViewContext context);--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.javadeleted file mode 100644index 02bd013557..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryRenderer.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.binary;--import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--public class BinaryRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- Blob blob = context.getDepot().getBlob(context.getBlobIdent());-- if (blob.getText() == null- && !blob.getMediaType().getType().equalsIgnoreCase("image")) {- return new BinaryViewPanel(panelId, context);- } else {- return null;- }- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.html b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.htmldeleted file mode 100644index 4bb21b8b4d..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.html+++ /dev/null@@ -1,5 +0,0 @@-<wicket:extend>- <div class="binary-view">- Binary file- </div>-</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.javadeleted file mode 100644index 79321e1080..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewPanel.java+++ /dev/null@@ -1,23 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.binary;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;--import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--@SuppressWarnings("serial")-public class BinaryViewPanel extends BlobViewPanel {-- public BinaryViewPanel(String id, BlobViewContext context) {- super(id, context);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new BinaryViewResourceReference()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.javadeleted file mode 100644index 1d0fc85a5f..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.binary;--import org.apache.wicket.request.resource.CssResourceReference;--public class BinaryViewResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public BinaryViewResourceReference() {- super(BinaryViewResourceReference.class, "binary-view.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.js b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.jsdeleted file mode 100644index b9e4ef4ac7..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.js+++ /dev/null@@ -1,32 +0,0 @@-gitplex.server.blobView = function(containerId) {- var $blobView = $("#" + containerId + ">.blob-view");- var $head = $blobView.find(">.head");- var $body = $blobView.find(">.body");-- $blobView.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.server.history.setViewState({scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}});- $body.find(".autofit:visible").first().trigger("storeViewState");- });-- $blobView.on("autofit", function(e, width, height) {- e.stopPropagation();- $blobView.outerWidth(width);- $blobView.outerHeight(height);-- height = $blobView.height()-$head.outerHeight();- $body.outerWidth(width).outerHeight(height);- $body.find(".autofit:visible").first().trigger("autofit", [$body.width(), $body.height()]);-- var viewState = gitplex.server.history.getViewState();- if (viewState && viewState.scroll) {- $body.scrollLeft(viewState.scroll.left);- $body.scrollTop(viewState.scroll.top);- }- if (location.hash) { // scroll markdown headlines into view- var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];- if (element)- element.scrollIntoView();- }- });-};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.javadeleted file mode 100644index 6eb58d64b6..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.gitlink;--import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--public class GitLinkRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- if (context.getBlobIdent().isGitLink())- return new GitLinkPanel(panelId, context);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.javadeleted file mode 100644index d5d87e01cd..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageRenderer.java+++ /dev/null@@ -1,19 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.image;--import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--public class ImageRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- if (blob.getMediaType().getType().equalsIgnoreCase("image"))- return new ImageViewPanel(panelId, context);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.htmldeleted file mode 100644index 2e6c909ebf..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html+++ /dev/null@@ -1,8 +0,0 @@-<wicket:extend>- <div class="markdown-file">- <div wicket:id="markdown"></div>- </div>- <wicket:fragment wicket:id="actionsFrag">- <a wicket:id="blame" class="btn btn-default btn-xs blame-toggle"><i class="fa fa-user"></i> Blame</a>- </wicket:fragment>-</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.javadeleted file mode 100644index b3e8a06656..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java+++ /dev/null@@ -1,53 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.markdown;--import org.apache.wicket.ajax.AjaxRequestTarget;-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.panel.Fragment;-import org.apache.wicket.model.Model;--import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.server.web.component.markdown.MarkdownPanel;--@SuppressWarnings("serial")-public class MarkdownFilePanel extends BlobViewPanel {-- public MarkdownFilePanel(String id, BlobViewContext context) {- super(id, context);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- add(new MarkdownPanel("markdown", Model.of(blob.getText().getContent()), null));- }-- @Override- protected WebMarkupContainer newAdditionalActions(String id) {- WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);- actions.add(new PreventDefaultAjaxLink<Void>("blame") {-- @Override- public void onClick(AjaxRequestTarget target) {- context.onBlameChange(target, true);- }-- });-- return actions;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(CssHeaderItem.forReference(new MarkdownFileResourceReference()));- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.javadeleted file mode 100644index 1286e6d60b..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.markdown;--import org.apache.wicket.request.resource.CssResourceReference;--public class MarkdownFileResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public MarkdownFileResourceReference() {- super(MarkdownFileResourceReference.class, "markdown-file.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.javadeleted file mode 100644index 4521f0c888..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/MarkdownRenderer.java+++ /dev/null@@ -1,27 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.markdown;--import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.server.web.component.depotfile.blobview.source.SourceViewPanel;--public class MarkdownRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- if (context.getBlobIdent().isFile()- && blob.getText() != null- && context.getBlobIdent().path.endsWith(".md")) {- if (context.getMark() != null || context.getMode() == Mode.BLAME)- return new SourceViewPanel(panelId, context);- else- return new MarkdownFilePanel(panelId, context);- } else {- return null;- }- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/markdown-file.css b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/markdown-file.cssdeleted file mode 100644index 2b6d2ce42f..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/markdown/markdown-file.css+++ /dev/null@@ -1,6 +0,0 @@-.markdown-file {- padding: 20px;- max-width: 900px;- margin-left: auto;- margin-right: auto;-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.javadeleted file mode 100644index 934077ce08..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceRenderer.java+++ /dev/null@@ -1,22 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.source;--import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--public class SourceRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- if (context.getBlobIdent().isFile()- && blob.getText() != null- && !context.getBlobIdent().path.endsWith(".md")) {- return new SourceViewPanel(panelId, context);- } else {- return null;- }- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.javadeleted file mode 100644index 228a88b2df..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java+++ /dev/null@@ -1,17 +0,0 @@-package com.gitplex.server.web.component.depotfile.blobview.symbollink;--import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;--public class SymbolLinkRenderer implements BlobRenderer {-- @Override- public BlobViewPanel render(String panelId, BlobViewContext context) {- if (context.getBlobIdent().isSymbolLink())- return new SymbolLinkPanel(panelId, context);- else- return null;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.javadeleted file mode 100644index 45f2da4e3e..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/CancelListener.java+++ /dev/null@@ -1,9 +0,0 @@-package com.gitplex.server.web.component.depotfile.editsave;--import java.io.Serializable;--import org.apache.wicket.ajax.AjaxRequestTarget;--public interface CancelListener extends Serializable {- void onCancel(AjaxRequestTarget target);-}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.js b/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.jsdeleted file mode 100644index 966d58eaf5..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.js+++ /dev/null@@ -1,43 +0,0 @@-gitplex.server.editsave = {- init: function(containerId) {- var $editSave = $("#" + containerId + ">.edit-save");- $editSave.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.server.history.setViewState({scroll:{left: $editSave.scrollLeft(), top: $editSave.scrollTop()}});- });- $editSave.on("autofit", function(e, width, height) {- e.stopPropagation();-- $editSave.closest(".body").css("overflow", "hidden");- $editSave.outerWidth(width);- $editSave.outerHeight(height);-- var viewState = gitplex.server.history.getViewState();- if (viewState && viewState.scroll) {- $editSave.scrollLeft(viewState.scroll.left);- $editSave.scrollTop(viewState.scroll.top);- }- });-- $editSave.on("contentEdit", function(event, contentChanged) {- event.stopPropagation();- $editSave.data("contentChanged", contentChanged);- gitplex.server.editsave.updateSubmitBtnState($editSave);- });- },-- updateSubmitBtnState: function($editSave) {- var $submitBtn = $editSave.find("input[type=submit]");- if ($editSave.data("contentChanged") === true || $editSave.data("pathChanged") === true)- $submitBtn.removeAttr("disabled");- else- $submitBtn.attr("disabled", "disabled");- },-- onPathChange: function(containerId, defaultCommitMessage, equalsOldPath) {- var $editSave = $("#" + containerId + ">.edit-save");- $editSave.find(".summary-commit-message").attr("placeholder", defaultCommitMessage);- $editSave.data("pathChanged", !equalsOldPath);- gitplex.server.editsave.updateSubmitBtnState($editSave);- }-};diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.html b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.htmldeleted file mode 100644index f2d3046469..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.html+++ /dev/null@@ -1,20 +0,0 @@-<wicket:panel>- <div class="file-edit autofit">- <div class="head clearfix">- <a class="active tab edit pull-left"><i class="fa fa-pencil"></i> Edit file</a>- <a wicket:id="previewLink" class="tab preview pull-left"><i class="fa fa-eye"></i> Preview changes</a>- <a wicket:id="saveLink" class="tab save pull-left"><i class="fa fa-floppy-o"></i> Save</a>- <a wicket:id="cancelLink" class="cancel pull-left" tabindex="-1">Cancel</a>- <span wicket:id="sourceFormat" class="source-format pull-right"></span>- </div>- <div class="body">- <!-- below form is for dirty checking purpose and we can not use it as containing- element of codemirror as otherwise the dirty flag will be cleared by codemirror- upon changing -->- <form class="edit leave-confirm hidden"></form>- <div class="edit"></div>- <div wicket:id="preview" class="preview"></div>- <div wicket:id="save" class="save"></div>- </div>- </div>-</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.javadeleted file mode 100644index 1c985628cf..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/FileEditPanel.java+++ /dev/null@@ -1,296 +0,0 @@-package com.gitplex.server.web.component.depotfile.fileedit;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringEscapeUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;-import org.apache.wicket.ajax.attributes.CallbackParameter;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.diff.DiffEntry;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.google.common.base.Charsets;-import com.gitplex.server.GitPlex;-import com.gitplex.server.git.Blob;-import com.gitplex.server.git.BlobChange;-import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.git.GitUtils;-import com.gitplex.server.git.PathAndContent;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.support.TextRange;-import com.gitplex.server.util.diff.WhitespaceOption;-import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;-import com.gitplex.server.web.component.ViewStateAwareAjaxLink;-import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;-import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;-import com.gitplex.server.web.component.diff.revision.DiffViewMode;-import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;-import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;-import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;--@SuppressWarnings("serial")-public abstract class FileEditPanel extends Panel {-- private static final String PREVIEW_ID = "preview";-- private final IModel<Depot> depotModel;-- private final String refName;-- private final String oldPath;-- private String content;-- private String newPath;-- private final ObjectId prevCommitId;-- private final TextRange mark;-- private AbstractPostAjaxBehavior previewBehavior;-- private AbstractPostAjaxBehavior saveBehavior;-- private EditSavePanel editSavePanel;-- private SourceFormatPanel sourceFormat;-- public FileEditPanel(String id, IModel<Depot> depotModel, String refName,- @Nullable String oldPath, String content, ObjectId prevCommitId,- @Nullable TextRange mark) {- super(id);- this.depotModel = depotModel;- this.refName = refName;- this.oldPath = GitUtils.normalizePath(oldPath);- this.content = content;- this.prevCommitId = prevCommitId;- this.mark = mark;-- newPath = this.oldPath;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- previewBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setMethod(Method.POST);- }-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- content = params.getParameterValue("content").toString();-- BlobIdent oldBlobIdent = new BlobIdent();- oldBlobIdent.revision = prevCommitId.name();- oldBlobIdent.path = oldPath;- oldBlobIdent.mode = FileMode.REGULAR_FILE.getBits();-- BlobIdent newBlobIdent = new BlobIdent();- newBlobIdent.revision = ObjectId.zeroId().name();- if (newPath != null)- newBlobIdent.path = newPath;- else- newBlobIdent.path = "file.txt";- newBlobIdent.mode = FileMode.REGULAR_FILE.getBits();-- DiffEntry.ChangeType changeType;- if (oldPath == null)- changeType = DiffEntry.ChangeType.ADD;- else- changeType = DiffEntry.ChangeType.MODIFY;-- BlobChange change = new BlobChange(changeType, oldBlobIdent, newBlobIdent,- WhitespaceOption.DEFAULT) {-- @Override- public Blob getBlob(BlobIdent blobIdent) {- if (blobIdent.revision.equals(ObjectId.zeroId().name()))- return new Blob(blobIdent, ObjectId.zeroId(), content.getBytes(Charsets.UTF_8));- else- return depotModel.getObject().getBlob(blobIdent);- }-- };- BlobDiffPanel preview = new BlobDiffPanel("preview", depotModel, new Model<PullRequest>(null),- change, DiffViewMode.UNIFIED, null, null);- replace(preview);- target.add(preview);-- target.appendJavaScript(String.format("gitplex.server.fileedit.preview('%s');", getMarkupId()));- }-- };- add(new WebMarkupContainer("previewLink").add(previewBehavior));-- saveBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.setMethod(Method.POST);- }-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- content = params.getParameterValue("content").toString();- target.appendJavaScript(String.format("gitplex.server.fileedit.save('%s');", getMarkupId()));- }-- };- add(new WebMarkupContainer("saveLink").add(saveBehavior));-- add(new ViewStateAwareAjaxLink<Void>("cancelLink") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- protected void onClick(AjaxRequestTarget target, String viewState) {- RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);- FileEditPanel.this.onCancel(target);- }-- });-- add(sourceFormat = new SourceFormatPanel("sourceFormat", new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.fileedit.onIndentTypeChange('%s', '%s');",- FileEditPanel.this.getMarkupId(), sourceFormat.getIndentType());- target.appendJavaScript(script);- }-- }, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.fileedit.onTabSizeChange('%s', %s);",- FileEditPanel.this.getMarkupId(), sourceFormat.getTabSize());- target.appendJavaScript(script);- }-- }, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.fileedit.onLineWrapModeChange('%s', '%s');",- FileEditPanel.this.getMarkupId(), sourceFormat.getLineWrapMode());- target.appendJavaScript(script);- }-- }));-- add(new WebMarkupContainer(PREVIEW_ID).setOutputMarkupId(true));-- PathAndContent newFile = new PathAndContent() {-- @Override- public String getPath() {- return newPath;- }-- @Override- public byte[] getContent() {- return content.getBytes(Charsets.UTF_8);- }-- };- add(editSavePanel = new EditSavePanel("save", depotModel, refName, oldPath, newFile, prevCommitId, null) {-- @Override- protected void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- FileEditPanel.this.onCommitted(target, oldCommit, newCommit);- }-- });-- setOutputMarkupId(true);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new FileEditResourceReference()));-- String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);-- String script = String.format("gitplex.server.fileedit.init('%s', '%s', '%s', %s, %s, %s, %s, '%s', %s, '%s');",- getMarkupId(), getNewPathParam(), StringEscapeUtils.escapeEcmaScript(content),- previewBehavior.getCallbackFunction(CallbackParameter.explicit("content")),- saveBehavior.getCallbackFunction(CallbackParameter.explicit("content")),- mark!=null?getJson(mark):"undefined",- viewState!=null?"JSON.parse('"+viewState+"')":"undefined",- sourceFormat.getIndentType(),- sourceFormat.getTabSize(),- sourceFormat.getLineWrapMode());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- private String getNewPathParam() {- if (newPath != null)- return StringEscapeUtils.escapeEcmaScript(newPath);- else- return "unknown.txt";- }-- @Override- protected void onDetach() {- depotModel.detach();-- super.onDetach();- }-- public void onNewPathChange(AjaxRequestTarget target, String newPath) {- this.newPath = GitUtils.normalizePath(newPath);-- editSavePanel.onNewPathChange(target);- target.appendJavaScript(String.format("gitplex.server.fileedit.setMode('%s', '%s');",- getMarkupId(), getNewPathParam()));- }-- private String getJson(TextRange mark) {- try {- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- public void mark(AjaxRequestTarget target, TextRange mark) {- String script = String.format("gitplex.server.fileedit.mark('%s', %s);",- getMarkupId(), getJson(mark));- target.appendJavaScript(script);- }-- protected abstract void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.css b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.cssdeleted file mode 100644index 6159395308..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.css+++ /dev/null@@ -1,44 +0,0 @@-.file-edit>.head {- border-bottom: 1px solid #BBB;- height: 36px;- background: #F2F2F2;-}-.file-edit>.head a.tab {- color: #666;- margin-top: 7px;- padding: 4px 12px;- text-decoration: none;-}-.file-edit>.head a.edit {- margin-left: 12px;-}-.file-edit>.head a.active.tab {- background: white;- border: 1px solid #BBB;- border-radius: 4px 4px 0 0;- border-bottom: 1px solid white;- font-weight: bold;- color: #333;-}-.file-edit>.head a.cancel {- margin-top: 11px;- margin-left: 12px;-}-.file-edit>.head>.source-format {- margin: 8px 12px 0 0;-}-.file-edit>.body {- overflow: hidden;-}-.file-edit>.body>.preview, .file-edit>.body>.save {- display: none;-}-.file-edit>.body>.save>.edit-save {- overflow: hidden;-}-.file-edit>.body>.preview>div>.no-diff, .file-edit>.body>.preview>div>.text-diff {- border: none;-}-.file-edit>.body>.preview>div>.no-diff>.head, .file-edit>.body>.preview>div>.text-diff>.head {- display: none;-}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.js b/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.jsdeleted file mode 100644index e40a2dd4f4..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/fileedit/file-edit.js+++ /dev/null@@ -1,220 +0,0 @@-gitplex.server.fileedit = {- init: function(containerId, filePath, fileContent, previewCallback, saveCallback, mark, viewState, indentType, tabSize, lineWrapMode) {- var $container = $("#" + containerId);- var $fileEdit = $container.find(">.file-edit");- var $head = $fileEdit.find(">.head");- var $body = $fileEdit.find(">.body");- var $edit = $body.find(">div.edit");- var cm;-- $head.find("a.edit").click(function() {- gitplex.server.fileedit.selectTab($(this));- });- $head.find("a.preview").click(function() {- previewCallback(cm.getValue());- });- $head.find("a.save").click(function() {- saveCallback(cm.getValue());- });-- $fileEdit.on("storeViewState", function(e) {- e.stopPropagation();- if (cm) {- gitplex.server.history.setViewState(gitplex.server.codemirror.getViewState(cm));- }- });-- $fileEdit.on("autofit", function(e, width, height) {- e.stopPropagation();- $fileEdit.outerWidth(width);- $fileEdit.outerHeight(height);-- height = $fileEdit.height()-$head.outerHeight();- $body.outerWidth(width).outerHeight(height-1);-- /*- * initialize codemirror here when we know the container width and height- * as otherwise the annotatescrollbar addon is inaccurate when window- * initially loads- */- var initState = !cm;- if (!cm) {- cm = CodeMirror($edit[0], {- value: fileContent,- theme: "eclipse",- indentWithTabs: indentType == "Tabs",- indentUnit: tabSize,- lineNumbers: true,- lineWrapping: lineWrapMode == "Soft wrap",- tabSize: tabSize,- styleActiveLine: true,- styleSelectedText: true,- foldGutter: true,- matchBrackets: true,- scrollbarStyle: "simple",- highlightIdentifiers: {delay: 500},- extraKeys: {- "F11": function(cm) {- cm.setOption("fullScreen", !cm.getOption("fullScreen"));- },- "Esc": function(cm) {- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- }- }- });-- cm.oldDocValue = cm.doc.getValue();- cm.on("change", function() {- var $form = $body.find(">form.edit");- if (cm.doc.getValue() != cm.oldDocValue) {- $form.addClass("dirty");- $fileEdit.data("contentChanged", true);- } else {- $form.removeClass("dirty");- $fileEdit.data("contentChanged", false);- }- });- gitplex.server.codemirror.setMode(cm, filePath);-- if (mark)- gitplex.server.codemirror.mark(cm, mark);- }-- if ($edit.is(":visible")) {- $body.css("overflow", "hidden");- $edit.outerHeight($body.height());- $edit.outerWidth($body.width());- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- cm.setSize($edit.width(), $edit.height());- if (initState)- gitplex.server.codemirror.initState(cm, viewState);- } else {- $body.css("overflow", "auto");- }- });- },- save: function(containerId) {- gitplex.server.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.save"));- },- preview: function(containerId) {- gitplex.server.fileedit.selectTab($("#" + containerId + ">.file-edit>.head>.preview"));- },- setMode: function(containerId, filePath) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- gitplex.server.codemirror.setMode(cm, filePath);- },- mark: function(containerId, mark) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- if (cm.oldDocValue) {- var dmp = new diff_match_patch();- var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());-- var beginLine = mark.beginLine, beginChar = mark.beginChar;- var endLine = mark.endLine, endChar = mark.endChar;- var newBeginLine, newBeginChar, newEndLine, newEndChar;- var oldLine = oldChar = newLine = newChar = 0;- for (var i=0; i<diffs.length; i++) {- var diff = diffs[i];- var chars = diff[1];- var quit = false;- for (var j=0; j<chars.length; j++) {- var char = chars[j];- if (diff[0] == -1) {- if (char == '\n') {- oldLine++;- oldChar = 0;- } else {- oldChar++;- }- } else if (diff[0] == 1) {- if (char == '\n') {- newLine++;- newChar = 0;- } else {- newChar++;- }- } else {- if (oldLine == beginLine && oldChar == beginChar) {- newBeginLine = newLine;- newBeginChar = newChar;- }- if (char == '\n') {- oldLine++;- oldChar = 0;- newLine++;- newChar = 0;- } else {- oldChar++;- newChar++;- }- if (oldLine == endLine && oldChar == endChar) {- newEndLine = newLine;- newEndChar = newChar;- }- }- if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {- quit = true;- break;- }- }- if (quit)- break;- }- }-- if (newBeginLine!=undefined && newEndLine!=undefined) {- var newMark = {- beginLine: newBeginLine,- beginChar: newBeginChar,- endLine: newEndLine,- endChar: newEndChar- };- gitplex.server.codemirror.mark(cm, newMark);- }- },- selectTab: function($tab) {- var $active = $tab.parent().find("a.tab.active");- $active[0].hideableVisible = $(".hideable").is(":visible");- $active.removeClass("active");- $tab.addClass("active");- if ($tab[0].hideableVisible != undefined) {- if ($tab[0].hideableVisible)- $(".hideable").show();- else- $(".hideable").hide();- }- var $fileEdit = $tab.closest(".file-edit");- var $body = $fileEdit.find(">.body");-- var $cm = $fileEdit.find(">.body>div.edit>.CodeMirror");- if ($cm.is(":visible")) {- var cm = $cm[0].CodeMirror;- $fileEdit.find(">.body>div.save").data("viewState", gitplex.server.codemirror.getViewState(cm));- }-- $body.find(">div").hide();- if ($tab.hasClass("edit")) {- $body.find(">div.edit").show().find(">.CodeMirror")[0].CodeMirror.focus();- } else if ($tab.hasClass("preview")) {- $body.find(">div.preview").show();- } else {- $body.find(">div.save").show();- $body.find(">div.save>.edit-save").trigger("contentEdit", [$fileEdit.data("contentChanged")]);- }- $(window).resize();- },- onIndentTypeChange: function(containerId, indentType) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("indentWithTabs", indentType == "Tabs");- },- onLineWrapModeChange: function(containerId, lineWrapMode) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");- },- onTabSizeChange: function(containerId, tabSize) {- var cm = $("#"+ containerId + ">.file-edit>.body>div.edit>.CodeMirror")[0].CodeMirror;- cm.setOption("tabSize", tabSize);- }-};diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/book.png b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/book.pngdeleted file mode 100644index 905de111e5..0000000000Binary files a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/book.png and /dev/null differdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.css b/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.cssdeleted file mode 100644index d67c076048..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.css+++ /dev/null@@ -1,54 +0,0 @@-.file-list {- overflow: auto;-}-.file-list>table>tbody>tr>td {- padding: 6px 12px;- border-top: 1px solid #EEE;-}--.file-list>table>tbody>tr>td.path, .file-list>table>tbody>tr>td.last-commit.author,-.file-list>table>tbody>tr>td.last-commit.when {- white-space: nowrap;-}-.file-list>table>tbody>tr>td.last-commit img {- width: 20px;- height: 20px;-}-.file-list>table>tbody>tr>td.last-commit, .file-list>table>tbody>tr>td.last-commit a {- color: #444;- font-size: 13px;-}-.file-list>table>tbody>tr>td.last-commit .when {- color: #888;-}-.file-list>table>tbody>tr:first-child>td {- border-top: none;-}-.file-list>table tr.parent td {- padding: 3px 12px;-}-.file-list>table tr.parent td a i {- margin-right: 2px;-}-.file-list>table tr.parent td a span {- font-size: 18px;-}-.file-list>.readme {- border-top: 1px solid #BBB;-}-.file-list>.readme>.head {- padding: 6px 12px;- background: #F2F2F2;- font-weight: bold;- border-bottom: 1px solid #BBB;-}-.file-list>.readme>.head a {- color: #333;- margin-left: 4px;-}-.file-list>.readme>.body {- padding: 20px;- max-width: 900px;- margin-left: auto;- margin-right: auto;-}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.javadeleted file mode 100644index 9c002553f8..0000000000--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.gitplex.server.web.component.depotfile.filenavigator;--import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;--public class FileNavigatorResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public FileNavigatorResourceReference() {- super(FileNavigatorResourceReference.class, "file-navigator.css");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.javaindex 6266de68d5..bae98ab7a5 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/depotselector/DepotSelector.java@@ -31,8 +31,8 @@ import com.gitplex.server.manager.DepotManager;import com.gitplex.server.model.Depot;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")public abstract class DepotSelector extends Panel {@@ -144,8 +144,8 @@ public abstract class DepotSelector extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- PageParameters params = DepotFilePage.paramsOf(item.getModelObject());- tag.put("href", urlFor(DepotFilePage.class, params).toString());+ PageParameters params = DepotBlobPage.paramsOf(item.getModelObject());+ tag.put("href", urlFor(DepotBlobPage.class, params).toString());}};diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex b39cd56e33..0883b171f6 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -20,13 +20,11 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.protocol.http.WebSession;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -36,6 +34,7 @@ import org.unbescape.html.HtmlEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.jsymbol.Range;import com.gitplex.jsyntax.Token;import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blame;@@ -54,27 +53,27 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.RangeUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.diff.DiffBlock;+import com.gitplex.server.util.diff.DiffMatchPatch.Operation;import com.gitplex.server.util.diff.DiffUtils;import com.gitplex.server.util.diff.LineDiff;-import com.gitplex.server.util.diff.DiffMatchPatch.Operation;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;import com.gitplex.server.web.component.diff.blob.SourceAware;import com.gitplex.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;import com.gitplex.server.web.component.diff.difftitle.BlobDiffTitle;import com.gitplex.server.web.component.diff.revision.BlobCommentSupport;import com.gitplex.server.web.component.diff.revision.DiffViewMode;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.RequestCompareInfo;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;-import com.gitplex.server.web.page.depot.file.RequestCompareInfo;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;import com.gitplex.server.web.util.DateUtils;-import com.gitplex.jsymbol.Range;import com.google.common.base.Preconditions;@SuppressWarnings("serial")@@ -195,13 +194,13 @@ public class TextDiffPanel extends Panel implements SourceAware {} else {comment = null;}- DepotFilePage.State viewState = new DepotFilePage.State();+ DepotBlobPage.State viewState = new DepotBlobPage.State();if (comment != null)viewState.commentId = comment.getId();viewState.blobIdent = change.getBlobIdent();- PageParameters params = DepotFilePage.paramsOf(depot, viewState);- actions.add(new BookmarkablePageLink<Void>("viewFile", DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(depot, viewState);+ actions.add(new ViewStateAwarePageLink<Void>("viewFile", DepotBlobPage.class, params));if (change.getType() != ChangeType.DELETE) {if (request != null@@ -214,7 +213,7 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overridepublic void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();+ DepotBlobPage.State editState = new DepotBlobPage.State();editState.blobIdent.revision = request.getSourceBranch();editState.blobIdent.path = change.getPath();editState.mode = Mode.EDIT;@@ -227,8 +226,8 @@ public class TextDiffPanel extends Panel implements SourceAware {IntegrationPreviewPage page = (IntegrationPreviewPage) getPage();editState.requestCompareInfo.previewState = page.getState();}- PageParameters params = DepotFilePage.paramsOf(request.getSourceDepot(), editState);- setResponsePage(DepotFilePage.class, params);+ PageParameters params = DepotBlobPage.paramsOf(request.getSourceDepot(), editState);+ setResponsePage(DepotBlobPage.class, params);}};@@ -241,11 +240,11 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overridepublic void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();+ DepotBlobPage.State editState = new DepotBlobPage.State();editState.blobIdent = change.getBlobIdent();editState.mode = Mode.EDIT;- PageParameters params = DepotFilePage.paramsOf(depot, editState);- setResponsePage(DepotFilePage.class, params);+ PageParameters params = DepotBlobPage.paramsOf(depot, editState);+ setResponsePage(DepotBlobPage.class, params);}};@@ -351,13 +350,12 @@ public class TextDiffPanel extends Panel implements SourceAware {@Overrideprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {- setResponsePage(DepotFilePage.class, getQueryHitParams(hit));+ setResponsePage(DepotBlobPage.class, getQueryHitParams(hit));}@Overrideprotected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- WebSession.get().setMetaData(DepotFilePage.SEARCH_RESULT_KEY, (ArrayList<QueryHit>)hits);- setResponsePage(DepotFilePage.class, getFindOccurrencesParams());+ setResponsePage(DepotBlobPage.class, getFindOccurrencesParams());}@Overridediff --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 472ca4889e..d8e4d87e59 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@@ -74,7 +74,6 @@ import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.util.match.WildcardUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.comment.CodeCommentPanel;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;@@ -82,6 +81,7 @@ import com.gitplex.server.web.component.comment.comparecontext.CompareContextPanimport com.gitplex.server.web.component.diff.blob.BlobDiffPanel;import com.gitplex.server.web.component.diff.blob.SourceAware;import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;+import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.util.SuggestionUtils;diff --git a/web/src/main/java/com/gitplex/server/web/component/floating/floating.js b/web/src/main/java/com/gitplex/server/web/component/floating/floating.jsindex fdc7ae13cf..c2e2bde755 100644--- a/web/src/main/java/com/gitplex/server/web/component/floating/floating.js+++ b/web/src/main/java/com/gitplex/server/web/component/floating/floating.js@@ -52,21 +52,23 @@ gitplex.server.floating = {},close: function($floating, callCloseCallback) {- if (callCloseCallback)- $floating.data("closeCallback")();-- var alignment = $floating.data("alignment");-- if (alignment.target.element)- $(alignment.target.element).removeClass("floating-aligned");-- $(document).off("mouseup touchstart", $floating.data("mouseUpOrTouchStart"));- $(document).off("keydown", $floating.data("keydown"));- $(document).off("elementReplaced", $floating.data("elementReplaced"));-- $floating.trigger("close");-- $floating.remove();+ if ($floating.length != 0) { // floating might already been closed+ if (callCloseCallback)+ $floating.data("closeCallback")();++ var alignment = $floating.data("alignment");++ if (alignment.target.element)+ $(alignment.target.element).removeClass("floating-aligned");++ $(document).off("mouseup touchstart", $floating.data("mouseUpOrTouchStart"));+ $(document).off("keydown", $floating.data("keydown"));+ $(document).off("elementReplaced", $floating.data("elementReplaced"));++ $floating.trigger("close");++ $floating.remove();+ }}};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.javaindex 1b569c21c2..8f97757f93 100644--- a/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/greaterprivilege/GreaterPrivilegesPanel.java@@ -8,7 +8,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -23,6 +22,7 @@ import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.members.MemberEffectivePrivilegePage;import com.gitplex.server.web.page.account.members.MemberPrivilegeSourcePage;import com.gitplex.server.web.util.depotaccess.DepotAccess;@@ -76,18 +76,18 @@ public abstract class GreaterPrivilegesPanel extends GenericPanel<TeamAuthorizatOrganizationMembership membership =Preconditions.checkNotNull(organization.getOrganizationMembersMap().get(permission.getUser()));PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);- Link<Void> link = new BookmarkablePageLink<Void>("avatarLink",+ Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",MemberEffectivePrivilegePage.class, params);link.add(new Avatar("avatar", permission.getUser()));item.add(link);- link = new BookmarkablePageLink<Void>("nameLink",+ link = new ViewStateAwarePageLink<Void>("nameLink",MemberEffectivePrivilegePage.class, params);link.add(new Label("name", permission.getUser().getDisplayName()));item.add(link);params = MemberPrivilegeSourcePage.paramsOf(membership, getAuthorization().getDepot());- link = new BookmarkablePageLink<Void>("privilegeLink",+ link = new ViewStateAwarePageLink<Void>("privilegeLink",MemberPrivilegeSourcePage.class, params);link.add(new Label("privilege", permission.getPrivilege()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java b/web/src/main/java/com/gitplex/server/web/component/link/AccountLink.javasimilarity index 89%rename from web/src/main/java/com/gitplex/server/web/component/AccountLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/AccountLink.javaindex a70bb62963..08c2643ea2 100644--- a/web/src/main/java/com/gitplex/server/web/component/AccountLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/AccountLink.java@@ -1,7 +1,6 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -14,7 +13,7 @@ import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@SuppressWarnings("serial")-public class AccountLink extends BookmarkablePageLink<Void> {+public class AccountLink extends ViewStateAwarePageLink<Void> {private final PageParameters params;diff --git a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java b/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.javasimilarity index 97%rename from web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.javaindex 6600f4c66b..b44a150279 100644--- a/web/src/main/java/com/gitplex/server/web/component/archivemenulink/ArchiveMenuLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/ArchiveMenuLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.archivemenulink;+package com.gitplex.server.web.component.link;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.javasimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/component/BranchLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/BranchLink.javaindex 4e277b66a4..26fbe759e8 100644--- a/web/src/main/java/com/gitplex/server/web/component/BranchLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java@@ -1,29 +1,28 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")-public class BranchLink extends BookmarkablePageLink<Void> {+public class BranchLink extends ViewStateAwarePageLink<Void> {private final DepotAndBranch depotAndBranch;public BranchLink(String id, DepotAndBranch depotAndBranch) {- super(id, DepotFilePage.class, getPageParams(depotAndBranch));+ super(id, DepotBlobPage.class, getPageParams(depotAndBranch));this.depotAndBranch = depotAndBranch;}private static PageParameters getPageParams(DepotAndBranch depotAndBranch) {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = depotAndBranch.getBranch();- return DepotFilePage.paramsOf(depotAndBranch.getDepot(), state);+ return DepotBlobPage.paramsOf(depotAndBranch.getDepot(), state);}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/component/DropdownLink.java b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.javasimilarity index 98%rename from web/src/main/java/com/gitplex/server/web/component/DropdownLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.javaindex 516e05e0a3..8c821c0fe5 100644--- a/web/src/main/java/com/gitplex/server/web/component/DropdownLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/DropdownLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/web/src/main/java/com/gitplex/server/web/component/EmailLink.java b/web/src/main/java/com/gitplex/server/web/component/link/EmailLink.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/component/EmailLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/EmailLink.javaindex d9cdc394c0..412bb97121 100644--- a/web/src/main/java/com/gitplex/server/web/component/EmailLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/EmailLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;diff --git a/web/src/main/java/com/gitplex/server/web/component/LabelLink.java b/web/src/main/java/com/gitplex/server/web/component/link/LabelLink.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/component/LabelLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/LabelLink.javaindex 02e122bcb8..aa7921c15e 100644--- a/web/src/main/java/com/gitplex/server/web/component/LabelLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/LabelLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;diff --git a/web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.java b/web/src/main/java/com/gitplex/server/web/component/link/PreventDefaultAjaxLink.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.javarename to web/src/main/java/com/gitplex/server/web/component/link/PreventDefaultAjaxLink.javaindex 6968d63561..f1344e4a27 100644--- a/web/src/main/java/com/gitplex/server/web/component/PreventDefaultAjaxLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/link/PreventDefaultAjaxLink.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component;+package com.gitplex.server.web.component.link;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;diff --git a/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwareAjaxLink.java b/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwareAjaxLink.javanew file mode 100644index 0000000000..2657af4e4d--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwareAjaxLink.java@@ -0,0 +1,37 @@+package com.gitplex.server.web.component.link;++import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.model.IModel;++import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;++@SuppressWarnings("serial")+public abstract class ViewStateAwareAjaxLink<T> extends PreventDefaultAjaxLink<T> {++ private final boolean carryOver;++ public ViewStateAwareAjaxLink(String id) {+ this(id, false);+ }++ public ViewStateAwareAjaxLink(String id, IModel<T> model) {+ this(id, model, false);+ }++ public ViewStateAwareAjaxLink(String id, boolean carryOver) {+ super(id);+ this.carryOver = carryOver;+ }++ public ViewStateAwareAjaxLink(String id, IModel<T> model, boolean carryOver) {+ super(id, model);+ this.carryOver = carryOver;+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new TrackViewStateListener(carryOver));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwarePageLink.java b/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwarePageLink.javanew file mode 100644index 0000000000..fe0268e6ac--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/link/ViewStateAwarePageLink.java@@ -0,0 +1,31 @@+package com.gitplex.server.web.component.link;++import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.request.mapper.parameter.PageParameters;++/**+ * This class stores view state (scroll position, cursor etc) before leaving current page, so that+ * the view state can be restored when we go back to current page+ *+ * @author robin+ *+ * @param <T>+ */+@SuppressWarnings("serial")+public class ViewStateAwarePageLink<T> extends BookmarkablePageLink<T> {++ public <C extends Page> ViewStateAwarePageLink(String id, final Class<C> pageClass) {+ super(id, pageClass);+ }++ public <C extends Page> ViewStateAwarePageLink(String id, final Class<C> pageClass, PageParameters parameters) {+ super(id, pageClass, parameters);+ }++ @Override+ protected CharSequence getOnClickScript(CharSequence url) {+ return "gitplex.server.viewState.getFromViewAndSetToHistory();";+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.htmlsimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.htmlrename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.htmlindex 759737bdca..008110c0f3 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.html+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.html@@ -1,6 +1,6 @@<html xmlns:wicket><wicket:panel>- <div class="markdown-panel">+ <div class="markdown-viewer"><div wicket:id="feedback" class="feedback"></div><div wicket:id="content" class="md-preview"></div></div>diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.javasimilarity index 87%rename from web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.javarename to web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.javaindex afa4d60836..f27146be3d 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownViewer.java@@ -20,18 +20,19 @@ import org.hibernate.StaleStateException;import com.gitplex.launcher.loader.AppLoader;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.markdown.MarkdownManager;+import com.gitplex.server.web.assets.js.markdownpreview.MarkdownPreviewResourceReference;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@SuppressWarnings("serial")-public class MarkdownPanel extends GenericPanel<String> {+public class MarkdownViewer extends GenericPanel<String> {private final MarkdownEditSupport editSupport;private long lastVersion;- public MarkdownPanel(String id, IModel<String> model, @Nullable MarkdownEditSupport editSupport) {+ public MarkdownViewer(String id, IModel<String> model, @Nullable MarkdownEditSupport editSupport) {super(id, model);this.editSupport = editSupport;@@ -51,7 +52,7 @@ public class MarkdownPanel extends GenericPanel<String> {@Overrideprotected String load() {- String markdown = MarkdownPanel.this.getModelObject();+ String markdown = MarkdownViewer.this.getModelObject();if (markdown != null) {return AppLoader.getInstance(MarkdownManager.class).parseAndProcess(markdown);} else {@@ -83,7 +84,7 @@ public class MarkdownPanel extends GenericPanel<String> {} catch (StaleStateException e) {warn("Some one changed the content you are editing. The content has now been "+ "reloaded, please try again.");- target.add(MarkdownPanel.this);+ target.add(MarkdownViewer.this);}lastVersion = editSupport.getVersion();}@@ -92,11 +93,12 @@ public class MarkdownPanel extends GenericPanel<String> {public void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);- response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new MarkdownPreviewResourceReference()));CharSequence callbackFunc = getCallbackFunction(explicit("taskStartIndex"), explicit("taskChecked"));- String script = String.format("gitplex.server.initMarkdownPanel($('#%s>.markdown-panel>.md-preview'), %s);",+ String script = String.format(+ "gitplex.server.initMarkdownPreview($('#%s>.markdown-viewer>.md-preview'), %s);",getMarkupId(true), editSupport!=null?callbackFunc:"undefined");response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.javaindex 2219dfec28..4bb0875ddb 100644--- a/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/menu/MenuLink.java@@ -7,9 +7,9 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")public abstract class MenuLink extends DropdownLink {diff --git a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.javaindex 88c19ea790..0ca50b8597 100644--- a/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/pathselector/PathSelector.java@@ -32,7 +32,7 @@ import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.Depot;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.component.BlobIcon;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;+import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;@SuppressWarnings("serial")public abstract class PathSelector extends Panel {diff --git a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.javaindex 3e568167af..7b791a3cfe 100644--- a/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/privilegesource/PrivilegeSourcePanel.java@@ -1,7 +1,6 @@package com.gitplex.server.web.component.privilegesource;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;@@ -9,8 +8,9 @@ import org.apache.wicket.model.IModel;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;-import com.gitplex.server.web.component.AccountLink;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.util.depotaccess.DepotAccess;import com.gitplex.server.web.util.depotaccess.PrivilegeSource;@@ -38,8 +38,8 @@ public class PrivilegeSourcePanel extends Panel {add(new Label("privilege", access.getGreatestPrivilege()));- Link<Void> depotLink = new BookmarkablePageLink<Void>("depotLink",- DepotFilePage.class, DepotFilePage.paramsOf(depotModel.getObject()));+ Link<Void> depotLink = new ViewStateAwarePageLink<Void>("depotLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(depotModel.getObject()));depotLink.add(new Label("name", depotModel.getObject().getName()));add(depotLink);diff --git a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.javaindex e9652f4b47..617917bab3 100644--- a/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java@@ -19,7 +19,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestVerification;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")public class VerificationStatusPanel extends Panel {diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.javaindex 920be27b1a..125eca2b9f 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionPicker.java@@ -10,7 +10,7 @@ import org.apache.wicket.model.Model;import com.gitplex.server.git.GitUtils;import com.gitplex.server.model.Depot;import com.gitplex.server.model.support.DepotAndRevision;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;import com.gitplex.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.javaindex 0ab091fb86..9d7bf366c5 100644--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java@@ -45,7 +45,7 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.InputChangeBehavior;import com.gitplex.server.web.behavior.infinitescroll.InfiniteScrollBehavior;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;import com.gitplex.server.web.component.modal.ModalPanel;import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;@@ -348,7 +348,7 @@ public abstract class RevisionSelector extends Panel {elseref = itemValue;- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {diff --git a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex a91381fa93..405612101e 100644--- a/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -45,9 +45,9 @@ import com.gitplex.server.search.query.SymbolQuery;import com.gitplex.server.search.query.TextQuery;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.RunTaskBehavior;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.PreventDefaultAjaxLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")public abstract class SymbolTooltipPanel extends Panel {@@ -101,7 +101,7 @@ public abstract class SymbolTooltipPanel extends Panel {};- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, getQueryHitParams(hit));+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, getQueryHitParams(hit));link.add(AttributeAppender.replace("href", url.toString()));link.add(hit.render("label"));link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));@@ -173,7 +173,7 @@ public abstract class SymbolTooltipPanel extends Panel {super.onComponentTag(tag);// set href in onComponentTag in order to keep it up to date with symbol value- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, getFindOccurrencesParams());+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, getFindOccurrencesParams());tag.put("href", url.toString());}@@ -296,19 +296,19 @@ public abstract class SymbolTooltipPanel extends Panel {}public PageParameters getQueryHitParams(QueryHit hit) {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = revision;state.blobIdent.path = hit.getBlobPath();state.mark = TextRange.of(hit.getTokenPos());- return DepotFilePage.paramsOf(depotModel.getObject(), state);+ return DepotBlobPage.paramsOf(depotModel.getObject(), state);}public PageParameters getFindOccurrencesParams() {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = revision;state.blobIdent.path = getBlobPath();state.query = symbolName;- return DepotFilePage.paramsOf(depotModel.getObject(), state);+ return DepotBlobPage.paramsOf(depotModel.getObject(), state);}public String getSymbol() {diff --git a/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.javaindex 636b4d23d8..8701965335 100644--- a/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/component/tabbable/PageTabLink.java@@ -2,10 +2,11 @@ package com.gitplex.server.web.component.tabbable;import org.apache.wicket.Page;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+public class PageTabLink extends Panel {private static final long serialVersionUID = 1L;@@ -19,7 +20,7 @@ public class PageTabLink extends Panel {}protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>("link", pageClass);+ return new ViewStateAwarePageLink<Void>("link", pageClass);}}diff --git a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.javaindex 72163ce8b6..621df57bcb 100644--- a/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java+++ b/web/src/main/java/com/gitplex/server/web/editable/string/StringEditSupport.java@@ -11,7 +11,7 @@ import com.gitplex.server.util.editable.annotation.Markdown;import com.gitplex.server.util.editable.annotation.Multiline;import com.gitplex.server.util.editable.annotation.Password;import com.gitplex.server.web.component.MultilineLabel;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.EditSupport;import com.gitplex.server.web.editable.NotDefinedLabel;@@ -46,7 +46,7 @@ public class StringEditSupport implements EditSupport {if (propertyDescriptor.getPropertyGetter().getAnnotation(Multiline.class) != null) {return new MultilineLabel(id, model.getObject());} else if (propertyDescriptor.getPropertyGetter().getAnnotation(Markdown.class) != null) {- return new MarkdownPanel(id, Model.of(model.getObject()), null);+ return new MarkdownViewer(id, Model.of(model.getObject()), null);} else {return new Label(id, model.getObject());}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.javaindex 7ec1e4ef94..2e080f57fa 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountLayoutPage.java@@ -6,11 +6,11 @@ import java.util.List;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;@@ -39,7 +39,7 @@ public abstract class AccountLayoutPage extends AccountPage {protected void onInitialize() {super.onInitialize();- BookmarkablePageLink<Void> avatarLink = new BookmarkablePageLink<Void>("avatar",+ ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",AvatarEditPage.class, AvatarEditPage.paramsOf(getAccount())) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java b/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.javaindex f1454695ba..c11715a138 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/AccountTabLink.java@@ -3,10 +3,11 @@ package com.gitplex.server.web.page.account;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+@SuppressWarnings("serial")public class AccountTabLink extends Panel {@@ -23,7 +24,7 @@ public class AccountTabLink extends Panel {super.onInitialize();AccountPage page = (AccountPage) getPage();- Link<Void> link = new BookmarkablePageLink<Void>("link",+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",tab.getMainPageClass(), AccountPage.paramsOf(page.getAccount()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.javaindex 26d702cc7a..872c301792 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/AccountCollaboratorListPage.java@@ -10,7 +10,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -26,6 +25,7 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;@@ -106,13 +106,13 @@ public class AccountCollaboratorListPage extends AccountLayoutPage {protected void populateItem(ListItem<Account> item) {Account collaborator = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<>("avatarLink",+ Link<Void> link = new ViewStateAwarePageLink<>("avatarLink",CollaboratorDepotListPage.class,CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));link.add(new Avatar("avatar", collaborator));item.add(link);- link = new BookmarkablePageLink<>("nameLink",+ link = new ViewStateAwarePageLink<>("nameLink",CollaboratorDepotListPage.class,CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));link.add(new Label("name", collaborator.getDisplayName()));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.javaindex 3215d937a6..342737a4c7 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorDepotListPage.java@@ -16,7 +16,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -33,9 +32,10 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -270,7 +270,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {protected void populateItem(ListItem<UserAuthorization> item) {UserAuthorization authorization = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>(+ Link<Void> link = new ViewStateAwarePageLink<Void>("depotLink",DepotCollaboratorListPage.class,DepotCollaboratorListPage.paramsOf(authorization.getDepot()));@@ -290,7 +290,7 @@ public class CollaboratorDepotListPage extends CollaboratorPage {};- greaterPrivileges.add(new BookmarkablePageLink<Void>("detail",+ greaterPrivileges.add(new ViewStateAwarePageLink<Void>("detail",CollaboratorPrivilegeSourcePage.class,CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javaindex f8015b6515..67e67b414b 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java@@ -9,7 +9,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -24,7 +23,8 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;import com.gitplex.server.web.util.depotaccess.DepotAccess;@@ -170,14 +170,14 @@ public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {protected void populateItem(ListItem<DepotPermission> item) {DepotPermission permission = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>(+ Link<Void> link = new ViewStateAwarePageLink<Void>("depotLink",DepotEffectivePrivilegePage.class,DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));link.add(new Label("name", permission.getDepot().getName()));item.add(link);- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("privilegeLink",CollaboratorPrivilegeSourcePage.class,CollaboratorPrivilegeSourcePage.paramsOf(permission.getDepot(), collaboratorModel.getObject()));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.javaindex ac91f1cd1b..7831857948 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/collaborators/CollaboratorPage.java@@ -6,24 +6,24 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.PageTabLink;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.account.AccountLayoutPage;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class CollaboratorPage extends AccountLayoutPage {@@ -70,7 +70,7 @@ public abstract class CollaboratorPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, CollaboratorDepotListPage.class,+ return new ViewStateAwarePageLink<Void>(linkId, CollaboratorDepotListPage.class,CollaboratorDepotListPage.paramsOf(getAccount(), collaboratorModel.getObject()));}@@ -88,7 +88,7 @@ public abstract class CollaboratorPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, CollaboratorEffectivePrivilegePage.class,+ return new ViewStateAwarePageLink<Void>(linkId, CollaboratorEffectivePrivilegePage.class,CollaboratorEffectivePrivilegePage.paramsOf(getAccount(), collaboratorModel.getObject()));}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.javaindex d1f1e096ce..1e1b615e9d 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberEffectivePrivilegePage.java@@ -9,7 +9,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -24,7 +23,8 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;import com.gitplex.server.web.util.depotaccess.DepotAccess;@@ -170,14 +170,14 @@ public class MemberEffectivePrivilegePage extends MemberPage {protected void populateItem(ListItem<DepotPermission> item) {DepotPermission permission = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>(+ Link<Void> link = new ViewStateAwarePageLink<Void>("depotLink",DepotEffectivePrivilegePage.class,DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));link.add(new Label("name", permission.getDepot().getName()));item.add(link);- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("privilegeLink",MemberPrivilegeSourcePage.class,MemberPrivilegeSourcePage.paramsOf(getMembership(), permission.getDepot()));diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.javaindex 2d903d9d98..7801c29ea2 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberListPage.java@@ -16,7 +16,6 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -25,7 +24,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.model.Account;@@ -34,13 +32,15 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.collaborators.AccountCollaboratorListPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.page.account.setting.ProfileEditPage;+import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -240,12 +240,12 @@ public class MemberListPage extends AccountLayoutPage {protected void populateItem(ListItem<OrganizationMembership> item) {OrganizationMembership membership = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<>("avatarLink", MemberTeamListPage.class,+ Link<Void> link = new ViewStateAwarePageLink<>("avatarLink", MemberTeamListPage.class,MemberTeamListPage.paramsOf(membership));link.add(new Avatar("avatar", membership.getUser()));item.add(link);- link = new BookmarkablePageLink<>("nameLink", MemberTeamListPage.class,+ link = new ViewStateAwarePageLink<>("nameLink", MemberTeamListPage.class,MemberTeamListPage.paramsOf(membership));link.add(new Label("name", membership.getUser().getDisplayName()));item.add(link);@@ -385,7 +385,7 @@ public class MemberListPage extends AccountLayoutPage {protected void onInitialize() {super.onInitialize();- add(new BookmarkablePageLink<Void>("organizationProfile",+ add(new ViewStateAwarePageLink<Void>("organizationProfile",ProfileEditPage.class, ProfileEditPage.paramsOf(getAccount())) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.javaindex 6b3c2801c4..8e6e081ba2 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberPage.java@@ -12,7 +12,6 @@ import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;@@ -20,16 +19,16 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.AccountLink;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.PageTabLink;@@ -37,6 +36,7 @@ import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.util.ConfirmOnClick;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class MemberPage extends AccountLayoutPage {@@ -156,7 +156,7 @@ public abstract class MemberPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, MemberTeamListPage.class,+ return new ViewStateAwarePageLink<Void>(linkId, MemberTeamListPage.class,MemberTeamListPage.paramsOf(getMembership()));}@@ -174,7 +174,7 @@ public abstract class MemberPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, MemberEffectivePrivilegePage.class,+ return new ViewStateAwarePageLink<Void>(linkId, MemberEffectivePrivilegePage.class,MemberEffectivePrivilegePage.paramsOf(getMembership()));}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.javaindex 392f1c1539..fc710e8631 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/members/MemberTeamListPage.java@@ -13,7 +13,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -22,8 +21,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.json.JSONException;import org.json.JSONWriter;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.TeamManager;import com.gitplex.server.manager.TeamMembershipManager;@@ -32,12 +29,15 @@ import com.gitplex.server.model.Team;import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.component.teamchoice.TeamChoiceResourceReference;import com.gitplex.server.web.page.account.teams.TeamMemberListPage;+import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;@SuppressWarnings("serial")public class MemberTeamListPage extends MemberPage {@@ -191,7 +191,7 @@ public class MemberTeamListPage extends MemberPage {protected void populateItem(ListItem<TeamMembership> item) {Team team = item.getModelObject().getTeam();- Link<Void> teamLink = new BookmarkablePageLink<Void>("link",+ Link<Void> teamLink = new ViewStateAwarePageLink<Void>("link",TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));teamLink.add(new Label("name", team.getName()));item.add(teamLink);diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.javaindex dbb7f3219c..9ee7bad7f6 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/DepotListPanel.java@@ -8,7 +8,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -24,7 +23,8 @@ import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;@@ -130,8 +130,8 @@ public class DepotListPanel extends GenericPanel<Account> {protected void populateItem(final ListItem<Depot> item) {Depot depot = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<>("depotLink",- DepotFilePage.class, DepotFilePage.paramsOf(depot));+ Link<Void> link = new ViewStateAwarePageLink<>("depotLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(depot));link.add(new Label("depotName", depot.getName()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.javaindex a0aa73ae37..9cb9caec17 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/NewDepotPage.java@@ -14,7 +14,7 @@ import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.PathSegment;import com.gitplex.server.web.page.account.AccountLayoutPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")public class NewDepotPage extends AccountLayoutPage {@@ -51,7 +51,7 @@ public class NewDepotPage extends AccountLayoutPage {} else {depotManager.save(depot, null, null);Session.get().success("New repository created");- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.javaindex 9268fb6a66..76cf72704e 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/overview/UserOverviewPanel.java@@ -6,7 +6,6 @@ import java.util.List;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;@@ -16,8 +15,9 @@ import org.apache.wicket.model.IModel;import com.gitplex.server.model.Account;import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.roleselection.RoleSelectionPanel;@SuppressWarnings("serial")@@ -49,7 +49,7 @@ public class UserOverviewPanel extends GenericPanel<Account> {add(new Label("email", user.getEmail()).add(AttributeAppender.append("href", "mailto:" + user.getEmail())));- add(new BookmarkablePageLink<Void>("addOrganization",+ add(new ViewStateAwarePageLink<Void>("addOrganization",NewOrganizationPage.class, NewOrganizationPage.paramsOf(getUser())) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.javaindex 61b606337a..6d1515e1bb 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java@@ -12,7 +12,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-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.repeater.Item;@@ -21,7 +20,6 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.model.AbstractEntity;import com.gitplex.server.model.Account;@@ -30,14 +28,16 @@ import com.gitplex.server.model.PullRequestTask;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.BranchLink;import com.gitplex.server.web.component.datatable.DefaultDataTable;import com.gitplex.server.web.component.datatable.EntityDataProvider;import com.gitplex.server.web.component.datatable.SelectionColumn;+import com.gitplex.server.web.component.link.BranchLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public class TaskListPage extends AccountLayoutPage {@@ -76,7 +76,7 @@ public class TaskListPage extends AccountLayoutPage {String componentId, IModel<PullRequestTask> rowModel) {PullRequestTask task = rowModel.getObject();Fragment fragment = new Fragment(componentId, "requestFrag", TaskListPage.this);- fragment.add(new BookmarkablePageLink<Void>("link", RequestOverviewPage.class,+ fragment.add(new ViewStateAwarePageLink<Void>("link", RequestOverviewPage.class,RequestOverviewPage.paramsOf(task.getRequest())) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.javaindex dad7d744f4..4f10b37ca8 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamDepotListPage.java@@ -16,7 +16,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -25,7 +24,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.TeamAuthorizationManager;import com.gitplex.server.model.Account;@@ -36,10 +34,11 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.depotchoice.AbstractDepotChoiceProvider;import com.gitplex.server.web.component.depotchoice.DepotChoiceResourceReference;import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.component.select2.Response;@@ -47,6 +46,7 @@ import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.page.depot.setting.authorization.DepotTeamListPage;import com.gitplex.server.web.util.depotaccess.DepotAccess;+import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -270,7 +270,7 @@ public class TeamDepotListPage extends TeamPage {protected void populateItem(ListItem<TeamAuthorization> item) {TeamAuthorization authorization = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotTeamListPage.class,+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotTeamListPage.class,DepotTeamListPage.paramsOf(authorization.getDepot()));link.add(new Label("name", authorization.getDepot().getName()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.javaindex d2f2989560..fad6eed400 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamListPage.java@@ -10,7 +10,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -19,7 +18,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.TeamManager;import com.gitplex.server.manager.TeamMembershipManager;@@ -28,9 +26,11 @@ import com.gitplex.server.model.Team;import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;+import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;@@ -120,7 +120,7 @@ public class TeamListPage extends AccountLayoutPage {protected void populateItem(ListItem<Team> item) {Team team = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<>("link", TeamMemberListPage.class,+ Link<Void> link = new ViewStateAwarePageLink<>("link", TeamMemberListPage.class,TeamMemberListPage.paramsOf(team));link.add(new Label("name", team.getName()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.javaindex 7b2388525f..33e7fb2e3a 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamMemberListPage.java@@ -14,7 +14,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -24,8 +23,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.json.JSONException;import org.json.JSONWriter;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.manager.TeamMembershipManager;@@ -37,6 +34,7 @@ import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.select2.ChoiceProvider;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -44,6 +42,8 @@ import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.page.account.members.MemberListPage;import com.gitplex.server.web.page.account.members.MemberTeamListPage;import com.gitplex.server.web.util.avatar.AvatarManager;+import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -231,12 +231,12 @@ public class TeamMemberListPage extends TeamPage {OrganizationMembership membership =Preconditions.checkNotNull(getAccount().getOrganizationMembersMap().get(member));PageParameters params = MemberTeamListPage.paramsOf(membership);- Link<Void> link = new BookmarkablePageLink<Void>("avatarLink",+ Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",MemberTeamListPage.class, params);link.add(new Avatar("avatar", member));item.add(link);- link = new BookmarkablePageLink<Void>("nameLink",+ link = new ViewStateAwarePageLink<Void>("nameLink",MemberTeamListPage.class, params);link.add(new Label("name", member.getDisplayName()));item.add(link);@@ -312,7 +312,7 @@ public class TeamMemberListPage extends TeamPage {noMembersContainer.setOutputMarkupPlaceholderTag(true);add(noMembersContainer);- add(new BookmarkablePageLink<Void>("organizationMembers",+ add(new ViewStateAwarePageLink<Void>("organizationMembers",MemberListPage.class, MemberListPage.paramsOf(getAccount())) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.javaindex 370aaaf8ae..0cc1259ce5 100644--- a/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/account/teams/TeamPage.java@@ -7,26 +7,26 @@ import org.apache.wicket.Component;import org.apache.wicket.Page;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.TeamManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Team;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.PageTabLink;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.account.AccountLayoutPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.util.ConfirmOnClick;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class TeamPage extends AccountLayoutPage {@@ -63,7 +63,7 @@ public abstract class TeamPage extends AccountLayoutPage {add(new Label("teamName", teamModel.getObject().getName()));if (teamModel.getObject().getDescription() != null) {- add(new MarkdownPanel("teamDescription", Model.of(teamModel.getObject().getDescription()), null));+ add(new MarkdownViewer("teamDescription", Model.of(teamModel.getObject().getDescription()), null));} else {add(new Label("teamDescription", "<i>No description</i>").setEscapeModelStrings(false));}@@ -108,7 +108,7 @@ public abstract class TeamPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, TeamMemberListPage.class,+ return new ViewStateAwarePageLink<Void>(linkId, TeamMemberListPage.class,TeamMemberListPage.paramsOf(teamModel.getObject()));}@@ -124,7 +124,7 @@ public abstract class TeamPage extends AccountLayoutPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, TeamDepotListPage.class,+ return new ViewStateAwarePageLink<Void>(linkId, TeamDepotListPage.class,TeamDepotListPage.paramsOf(teamModel.getObject()));}diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.java b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.javaindex 3e4d9e868c..3f8ee6cbc2 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/AdministrationTabLink.java@@ -3,10 +3,11 @@ package com.gitplex.server.web.page.admin;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+@SuppressWarnings("serial")public class AdministrationTabLink extends Panel {@@ -22,7 +23,7 @@ public class AdministrationTabLink extends Panel {protected void onInitialize() {super.onInitialize();- Link<Void> link = new BookmarkablePageLink<Void>("link", tab.getMainPageClass());+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", tab.getMainPageClass());link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.javaindex aabf34cd8c..769105b17d 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java@@ -21,9 +21,9 @@ import com.gitplex.server.model.Account;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.confirmdelete.ConfirmDeleteAccountModal;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.setting.ProfileEditPage;import com.gitplex.server.web.page.admin.AdministrationPage;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 aab8d84702..4da40729c6 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@@ -139,6 +139,7 @@ public abstract class BasePage extends WebPage {byte[] bytes = Base64.decodeBase64(encodedData.getBytes());Serializable data = (Serializable) SerializationUtils.deserialize(bytes);onPopState(target, data);+ target.appendJavaScript("gitplex.server.viewState.getFromHistoryAndSetToView();");}@Override@@ -198,6 +199,7 @@ public abstract class BasePage extends WebPage {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new BaseResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.viewState.getFromHistoryAndSetToView();"));}public Collection<WebSocketRegion> getWebSocketRegions() {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 7884c5fdab..444f1c27be 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@@ -211,6 +211,7 @@ gitplex.server = {setupAutoSize: function() {var selector = "textarea:not(.no-autosize)";autosize($(selector));+$(document).on("elementReplaced", function(event, componentId) {var $component = $("#" + componentId);var $textarea = $component.find(selector);@@ -367,6 +368,70 @@ gitplex.server = {}},+ /*+ * View state represents scroll position and edit cursor. We restore view state+ * when page is backed, or in some cases carry over the view state from one page+ * to another (such as scrolling the page to same position being viewed when edit+ * a source code)+ */+ viewState: {+ getInnerMostAutoFit: function() {+ var $innerMost;+ var $autofits = $(".autofit:visible");+ while ($autofits.length != 0) {+ $innerMost = $autofits.first();+ $autofits = $innerMost.find(".autofit:visible");+ }+ return $innerMost;+ },+ getFromView: function() {+ var $innerMost = gitplex.server.viewState.getInnerMostAutoFit();+ if ($innerMost) {+ return $innerMost.triggerHandler("getViewState");+ } else {+ return undefined;+ }+ },+ setToView: function(viewState) {+ var $innerMost = gitplex.server.viewState.getInnerMostAutoFit();+ if ($innerMost) {+ $innerMost.triggerHandler("setViewState", viewState);+ }+ },+ getFromHistory: function() {+ if (history.state && history.state.viewState)+ return history.state.viewState;+ else+ return undefined;+ },+ setToHistory: function(viewState) {+ var state = history.state;+ if (!state)+ state = {};+ var newState = {viewState: viewState, data: state.data, visited: state.visited};+ history.replaceState(newState, '', window.location.href );+ gitplex.server.history.current = {+ state: newState,+ url: window.location.href+ };+ },+ getFromViewAndSetToHistory: function() {+ var viewState = gitplex.server.viewState.getFromView();+ if (viewState)+ gitplex.server.viewState.setToHistory(viewState);+ gitplex.server.viewState.carryOver = gitplex.server.viewState.getFromHistory();+ },+ getFromHistoryAndSetToView: function() {+ var viewState = gitplex.server.viewState.getFromHistory();+ if (viewState)+ gitplex.server.viewState.setToView(viewState);+ },+ getFromCarryOverAndSetToView: function() {+ if (gitplex.server.viewState.carryOver)+ gitplex.server.viewState.setToView(gitplex.server.viewState.carryOver)+ }+ },+history: {getHashlessUrl: function(url) {var index = url.indexOf('#');@@ -410,7 +475,6 @@ gitplex.server = {};},pushState: function(url, data) {- $(".autofit:visible").first().trigger("storeViewState");var state = {data: data};gitplex.server.history.current = {state: state, url: url};history.pushState(state, '', url);@@ -418,6 +482,7 @@ gitplex.server = {gitplex.server.history.setVisited();}, 100);},+/** visited flag is used to determine whether or not a page is newly visited* or loaded via back/forward button. If loaded via back/forward button we@@ -440,23 +505,6 @@ gitplex.server = {isVisited: function() {return history.state && history.state.visited;},- setViewState: function(viewState) {- var state = history.state;- if (!state)- state = {};- var newState = {viewState: viewState, data: state.data, visited: state.visited};- history.replaceState(newState, '', window.location.href );- gitplex.server.history.current = {- state: newState,- url: window.location.href- };- },- getViewState: function() {- if (history.state && history.state.viewState)- return history.state.viewState;- else- return undefined;- }},isDevice: function() {var ua = navigator.userAgent.toLowerCase();@@ -468,31 +516,8 @@ gitplex.server = {mouseState: {pressed: false,moved: false- }-};--$(function() {- gitplex.server.setupAutoSize();- gitplex.server.setupAjaxLoadingIndicator();- gitplex.server.form.setupDirtyCheck();- gitplex.server.focus.setupAutoFocus();- gitplex.server.websocket.setupCallback();-});--$(window).load(function() {- gitplex.server.history.setVisited();-});--// disable this as calling replaceState in beforeunload also affects state of-// the page to be loaded-/*-$(window).on("beforeunload", function() {- $(".autofit:visible").first().trigger("storeViewState");-});-*/--$(document).ready(function() {- $(window).load(function() {+ },+ setupMouseStateTracker: function() {$(document).mousedown(function() {gitplex.server.mouseState.pressed = true;gitplex.server.mouseState.moved = false;@@ -513,5 +538,26 @@ $(document).ready(function() {$(document).scroll(function() {gitplex.server.mouseState.moved = false;});- });+ }+};++$(function() {+ gitplex.server.setupAjaxLoadingIndicator();+ gitplex.server.form.setupDirtyCheck();+ gitplex.server.focus.setupAutoFocus();+ gitplex.server.websocket.setupCallback();+ gitplex.server.setupMouseStateTracker();+});++$(window).load(function() {+ gitplex.server.setupAutoSize();+ gitplex.server.history.setVisited();});++// disable this as calling replaceState in beforeunload also affects state of+// the page to be loaded+/*+$(window).on("beforeunload", function() {+ $(".autofit:visible").first().trigger("storeViewState");+});+*/diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.javaindex 14ba0cfb2e..32da77b8ff 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java@@ -16,7 +16,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-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.model.IModel;@@ -28,24 +27,24 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.Constants;import org.eclipse.jgit.lib.ObjectId;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.DropdownLink;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.Tabbable;import com.gitplex.server.web.page.account.AccountPage;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.moreinfo.MoreInfoPanel;import com.gitplex.server.web.page.depot.pullrequest.newrequest.NewRequestPage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;@@ -53,6 +52,7 @@ import com.gitplex.server.web.page.depot.pullrequest.requestlist.RequestListPageimport com.gitplex.server.web.page.depot.setting.DepotSettingPage;import com.gitplex.server.web.page.depot.setting.general.GeneralSettingPage;import com.gitplex.server.web.page.depot.tags.DepotTagsPage;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class DepotPage extends AccountPage {@@ -131,7 +131,7 @@ public abstract class DepotPage extends AccountPage {super.onInitialize();List<PageTab> tabs = new ArrayList<>();- tabs.add(new DepotTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, DepotFilePage.class));+ tabs.add(new DepotTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, DepotBlobPage.class));tabs.add(new DepotTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,DepotCommitsPage.class, CommitDetailPage.class));tabs.add(new DepotTab(Model.of("Branches"), "fa fa-fw fa-code-fork",@@ -190,13 +190,13 @@ public abstract class DepotPage extends AccountPage {@Overrideprotected Component newContextHead(String componentId) {Fragment fragment = new Fragment(componentId, "contextHeadFrag", this);- Link<Void> accountLink = new BookmarkablePageLink<>("accountLink",+ Link<Void> accountLink = new ViewStateAwarePageLink<>("accountLink",AccountOverviewPage.class, AccountOverviewPage.paramsOf(getAccount()));accountLink.add(new Label("accountName", getAccount().getName()));fragment.add(accountLink);- Link<Void> depotLink = new BookmarkablePageLink<>("depotLink",- DepotFilePage.class, DepotFilePage.paramsOf(getDepot()));+ Link<Void> depotLink = new ViewStateAwarePageLink<>("depotLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot()));depotLink.add(new Label("depotName", getDepot().getName()));fragment.add(depotLink);fragment.add(new DropdownLink("depotMoreInfo") {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.javaindex 7fa051eea4..608dbb47e9 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotTabLink.java@@ -3,10 +3,11 @@ package com.gitplex.server.web.page.depot;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+@SuppressWarnings("serial")public class DepotTabLink extends Panel {@@ -23,7 +24,7 @@ public class DepotTabLink extends Panel {super.onInitialize();DepotPage page = (DepotPage) getPage();- Link<Void> link = new BookmarkablePageLink<Void>("link",+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",tab.getMainPageClass(), DepotPage.paramsOf(page.getDepot()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.javaindex 8527d17955..0464942da6 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/NoBranchesPage.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.model.Depot;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")public class NoBranchesPage extends DepotPage {@@ -17,7 +17,7 @@ public class NoBranchesPage extends DepotPage {super(params);if (getDepot().getDefaultBranch() != null)- throw new RestartResponseException(DepotFilePage.class, DepotFilePage.paramsOf(getDepot()));+ throw new RestartResponseException(DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot()));}@Override@@ -37,7 +37,7 @@ public class NoBranchesPage extends DepotPage {@Overrideprotected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.htmlsimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.htmlindex 92f67b0289..aa6bba3478 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.html@@ -1,22 +1,23 @@<wicket:extend>- <div id="repo-file">+ <div id="depot-blob"><div class="head clearfix"><a wicket:id="revisionPicker" class="revision-picker pull-left"></a>- <div wicket:id="fileNavigator" class="file-navigator pull-left"></div>- <div class="operations">+ <div wicket:id="blobNavigator" class="blob-navigator pull-left"></div>+ <div wicket:id="blobOperations" class="operations"><span wicket:id="instantSearch"></span><a wicket:id="advancedSearch" title="Advanced search of symbols, files and texts"><i class="fa fa-binoculars"></i></a>+ <a wicket:id="add" title="Add new file"><i class="fa fa-plus"></i></a><a wicket:id="history" title="Commit history of current path"><i class="fa fa-history"></i></a><a wicket:id="download" title="Download zip archive of whole repository at this revision"><i class="fa fa-download"></i></a></div></div><!-- below is used to hold file navigator if there is not enough space in head -->- <div class="file-navigator clearfix"></div>+ <div class="blob-navigator clearfix"></div><div wicket:id="revisionIndexing" class="revision-indexing"><img wicket:id="icon"></img><span>Revision indexing in progress... (search in this revision will be accurate after indexed)</span></div>- <div wicket:id="fileViewer" class="file-viewer"></div>+ <div wicket:id="blobContent" class="blob-content"></div><div wicket:id="searchResultContainer" class="search-result"><div id="search-result-resize-handle" class="ui-resizable-handle ui-resizable-n"></div><div wicket:id="searchResult"></div>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.javanew file mode 100644index 0000000000..7ba44f5ee2--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java@@ -0,0 +1,921 @@+package com.gitplex.server.web.page.depot.blob;++import java.io.IOException;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.behavior.AttributeAppender;+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.html.WebMarkupContainer;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.PackageResourceReference;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevTree;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;++import com.gitplex.jsymbol.TokenPosition;+import com.gitplex.jsymbol.util.NoAntiCacheImage;+import com.gitplex.launcher.loader.ListenerRegistry;+import com.gitplex.server.GitPlex;+import com.gitplex.server.event.RefUpdated;+import com.gitplex.server.git.BlobIdent;+import com.gitplex.server.git.GitUtils;+import com.gitplex.server.git.exception.ObjectNotFoundException;+import com.gitplex.server.manager.CodeCommentManager;+import com.gitplex.server.manager.DepotManager;+import com.gitplex.server.manager.PullRequestManager;+import com.gitplex.server.model.CodeComment;+import com.gitplex.server.model.Depot;+import com.gitplex.server.model.PullRequest;+import com.gitplex.server.model.PullRequestUpdate;+import com.gitplex.server.model.support.TextRange;+import com.gitplex.server.persistence.UnitOfWork;+import com.gitplex.server.search.IndexManager;+import com.gitplex.server.search.SearchManager;+import com.gitplex.server.search.hit.QueryHit;+import com.gitplex.server.search.query.BlobQuery;+import com.gitplex.server.search.query.TextQuery;+import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.component.link.ArchiveMenuLink;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.component.modal.ModalLink;+import com.gitplex.server.web.component.revisionpicker.RevisionPicker;+import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.NoBranchesPage;+import com.gitplex.server.web.page.depot.blob.navigator.BlobNavigator;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.view.MarkSupport;+import com.gitplex.server.web.page.depot.blob.search.advanced.AdvancedSearchPanel;+import com.gitplex.server.web.page.depot.blob.search.instant.InstantSearchPanel;+import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;+import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;+import com.gitplex.server.web.websocket.CodeCommentChangedRegion;+import com.gitplex.server.web.websocket.CommitIndexedRegion;+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;++@SuppressWarnings("serial")+public class DepotBlobPage extends DepotPage implements BlobRenderContext {++ private static final String PARAM_REVISION = "revision";++ private static final String PARAM_PATH = "path";++ private static final String PARAM_REQUEST_COMPARE_INFO = "request_compare_info";++ private static final String PARAM_COMMENT = "comment";++ private static final String PARAM_MODE = "mode";++ private static final String PARAM_QUERY = "query";++ private static final String PARAM_MARK = "mark";++ private static final String PARAM_ANCHOR = "anchor";++ private static final String REVISION_PICKER_ID = "revisionPicker";++ private static final String BLOB_NAVIGATOR_ID = "blobNavigator";++ private static final String BLOB_CONTENT_ID = "blobContent";++ private static final String SEARCH_RESULD_ID = "searchResult";++ private State state = new State();++ private ObjectId resolvedRevision;++ private Component revisionIndexing;++ private WebMarkupContainer searchResultContainer;++ private ObjectId commitId;++ public DepotBlobPage(final PageParameters params) {+ super(params);++ if (getDepot().getDefaultBranch() == null)+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));++ List<String> revisionAndPathSegments = new ArrayList<>();+ String segment = params.get(PARAM_REVISION).toString();+ if (segment != null && segment.length() != 0)+ revisionAndPathSegments.add(segment);+ segment = params.get(PARAM_PATH).toString();+ if (segment != null && segment.length() != 0)+ revisionAndPathSegments.add(segment);++ for (int i=0; i<params.getIndexedCount(); i++) {+ segment = params.get(i).toString();+ if (segment.length() != 0)+ revisionAndPathSegments.add(segment);+ }++ state.blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);++ if (state.blobIdent.revision == null)+ state.blobIdent.revision = getDepot().getDefaultBranch();++ resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);++ RevCommit commit = getDepot().getRevCommit(state.blobIdent.revision);+ commitId = commit.copy();++ if (state.blobIdent.path != null) {+ try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ RevTree revTree = commit.getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), state.blobIdent.path, revTree);+ if (treeWalk == null) {+ throw new ObjectNotFoundException("Unable to find blob path '" + state.blobIdent.path+ + "' in revision '" + state.blobIdent.revision + "'");+ }+ state.blobIdent.mode = treeWalk.getRawMode(0);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ state.blobIdent.mode = FileMode.TREE.getBits();+ }++ String modeStr = params.get(PARAM_MODE).toString();+ if (modeStr != null)+ state.mode = Mode.valueOf(modeStr.toUpperCase());++ state.mark = TextRange.of(params.get(PARAM_MARK).toString());+ state.anchor = params.get(PARAM_ANCHOR).toString();++ state.commentId = params.get(PARAM_COMMENT).toOptionalLong();++ state.requestCompareInfo = RequestCompareInfo.fromString(params.get(PARAM_REQUEST_COMPARE_INFO).toString());++ state.query = params.get(PARAM_QUERY).toString();++ if (state.mode == Mode.ADD || state.mode == Mode.EDIT || state.mode == Mode.DELETE) {+ if (!isOnBranch())+ throw new IllegalArgumentException("Files can only be edited on branch");++ String path = state.blobIdent.path;+ if (path != null && state.blobIdent.isTree())+ path += "/";+ if (!SecurityUtils.canModify(getDepot(), state.blobIdent.revision, path))+ unauthorized();+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ newRevisionPicker(null);+ newBlobNavigator(null);+ newBlobOperations(null);++ add(revisionIndexing = new WebMarkupContainer("revisionIndexing") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new NoAntiCacheImage("icon", new PackageResourceReference(DepotBlobPage.class, "indexing.gif")));+ setOutputMarkupPlaceholderTag(true);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ IndexManager indexManager = GitPlex.getInstance(IndexManager.class);+ if (!indexManager.isIndexed(getDepot(), commitId)) {+ GitPlex.getInstance(IndexManager.class).indexAsync(getDepot(), commitId);+ setVisible(true);+ } else {+ setVisible(false);+ }+ }++ });++ newBlobContent(null);++ add(searchResultContainer = new WebMarkupContainer("searchResultContainer"));++ List<QueryHit> queryHits;+ if (state.query != null) {+ BlobQuery query = new TextQuery.Builder()+ .term(state.query)+ .wholeWord(true)+ .caseSensitive(true)+ .count(SearchResultPanel.MAX_QUERY_ENTRIES)+ .build();+ try {+ SearchManager searchManager = GitPlex.getInstance(SearchManager.class);+ queryHits = searchManager.search(depotModel.getObject(), commitId, query);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }+ } else {+ queryHits = null;+ }++ newSearchResult(null, queryHits);++ add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ handler.add(revisionIndexing);+ resizeWindow(handler);+ }++ });+ }++ /*+ * In case we are on a branch, this operation makes sure that the branch resolves+ * to a certain commit during the life cycle of our page, unless the page is+ * refreshed. This can avoid the issue that displayed file content and subsequent+ * operations encounters different commit if someone commits to the branch while+ * we are staying on the page.+ */+ @Override+ protected Map<String, ObjectId> getObjectIdCache() {+ Map<String, ObjectId> objectIdCache = new HashMap<>();+ if (resolvedRevision != null)+ objectIdCache.put(state.blobIdent.revision, resolvedRevision);+ return objectIdCache;+ }++ @Override+ public CodeComment getOpenComment() {+ if (state.commentId != null)+ return GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);+ else+ return null;+ }++ private void newBlobNavigator(@Nullable AjaxRequestTarget target) {+ Component blobNavigator = new BlobNavigator(BLOB_NAVIGATOR_ID, this);+ if (target != null) {+ replace(blobNavigator);+ target.add(blobNavigator);+ } else {+ add(blobNavigator);+ }+ }++ private void newBlobOperations(@Nullable AjaxRequestTarget target) {+ WebMarkupContainer blobOperations = new WebMarkupContainer("blobOperations");+ blobOperations.setOutputMarkupId(true);++ blobOperations.add(new ViewStateAwareAjaxLink<Void>("add") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onModeChange(target, Mode.ADD);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible((state.mode == Mode.VIEW || state.mode == Mode.BLAME)+ && isOnBranch()+ && state.blobIdent.isTree()+ && SecurityUtils.canModify(getDepot(), state.blobIdent.revision, state.blobIdent.path));+ }++ });++ blobOperations.add(new InstantSearchPanel("instantSearch", depotModel, new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return state.blobIdent.revision;+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {+ BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),+ FileMode.REGULAR_FILE.getBits());+ DepotBlobPage.this.onSelect(target, selected, hit.getTokenPos());+ }++ @Override+ protected void onMoreQueried(AjaxRequestTarget target, List<QueryHit> hits) {+ newSearchResult(target, hits);+ resizeWindow(target);+ }++ });++ blobOperations.add(new ModalLink("advancedSearch") {++ @Override+ protected Component newContent(String id) {+ return new AdvancedSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return state.blobIdent.revision;+ }++ }) {++ @Override+ protected void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {+ newSearchResult(target, hits);+ resizeWindow(target);+ close(target);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close(target);+ }++ @Override+ protected BlobIdent getCurrentBlob() {+ return state.blobIdent;+ }++ };+ }++ });++ blobOperations.add(new Link<Void>("history") {++ @Override+ public void onClick() {+ DepotCommitsPage.State state = new DepotCommitsPage.State();+ state.setCompareWith(resolvedRevision.name());+ if (DepotBlobPage.this.state.blobIdent.path != null)+ state.setQuery(String.format("path(%s)", DepotBlobPage.this.state.blobIdent.path));+ setResponsePage(DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot(), state));+ }++ });++ blobOperations.add(new ArchiveMenuLink("download", depotModel) {++ @Override+ protected String getRevision() {+ return state.blobIdent.revision;+ }++ });++ if (target != null) {+ replace(blobOperations);+ target.add(blobOperations);+ } else {+ add(blobOperations);+ }+ }++ private void newBlobContent(@Nullable AjaxRequestTarget target) {+ PrioritizedComponentRenderer mostPrioritizedRenderer = null;+ for (BlobRendererContribution contribution: GitPlex.getExtensions(BlobRendererContribution.class)) {+ PrioritizedComponentRenderer renderer = contribution.getRenderer(this);+ if (renderer != null) {+ if (mostPrioritizedRenderer == null || mostPrioritizedRenderer.getPriority() > renderer.getPriority())+ mostPrioritizedRenderer = renderer;+ }+ }+ Component blobContent = Preconditions.checkNotNull(mostPrioritizedRenderer).render(BLOB_CONTENT_ID);+ if (target != null) {+ replace(blobContent);+ target.add(blobContent);+ } else {+ add(blobContent);+ }+ }++ private void showRequestChanges(AjaxRequestTarget target, ObjectId oldCommitId, ObjectId newCommitId) {+ if (state.requestCompareInfo.compareState != null) {+ RequestChangesPage.State changeState = SerializationUtils.clone(this.state.requestCompareInfo.compareState);+ changeState.newCommit = newCommitId.name();+ changeState.pathFilter = null;+ if (changeState.commentId != null) {+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(changeState.commentId);+ changeState.oldCommit = comment.getCommentPos().getCommit();+ } else {+ changeState.oldCommit = oldCommitId.name();+ }+ get(BLOB_CONTENT_ID).add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ PullRequest request = GitPlex.getInstance(PullRequestManager.class)+ .load(DepotBlobPage.this.state.requestCompareInfo.requestId);+ for (PullRequestUpdate update: request.getUpdates()) {+ if (update.getHeadCommitHash().equals(newCommitId.name())) {+ setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, changeState));+ break;+ }+ }+ }++ });+ } else {+ get(BLOB_CONTENT_ID).add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ PullRequest request = GitPlex.getInstance(PullRequestManager.class)+ .load(state.requestCompareInfo.requestId);+ for (PullRequestUpdate update: request.getUpdates()) {+ if (update.getHeadCommitHash().equals(newCommitId.name())) {+ setResponsePage(RequestChangesPage.class, IntegrationPreviewPage.paramsOf(request));+ break;+ }+ }+ }++ });+ }+ }++ private void pushState(AjaxRequestTarget target) {+ PageParameters params = paramsOf(getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);+ pushState(target, url.toString(), state);+ }++ private void newRevisionPicker(@Nullable AjaxRequestTarget target) {+ Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, depotModel, state.blobIdent.revision, true) {++ @Override+ protected String getRevisionUrl(String revision) {+ State state = new State();+ state.blobIdent.revision = revision;+ PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);+ return urlFor(DepotBlobPage.class, params).toString();+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ BlobIdent newBlobIdent = new BlobIdent();+ newBlobIdent.revision = revision;+ if (state.blobIdent.path != null) {+ try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ RevTree revTree = getDepot().getRevCommit(revision, true).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), state.blobIdent.path, revTree);+ if (treeWalk != null) {+ newBlobIdent.path = state.blobIdent.path;+ newBlobIdent.mode = treeWalk.getRawMode(0);+ } else {+ newBlobIdent.mode = FileMode.TREE.getBits();+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ DepotBlobPage.this.onSelect(target, newBlobIdent, null);+ }++ };+ if (target != null) {+ replace(revisionPicker);+ target.add(revisionPicker);+ } else {+ add(revisionPicker);+ }+ }++ /*+ * This method represents changing of resolved revision, instead of the named revision.+ * It is possible that resolved revision changes while named revision remains unchanged.+ * For instance when a file on a branch is edited from this page, the named revision+ * remains unchanged (still point to the branch), but the underlying resolved revision+ * (the commit) has been changed+ *+ * @param target+ */+ private void onResolvedRevisionChange(AjaxRequestTarget target) {+ /*+ * A hack to reset resolved revision to null to disable getObjectIdCache()+ * temporarily as otherwise getObjectId() method below will always+ * resolved to existing value of resolvedRevision+ */+ resolvedRevision = null;+ resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);+ commitId = getDepot().getRevCommit(state.blobIdent.revision).copy();+ GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ newRevisionPicker(target);+ target.add(revisionIndexing);+ newBlobNavigator(target);+ newBlobOperations(target);+ newBlobContent(target);+ resizeWindow(target);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new DepotBlobResourceReference()));+ }++ public static PageParameters paramsOf(Depot depot, CodeComment comment, @Nullable String anchor) {+ DepotBlobPage.State state = new DepotBlobPage.State();+ state.blobIdent.revision = comment.getCommentPos().getCommit();+ state.blobIdent.path = comment.getCommentPos().getPath();+ state.blobIdent.mode = FileMode.TYPE_FILE;+ state.commentId = comment.getId();+ state.mark = comment.getCommentPos().getRange();+ state.anchor = anchor;+ return paramsOf(depot, state);+ }++ public static PageParameters paramsOf(Depot depot, State state) {+ PageParameters params = paramsOf(depot);+ if (state.blobIdent.revision != null)+ params.set(PARAM_REVISION, state.blobIdent.revision);+ if (state.blobIdent.path != null)+ params.set(PARAM_PATH, state.blobIdent.path);+ if (state.mark != null)+ params.set(PARAM_MARK, state.mark.toString());+ if (state.anchor != null)+ params.set(PARAM_ANCHOR, state.anchor);+ if (state.requestCompareInfo != null)+ params.set(PARAM_REQUEST_COMPARE_INFO, state.requestCompareInfo.toString());+ if (state.commentId != null)+ params.set(PARAM_COMMENT, state.commentId);+ if (state.mode != Mode.VIEW)+ params.set(PARAM_MODE, state.mode.name().toLowerCase());+ if (state.query != null)+ params.set(PARAM_QUERY, state.query);+ return params;+ }++ private void newSearchResult(@Nullable AjaxRequestTarget target, @Nullable List<QueryHit> hits) {+ Component searchResult;+ if (hits != null) {+ searchResult = new SearchResultPanel(SEARCH_RESULD_ID, this, hits) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ newSearchResult(target, null);+ resizeWindow(target);+ }++ };+ if (target != null) {+ target.appendJavaScript(""+ + "$('#depot-blob>.search-result').show(); "+ + "$('#depot-blob .search-result>.body').focus();");+ }+ } else {+ searchResult = new WebMarkupContainer(SEARCH_RESULD_ID).setOutputMarkupId(true);+ if (target != null)+ target.appendJavaScript("$('#depot-blob>.search-result').hide();");+ else+ searchResultContainer.add(AttributeAppender.replace("style", "display: none;"));+ }+ if (target != null) {+ searchResultContainer.replace(searchResult);+ target.add(searchResult);+ } else {+ searchResultContainer.add(searchResult);+ }+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);++ State popState = (State) data;+ if (!popState.blobIdent.revision.equals(state.blobIdent.revision)) {+ state = popState;+ newSearchResult(target, null);+ onResolvedRevisionChange(target);+ } else {+ state = popState;+ newBlobNavigator(target);+ newBlobOperations(target);+ newBlobContent(target);+ resizeWindow(target);+ }+ }++ private void resizeWindow(IPartialPageRequestHandler partialPageRequestHandler) {+ partialPageRequestHandler.appendJavaScript("$(window).resize();");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ setResponsePage(DepotBlobPage.class, paramsOf(depot));+ }++ @Override+ public BlobIdent getBlobIdent() {+ return state.blobIdent;+ }++ @Override+ public TextRange getMark() {+ return state.mark;+ }++ @Override+ public String getAnchor() {+ return state.anchor;+ }++ @Override+ public void onMark(AjaxRequestTarget target, TextRange mark) {+ state.mark = mark;+ pushState(target);+ }++ @Override+ public String getMarkUrl(TextRange mark) {+ State markState = SerializationUtils.clone(state);+ markState.blobIdent.revision = resolvedRevision.name();+ markState.requestCompareInfo = null;+ markState.commentId = null;+ markState.mark = mark;+ PageParameters params = paramsOf(getDepot(), markState);+ return RequestCycle.get().urlFor(DepotBlobPage.class, params).toString();+ }++ @Override+ public Mode getMode() {+ return state.mode;+ }++ @Override+ public void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable TokenPosition tokenPos) {+ state.mark = TextRange.of(tokenPos);+ if (!blobIdent.revision.equals(state.blobIdent.revision)) {+ state.blobIdent = blobIdent;+ state.mode = Mode.VIEW;+ state.commentId = null;+ newSearchResult(target, null);+ onResolvedRevisionChange(target);+ } else {+ if (!Objects.equal(state.blobIdent.path, blobIdent.path)+ || state.mark != null && !(get(BLOB_CONTENT_ID) instanceof MarkSupport)) {+ state.blobIdent.path = blobIdent.path;+ state.blobIdent.mode = blobIdent.mode;+ state.mode = Mode.VIEW;+ state.commentId = null;+ newBlobNavigator(target);+ newBlobOperations(target);+ newBlobContent(target);+ resizeWindow(target);+ GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ } else if (state.mark != null) {+ // This logic is added for performance reason, we do not want to+ // reload the file if go to different mark positions in same file+ ((MarkSupport)get(BLOB_CONTENT_ID)).mark(target, state.mark);+ }+ }+ pushState(target);+ }++ @Override+ public void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {+ newSearchResult(target, hits);+ resizeWindow(target);+ }++ @Override+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {+ if (comment != null) {+ state.commentId = comment.getId();+ state.mark = comment.getCommentPos().getRange();+ } else {+ state.commentId = null;+ state.mark = null;+ }+ GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ pushState(target);+ }++ @Override+ public void onAddComment(AjaxRequestTarget target, TextRange mark) {+ state.commentId = null;+ GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);+ state.mark = mark;+ pushState(target);+ }++ @Override+ public boolean isOnBranch() {+ return getDepot().getBranchRef(state.blobIdent.revision) != null;+ }++ @Override+ public RevCommit getCommit() {+ return getDepot().getRevCommit(getBlobIdent().revision);+ }++ @Override+ protected boolean isFootVisible() {+ return false;+ }++ @Override+ public Collection<WebSocketRegion> getWebSocketRegions() {+ Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ regions.add(new CommitIndexedRegion(getDepot().getId(), commitId));+ if (state.commentId != null)+ regions.add(new CodeCommentChangedRegion(state.commentId));++ /*+ * add below so that we can jump to request changes page after editing a file+ */+ if (state.requestCompareInfo != null)+ regions.add(new PullRequestChangedRegion(state.requestCompareInfo.requestId));+ return regions;+ }++ public static class State implements Serializable {++ private static final long serialVersionUID = 1L;++ public Long commentId;++ public BlobIdent blobIdent = new BlobIdent();++ public TextRange mark;++ public String anchor;++ public Mode mode = Mode.VIEW;++ public RequestCompareInfo requestCompareInfo;++ public String query;++ }++ @Override+ public void onModeChange(AjaxRequestTarget target, Mode mode) {+ if (state.mode == Mode.EDIT && mode == Mode.VIEW && state.requestCompareInfo != null) {+ PullRequest request = GitPlex.getInstance(PullRequestManager.class)+ .load(state.requestCompareInfo.requestId);+ if (state.requestCompareInfo.compareState != null) {+ PageParameters params = RequestChangesPage.paramsOf(request,+ state.requestCompareInfo.compareState);+ setResponsePage(RequestChangesPage.class, params);+ } else {+ PageParameters params = IntegrationPreviewPage.paramsOf(request,+ state.requestCompareInfo.previewState);+ setResponsePage(IntegrationPreviewPage.class, params);+ }+ } else {+ /*+ * User might be changing blob name when adding a file, and onModeChange will be called.+ * In this case, we only need to re-create blob content+ */+ if (mode != Mode.ADD || state.mode != Mode.ADD) {+ state.mode = mode;+ pushState(target);+ if (state.mode == Mode.VIEW || state.mode == Mode.EDIT || state.mode == Mode.ADD) {+ newBlobNavigator(target);+ newBlobOperations(target);+ }+ }+ newBlobContent(target);+ resizeWindow(target);+ }+ }++ @Override+ public void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {+ String refName = GitUtils.branch2ref(state.blobIdent.revision);+ BlobIdent newBlobIdent;+ if (state.mode == Mode.DELETE) {+ Depot depot = getDepot();+ String branch = state.blobIdent.revision;+ depot.cacheObjectId(branch, newCommit);+ resolvedRevision = newCommit;+ try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {+ RevTree revTree = getDepot().getRevCommit(newCommit).getTree();+ String parentPath = StringUtils.substringBeforeLast(state.blobIdent.path, "/");+ while (TreeWalk.forPath(getDepot().getRepository(), parentPath, revTree) == null) {+ if (parentPath.contains("/")) {+ parentPath = StringUtils.substringBeforeLast(parentPath, "/");+ } else {+ parentPath = null;+ break;+ }+ }++ Long depotId = depot.getId();+ Subject subject = SecurityUtils.getSubject();+ ObjectId oldCommitId = oldCommit.copy();+ ObjectId newCommitId = newCommit.copy();+ GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);+ depot.cacheObjectId(branch, newCommitId);+ RefUpdated event = new RefUpdated(depot, refName, oldCommitId, newCommitId);+ GitPlex.getInstance(ListenerRegistry.class).post(event);+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });++ newBlobIdent = new BlobIdent(branch, parentPath, FileMode.TREE.getBits());++ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ Depot depot = getDepot();+ String branch = state.blobIdent.revision;+ depot.cacheObjectId(branch, newCommit);+ resolvedRevision = newCommit;+ newBlobIdent = new BlobIdent(branch, getNewPath(), FileMode.REGULAR_FILE.getBits());++ Subject subject = SecurityUtils.getSubject();++ Long depotId = depot.getId();+ ObjectId oldCommitId = oldCommit.copy();+ ObjectId newCommitId = newCommit.copy();+ GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);+ depot.cacheObjectId(branch, oldCommitId);+ RefUpdated event = new RefUpdated(depot, refName, oldCommitId, newCommitId);+ GitPlex.getInstance(ListenerRegistry.class).post(event);+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ if (state.requestCompareInfo != null) {+ showRequestChanges(target, oldCommit, newCommit);+ } else {+ state.blobIdent = newBlobIdent;+ state.mark = null;+ state.commentId = null;+ state.mode = Mode.VIEW;+ onResolvedRevisionChange(target);+ pushState(target);+ }++ // fix the issue that sometimes indexing indicator of new commit does not disappear+ target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");+ }++ @Override+ public String getNewPath() {+ BlobNavigator blobNavigator = (BlobNavigator) get(BLOB_NAVIGATOR_ID);+ return blobNavigator.getNewPath();+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.javasimilarity index 71%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.javaindex d0acf43aed..ec74c75c8f 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFileResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.file;+package com.gitplex.server.web.page.depot.blob;import java.util.List;@@ -11,12 +11,12 @@ import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class DepotFileResourceReference extends BaseDependentResourceReference {+public class DepotBlobResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public DepotFileResourceReference() {- super(DepotFileResourceReference.class, "depot-file.js");+ public DepotBlobResourceReference() {+ super(DepotBlobResourceReference.class, "depot-blob.js");}@Override@@ -24,7 +24,8 @@ public class DepotFileResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(DepotFileResourceReference.class, "depot-file.css")));+ dependencies.add(CssHeaderItem.forReference(+ new BaseDependentCssResourceReference(DepotBlobResourceReference.class, "depot-blob.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.javasimilarity index 98%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.javaindex 1ae30fa10b..45f0c479f5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/RequestCompareInfo.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.page.depot.file;+package com.gitplex.server.web.page.depot.blob;import java.io.Serializable;import java.io.UnsupportedEncodingException;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.csssimilarity index 62%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.cssindex a5d5bd4fe0..db0dcc0019 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.css@@ -1,33 +1,33 @@-#repo-file>.head {+#depot-blob>.head {border-bottom: 1px solid #BBB;height: 31px;}-#repo-file>.head>.revision-picker {+#depot-blob>.head>.revision-picker {padding: 0;}-#repo-file>.head>.comment-context {+#depot-blob>.head>.comment-context {border-right: 1px solid #BBB;padding: 5px 8px 0 8px;height: 31px;cursor: pointer;}-#repo-file>.head>a.revision-picker {+#depot-blob>.head>a.revision-picker {display: block;border-right: 1px solid #BBB;color: #333;text-decoration: none;}-#repo-file>.head>a.revision-picker:hover {+#depot-blob>.head>a.revision-picker:hover {background: #EEE;clear: both;}-#repo-file>.head>a.revision-picker, #repo-file>.head>.file-navigator, #repo-file>.file-navigator>div {+#depot-blob>.head>a.revision-picker, #depot-blob>.head>.blob-navigator, #depot-blob>.blob-navigator>div {padding: 5px 8px;}-#repo-file>.head>.file-navigator, #repo-file>.file-navigator>div {+#depot-blob>.head>.blob-navigator, #depot-blob>.blob-navigator>div {padding: 5px 8px 0px 8px;}-#repo-file>.head>.file-navigator input.name {+#depot-blob>.head>.blob-navigator form.name input {height: 30px;border: 1px solid #BBB;border-top: none;@@ -37,10 +37,10 @@padding-left: 0px 8px;width: 160px;}-#repo-file>.file-navigator {+#depot-blob>.blob-navigator {border-bottom: 1px solid #BBB;}-#repo-file>.file-navigator input.name {+#depot-blob>.blob-navigator form.name input {border-top: 1px solid #BBB;border-bottom: 1px solid #BBB;height: 26px;@@ -49,24 +49,28 @@width: 160px;}-#repo-file>.head>.operations {+#depot-blob>.head>.operations {position: absolute;margin-top: 5px;right: 6px;}-#repo-file>.head>.operations>a, #repo-file>.head>.operations>span {+#depot-blob>.head>.operations>a, #depot-blob>.head>.operations>span {color: #666;margin-right: 8px;}-#repo-file>.head>.operations .fa-download {+#depot-blob>.head>.operations .fa-download {font-size: 16px;vertical-align: bottom;}-#repo-file>.head>.operations .fa-history {+#depot-blob>.head>.operations .fa-history {font-size: 16px;vertical-align: middle;}-#repo-file>.head>.operations input {+#depot-blob>.head>.operations .fa-plus {+ font-size: 16px;+ vertical-align: middle;+}+#depot-blob>.head>.operations input {border-radius: 0;border-color: #BBB;height: 30px;@@ -80,23 +84,23 @@font-size: 14px;}-#repo-file>.file-navigator {+#depot-blob>.blob-navigator {display: none;padding: 2px 0 3px 0;}-#repo-file>.revision-indexing {+#depot-blob>.revision-indexing {padding: 8px 8px 9px 8px;background: #fcf8e3;border-bottom: 1px solid #DDD;color: #8a6d3b;font-size: 13px;}-#repo-file>.search-result {+#depot-blob>.search-result {height: 200px;border-top: 1px solid #CCC;}-#repo-file>.search-result>.ui-resizable-handle {+#depot-blob>.search-result>.ui-resizable-handle {background: #EEE url(hgrabber.png) no-repeat scroll center top;cursor: n-resize;height: 4px;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.jssimilarity index 57%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.jsrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.jsindex 7c60f06984..1f6e6ecc20 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/depot-file.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/depot-blob.js@@ -1,8 +1,8 @@$(window).load(function() {- if ($("#repo-file").length != 0) {+ if ($("#depot-blob").length != 0) {var cookieKey = "repoFile.searchResult.height";$("body").css("overflow", "hidden");- var $searchResult = $("#repo-file>.search-result");+ var $searchResult = $("#depot-blob>.search-result");var height = Cookies.get(cookieKey);if (height)$searchResult.outerHeight(height);@@ -11,9 +11,9 @@ $(window).load(function() {handles: {"n": "#search-result-resize-handle"},minHeight: 75,resize: function(e, ui) {- var $fileViewer = $("#repo-file>.file-viewer");- var fileViewerHeight = $fileViewer.outerHeight();- if(fileViewerHeight < 100)+ var $blobContent = $("#depot-blob>.blob-content");+ var blobContentHeight = $blobContent.outerHeight();+ if(blobContentHeight < 100)$(this).resizable({maxHeight: ui.size.height});},stop: function(e, ui) {@@ -22,10 +22,18 @@ $(window).load(function() {}});+ if (location.hash) { // scroll anchors into view (for instance the markdown headline)+ setTimeout(function() {+ var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];+ if (element)+ element.scrollIntoView();+ }, 0);+ }+$(window).resize(function(e) {e.stopPropagation();- var $head = $("#repo-file>.head");+ var $head = $("#depot-blob>.head");var $revisionPicker = $head.find(">.revision-picker");// we should simply call $head.width() here, but the value is incorrect after maximize and restore@@ -37,21 +45,21 @@ $(window).load(function() {var maxWidth = headWidth - $revisionPicker.outerWidth() - 110;var maxHeight = $head.height();- var $fileNavigator = $head.find(">.file-navigator");- if ($fileNavigator.length != 0) {- if ($fileNavigator.outerWidth() > maxWidth || $fileNavigator.outerHeight() > maxHeight)- $("#repo-file>.file-navigator").show().append($fileNavigator);+ var $blobNavigator = $head.find(">.blob-navigator");+ if ($blobNavigator.length != 0) {+ if ($blobNavigator.outerWidth() > maxWidth || $blobNavigator.outerHeight() > maxHeight)+ $("#depot-blob>.blob-navigator").show().append($blobNavigator);} else {- $fileNavigator = $("#repo-file>.file-navigator>div");- if ($fileNavigator.outerWidth() <= maxWidth && $fileNavigator.outerHeight() <= maxHeight) {- $fileNavigator.insertAfter($revisionPicker);- $("#repo-file>.file-navigator").hide();+ $blobNavigator = $("#depot-blob>.blob-navigator>div");+ if ($blobNavigator.outerWidth() <= maxWidth && $blobNavigator.outerHeight() <= maxHeight) {+ $blobNavigator.insertAfter($revisionPicker);+ $("#depot-blob>.blob-navigator").hide();}}- var $fileViewer = $("#repo-file>.file-viewer");- var width = $(window).width()-$("#repo-file").parent().prev().outerWidth();- var height = $(window).height()-$fileViewer.offset().top;+ var $blobContent = $("#depot-blob>.blob-content");+ var width = $(window).width()-$("#depot-blob").parent().prev().outerWidth();+ var height = $(window).height()-$blobContent.offset().top;if ($("#main>.foot").length != 0)height -= $("#main>.foot").outerHeight();if ($searchResult.is(":visible")) {@@ -63,8 +71,8 @@ $(window).load(function() {-$searchResult.find(".search-result>.head").outerHeight()-$("#search-result-resize-handle").outerHeight());}- $fileViewer.outerWidth(width).outerHeight(height-1);- $fileViewer.find(".autofit:visible").first().trigger("autofit", [$fileViewer.width(), $fileViewer.height()]);+ $blobContent.outerWidth(width).outerHeight(height-1);+ $blobContent.find(".autofit:visible").first().triggerHandler("autofit", [$blobContent.width(), $blobContent.height()]);});$(window).resize();}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/hgrabber.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/hgrabber.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/hgrabber.pngrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/hgrabber.pngdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/indexing.gif b/web/src/main/java/com/gitplex/server/web/page/depot/blob/indexing.gifsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/page/depot/file/indexing.gifrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/indexing.gifdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.javanew file mode 100644index 0000000000..c468dac0a9--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNameChanging.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.depot.blob.navigator;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import com.gitplex.server.web.util.AjaxEvent;++public class BlobNameChanging extends AjaxEvent {++ public BlobNameChanging(IPartialPageRequestHandler partialPageRequestHandler) {+ super(partialPageRequestHandler);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.htmlsimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.htmlindex 5c175a52b4..473766b30d 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="file-navigator clearfix">+ <div class="blob-navigator clearfix"><div wicket:id="treeSegments" class="pull-left clearfix"><a wicket:id="link" class="pull-left"><span wicket:id="label"></span></a><!-- below separator makes slash appearing in path when the path is copied -->@@ -12,8 +12,8 @@<span wicket:id="label" class="name"></span></wicket:fragment><wicket:fragment wicket:id="nameEditFrag">- <form class="leave-confirm">- <input wicket:id="name" type="text" placeholder="Name your file" class="name form-control input-sm"></input>+ <form wicket:id="form" class="leave-confirm name">+ <input wicket:id="input" type="text" placeholder="Name your file" class="form-control input-sm"></input></form></wicket:fragment><wicket:fragment wicket:id="addFileFrag">diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.javasimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.javaindex c7c263130a..8d5f63938b 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/FileNavigator.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigator.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.filenavigator;+package com.gitplex.server.web.page.depot.blob.navigator;import java.io.IOException;import java.util.ArrayList;@@ -9,11 +9,14 @@ import java.util.List;import javax.annotation.Nullable;import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxChannel;+import org.apache.wicket.ajax.AjaxChannel.Type;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;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;@@ -23,6 +26,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;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.form.TextField;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -39,35 +43,34 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.google.common.base.Preconditions;-import com.google.common.base.Splitter;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.git.GitUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.component.BlobIcon;-import com.gitplex.server.web.component.DropdownLink;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobview.BlobNameChangeCallback;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;+import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;@SuppressWarnings("serial")-public abstract class FileNavigator extends Panel {+public class BlobNavigator extends Panel {private final static String LAST_SEGMENT_ID = "lastSegment";- private final BlobViewContext context;+ private final BlobRenderContext context;- private final BlobNameChangeCallback callback;+ private TextField<String> nameInput;- public FileNavigator(String id, BlobViewContext context, @Nullable BlobNameChangeCallback callback) {+ public BlobNavigator(String id, BlobRenderContext context) {super(id);this.context = context;- this.callback = callback;}@Override@@ -105,7 +108,7 @@ public abstract class FileNavigator extends Panel {@Overrideprotected void populateItem(final ListItem<BlobIdent> item) {final BlobIdent blobIdent = item.getModelObject();- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -121,10 +124,10 @@ public abstract class FileNavigator extends Panel {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = blobIdent;- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ tag.put("href", urlFor(DepotBlobPage.class, params));}};@@ -189,7 +192,7 @@ public abstract class FileNavigator extends Panel {@Overridepublic Iterator<? extends BlobIdent> getChildren(BlobIdent blobIdent) {- return FileNavigator.this.getChildren(blobIdent).iterator();+ return BlobNavigator.this.getChildren(blobIdent).iterator();}@Override@@ -217,11 +220,11 @@ public abstract class FileNavigator extends Panel {@Overrideprotected Component newContentComponent(String id, final IModel<BlobIdent> model) {BlobIdent blobIdent = model.getObject();- Fragment fragment = new Fragment(id, "treeNodeFrag", FileNavigator.this);+ Fragment fragment = new Fragment(id, "treeNodeFrag", BlobNavigator.this);fragment.add(new BlobIcon("icon", model));- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -239,10 +242,10 @@ public abstract class FileNavigator extends Panel {protected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = model.getObject();- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- tag.put("href", urlFor(DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ tag.put("href", urlFor(DepotBlobPage.class, params));}};@@ -265,55 +268,43 @@ public abstract class FileNavigator extends Panel {WebMarkupContainer lastSegment;BlobIdent file = context.getBlobIdent();- if (callback != null) {+ if (context.getMode() == Mode.EDIT || context.getMode() == Mode.ADD) {lastSegment = new Fragment(LAST_SEGMENT_ID, "nameEditFrag", this);+ Form<?> form = new Form<Void>("form");+ lastSegment.add(form);String name;- if (file.isTree())+ if (context.getMode() == Mode.ADD)name = "";else if (file.path.contains("/"))name = StringUtils.substringAfterLast(file.path, "/");elsename = file.path;- final TextField<String> nameInput = new TextField<String>("name", Model.of(name));- lastSegment.add(nameInput);- nameInput.add(new OnChangeAjaxBehavior() {+ nameInput = new TextField<String>("input", Model.of(name));+ form.add(nameInput);+ nameInput.add(new AjaxFormSubmitBehavior(form, "input") {@Override- protected void onUpdate(AjaxRequestTarget target) {- callback.onChange(target, nameInput.getInput());- }-- });- if (name.length() == 0)- nameInput.add(AttributeAppender.append("class", "focusable"));- lastSegment.add(AttributeAppender.append("class", "input"));- } else if (file.isTree()) {- lastSegment = new Fragment(LAST_SEGMENT_ID, "addFileFrag", this);- lastSegment.add(new AjaxLink<Void>("addFile") {-- @Override- protected void onConfigure() {- super.onConfigure();- String path = file.path;- if (path != null && file.isTree())- path += "/";- setVisible(context.isOnBranch() && SecurityUtils.canModify(context.getDepot(), file.revision, path));+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.setChannel(new AjaxChannel("blob-name-edit", Type.DROP));}@Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.put("title", "Add new file");- }-- @Override- public void onClick(AjaxRequestTarget target) {- onNewFile(target);+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);+ send(getPage(), Broadcast.BREADTH, new BlobNameChanging(target));}});++ if (context.getMode() == Mode.ADD)+ nameInput.add(AttributeAppender.append("class", "focusable"));+ lastSegment.add(AttributeAppender.append("class", "input"));+ } else if (file.isTree()) {+ lastSegment = new WebMarkupContainer(LAST_SEGMENT_ID);+ lastSegment.setVisible(false);} else {lastSegment = new Fragment(LAST_SEGMENT_ID, "blobNameFrag", this);@@ -330,7 +321,7 @@ public abstract class FileNavigator extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new FileNavigatorResourceReference()));+ response.render(CssHeaderItem.forReference(new BlobNavigatorResourceReference()));if (context.getBlobIdent().isTree()) {String script = String.format("$('#%s input[type=text]').focus();", getMarkupId());@@ -345,8 +336,6 @@ public abstract class FileNavigator extends Panel {return context.getDepot().getObjectId(context.getBlobIdent().revision);}- protected abstract void onNewFile(AjaxRequestTarget target);-private List<BlobIdent> getChildren(BlobIdent blobIdent) {Repository repository = context.getDepot().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {@@ -365,4 +354,30 @@ public abstract class FileNavigator extends Panel {}}+ @Nullable+ public String getNewPath() {+ if (nameInput != null) {+ String newPath;+ String name = nameInput.getModelObject();+ if (StringUtils.isNotBlank(name)) {+ if (context.getBlobIdent().isTree()) {+ if (context.getBlobIdent().path != null)+ newPath = context.getBlobIdent().path + "/" + name;+ else+ newPath = name;+ } else {+ if (context.getBlobIdent().path.contains("/"))+ newPath = StringUtils.substringBeforeLast(context.getBlobIdent().path, "/") + "/" + name;+ else+ newPath = name;+ }+ return GitUtils.normalizePath(newPath);+ } else {+ return null;+ }+ } else {+ throw new IllegalStateException();+ }+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.javanew file mode 100644index 0000000000..a68a2a5628--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/BlobNavigatorResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.depot.blob.navigator;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++public class BlobNavigatorResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BlobNavigatorResourceReference() {+ super(BlobNavigatorResourceReference.class, "blob-navigator.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-down.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-down.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-down.pngrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-down.pngdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-right.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-right.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/arrow-right.pngrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/arrow-right.pngdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/file-navigator.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/blob-navigator.csssimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/file-navigator.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/blob-navigator.cssindex 50a282adcd..1cc8689525 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filenavigator/file-navigator.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/navigator/blob-navigator.css@@ -15,7 +15,7 @@color: #444;font-size: 13px;}-.file-navigator .add {+.blob-navigator .add {font-size: 18px;line-height: 20px;vertical-align: middle;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.javasimilarity index 62%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.javaindex 76816520af..5a1de78cec 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview;+package com.gitplex.server.web.page.depot.blob.render;import java.io.Serializable;import java.util.List;@@ -6,18 +6,19 @@ import java.util.List;import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;+import com.gitplex.jsymbol.TokenPosition;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.Depot;import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.QueryHit;-import com.gitplex.jsymbol.TokenPosition;-public interface BlobViewContext extends Serializable {+public interface BlobRenderContext extends Serializable {- public enum Mode {BLAME, EDIT, DELETE}+ public enum Mode {VIEW, BLAME, ADD, EDIT, DELETE}Depot getDepot();@@ -41,11 +42,9 @@ public interface BlobViewContext extends Serializable {void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits);- void onBlameChange(AjaxRequestTarget target, boolean blame);-- void onDelete(AjaxRequestTarget target);+ void onModeChange(AjaxRequestTarget target, Mode mode);- void onEdit(AjaxRequestTarget target);+ void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit);void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);@@ -56,4 +55,15 @@ public interface BlobViewContext extends Serializable {RevCommit getCommit();+ /**+ * Get new path of the file being added or edited.+ *+ * @return+ * new path of the file being added/edited, or <tt>null</tt> if new path is not specified yet+ * @throws+ * IllegalStateException if call this method if file is not being added or edited+ */+ @Nullable+ String getNewPath();+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.javanew file mode 100644index 0000000000..01ffa3be0b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRendererContribution.java@@ -0,0 +1,15 @@+package com.gitplex.server.web.page.depot.blob.render;++import java.io.Serializable;++import javax.annotation.Nullable;++import com.gitplex.launcher.loader.ExtensionPoint;+import com.gitplex.server.web.PrioritizedComponentRenderer;++@ExtensionPoint+public interface BlobRendererContribution extends Serializable {++ @Nullable PrioritizedComponentRenderer getRenderer(BlobRenderContext context);++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.htmlsimilarity index 88%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.htmlindex cabe0284e4..8f2d1f3419 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.html@@ -1,7 +1,7 @@<wicket:panel>- <div class="edit-save autofit">+ <div class="commit-option"><div class="head">- Add New Commit+ Commit Your Change</div><div class="body"><div wicket:id="feedback"></div>@@ -11,7 +11,7 @@</div><div wicket:id="changes" class="changes"></div></div>- <form wicket:id="form" class="dirty-aware leave-confirm">+ <form wicket:id="form" class="leave-confirm"><div class="form-group"><label>Summary Commit Message</label><input wicket:id="summaryCommitMessage" class="summary-commit-message form-control"></input>diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.javasimilarity index 62%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.javaindex c755f99a56..214c4f5379 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSavePanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java@@ -1,70 +1,72 @@-package com.gitplex.server.web.component.depotfile.editsave;+package com.gitplex.server.web.page.depot.blob.render.commitoption;import java.io.IOException;+import java.util.Arrays;import javax.annotation.Nullable;-import org.apache.commons.lang3.StringEscapeUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;-import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+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;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.panel.FeedbackPanel;import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.diff.DiffEntry;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;+import org.unbescape.javascript.JavaScriptEscape;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobChange;+import com.gitplex.server.git.BlobEdit;import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.git.FileEdit;+import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.PathAndContent;-import com.gitplex.server.git.exception.ObjectAlreadyExistsException;import com.gitplex.server.git.exception.NotTreeException;+import com.gitplex.server.git.exception.ObjectAlreadyExistsException;import com.gitplex.server.git.exception.ObsoleteCommitException;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;+import com.gitplex.server.util.Provider;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;import com.gitplex.server.web.component.diff.revision.DiffViewMode;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.navigator.BlobNameChanging;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.server.web.util.ajaxlistener.TrackViewStateListener;+import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import jersey.repackaged.com.google.common.base.Objects;@SuppressWarnings("serial")-public abstract class EditSavePanel extends Panel {+public class CommitOptionPanel extends Panel {- private final IModel<Depot> depotModel;-- private final String refName;-- private FileEdit fileEdit;-- private final CancelListener cancelListener;+ private final BlobRenderContext context;- private ObjectId prevCommitId;+ private BlobEdit blobEdit;private ObjectId currentCommitId;@@ -74,31 +76,49 @@ public abstract class EditSavePanel extends Panel {private BlobChange change;- public EditSavePanel(String id, IModel<Depot> depotModel, String refName,- @Nullable String oldPath, @Nullable PathAndContent newFile,- ObjectId prevCommitId, @Nullable CancelListener cancelListener) {- super(id);+ private boolean contentModified;- this.depotModel = depotModel;- this.refName = refName;- this.fileEdit = new FileEdit(oldPath, newFile);- this.cancelListener = cancelListener;- this.prevCommitId = prevCommitId;- }+ public CommitOptionPanel(String id, BlobRenderContext context, @Nullable Provider<byte[]> newContentProvider) {+ super(id);+ this.context = context;++ PathAndContent newBlob;+ if (newContentProvider != null) {+ newBlob = new PathAndContent() {++ @Override+ public String getPath() {+ return context.getNewPath();+ }++ @Override+ public byte[] getContent() {+ return newContentProvider.get();+ }++ };+ } else {+ newBlob = null;+ }++ String oldPath = context.getBlobIdent().isFile()?context.getBlobIdent().path:null;+ this.blobEdit = new BlobEdit(oldPath, newBlob);+ }+private String getDefaultCommitMessage() {- String oldPath = fileEdit.getOldPath();+ String oldPath = blobEdit.getOldPath();String oldName;if (oldPath != null && oldPath.contains("/"))oldName = StringUtils.substringAfterLast(oldPath, "/");elseoldName = oldPath;- PathAndContent newFile = fileEdit.getNewFile();- if (newFile == null) {+ PathAndContent newBlob = blobEdit.getNewBlob();+ if (newBlob == null) {return "Delete " + oldName;} else {- String newPath = newFile.getPath();+ String newPath = newBlob.getPath();String newName;if (newPath != null && newPath.contains("/"))@@ -125,8 +145,14 @@ public abstract class EditSavePanel extends Panel {changedContainer.setVisible(change != null);changedContainer.setOutputMarkupPlaceholderTag(true);if (change != null) {- changedContainer.add(new BlobDiffPanel("changes", depotModel,- new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));+ changedContainer.add(new BlobDiffPanel("changes", new AbstractReadOnlyModel<Depot>() {++ @Override+ public Depot getObject() {+ return context.getDepot();+ }++ }, new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));} else {changedContainer.add(new WebMarkupContainer("changes"));}@@ -134,7 +160,7 @@ public abstract class EditSavePanel extends Panel {replace(changedContainer);target.add(changedContainer);if (change != null) {- String script = String.format("$('#%s .edit-save input[type=submit]').val('Commit and overwrite');",+ String script = String.format("$('#%s .commit-option input[type=submit]').val('Commit and overwrite');",getMarkupId());target.appendJavaScript(script);}@@ -147,7 +173,7 @@ public abstract class EditSavePanel extends Panel {protected void onInitialize() {super.onInitialize();- final NotificationPanel feedback = new NotificationPanel("feedback", this);+ FeedbackPanel feedback = new NotificationPanel("feedback", this);feedback.setOutputMarkupPlaceholderTag(true);add(feedback);@@ -206,46 +232,50 @@ public abstract class EditSavePanel extends Panel {protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);attributes.setMethod(Method.POST);-- String script = String.format(""- + "var viewState = $('#%s').data('viewState');"- + "return viewState?JSON.stringify(viewState):'';", EditSavePanel.this.getMarkupId());- attributes.getDynamicExtraParameters().add("return {view_state: function() {" + script + "}}");++ attributes.getAjaxCallListeners().add(new TrackViewStateListener(true));}@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- if ((fileEdit.getOldPath() != null && fileEdit.getNewFile() != null))+ if (!isBlobModified())tag.put("disabled", "disabled");}@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- save(target, feedback);- String script = String.format(""- + "$('#%s').attr('disabled', 'disabled').val('Please wait...');"- + "gitplex.server.form.markClean($('form'));", getMarkupId());- target.appendJavaScript(script);+ if (save(target, feedback)) {+ String script = String.format(""+ + "$('#%s').attr('disabled', 'disabled').val('Please wait...');"+ + "gitplex.server.form.markClean($('form'));", getMarkupId());+ target.appendJavaScript(script);+ }}};saveButton.setOutputMarkupId(true);form.add(saveButton);- form.add(new AjaxLink<Void>("cancel") {+ form.add(new ViewStateAwareAjaxLink<Void>("cancel", true) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(cancelListener != null);+ setVisible(blobEdit.getNewBlob() == null);}@Overridepublic void onClick(AjaxRequestTarget target) {- cancelListener.onCancel(target);+ context.onModeChange(target, Mode.VIEW);}});@@ -253,17 +283,21 @@ public abstract class EditSavePanel extends Panel {setOutputMarkupId(true);}- private void save(AjaxRequestTarget target, FeedbackPanel feedback) {- String viewState = RequestCycle.get().getRequest().getPostParameters()- .getParameterValue("view_state").toString();- RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);-+ private boolean isBlobModified() {+ return !context.getBlobIdent().isFile()+ || context.getMode() == Mode.DELETE+ || contentModified+ || !Objects.equal(context.getBlobIdent().path, context.getNewPath());+ }++ private boolean save(AjaxRequestTarget target, FeedbackPanel feedback) {change = null;- PathAndContent newFile = fileEdit.getNewFile();- if (newFile != null && StringUtils.isBlank(newFile.getPath())) {- EditSavePanel.this.error("Please specify file name.");+ PathAndContent newBlob = blobEdit.getNewBlob();+ if (newBlob != null && StringUtils.isBlank(newBlob.getPath())) {+ CommitOptionPanel.this.error("Please specify file name.");target.add(feedback);+ return false;} else {String commitMessage = summaryCommitMessage;if (StringUtils.isBlank(commitMessage))@@ -272,11 +306,13 @@ public abstract class EditSavePanel extends Panel {commitMessage += "\n\n" + detailCommitMessage;Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());- Repository repository = depotModel.getObject().getRepository();+ String refName = GitUtils.branch2ref(context.getBlobIdent().revision);+ ObjectId prevCommitId = context.getDepot().getObjectId(context.getBlobIdent().revision);+ Repository repository = context.getDepot().getRepository();ObjectId newCommitId = null;while(newCommitId == null) {try {- newCommitId = fileEdit.commit(repository, refName,+ newCommitId = blobEdit.commit(repository, refName,prevCommitId, prevCommitId, user.asPerson(), commitMessage);} catch (ObsoleteCommitException e) {currentCommitId = e.getOldCommitId();@@ -285,7 +321,7 @@ public abstract class EditSavePanel extends Panel {RevCommit currentCommit = revWalk.parseCommit(currentCommitId);prevCommitId = currentCommitId;- String oldPath = fileEdit.getOldPath();+ String oldPath = blobEdit.getOldPath();if (oldPath != null) {TreeWalk treeWalk = TreeWalk.forPath(repository, oldPath,prevCommit.getTree().getId(), currentCommit.getTree().getId());@@ -295,8 +331,8 @@ public abstract class EditSavePanel extends Panel {// mark changed if original file exists and content or mode has been modified// by othersif (treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {- if (newFile != null) {- fileEdit = new FileEdit(null, newFile);+ if (newBlob != null) {+ blobEdit = new BlobEdit(null, newBlob);change = getChange(treeWalk, prevCommit, currentCommit);break;} else {@@ -310,8 +346,8 @@ public abstract class EditSavePanel extends Panel {}}}- if (newFile != null && !newFile.getPath().equals(oldPath)) {- TreeWalk treeWalk = TreeWalk.forPath(repository, newFile.getPath(),+ if (newBlob != null && !newBlob.getPath().equals(oldPath)) {+ TreeWalk treeWalk = TreeWalk.forPath(repository, newBlob.getPath(),prevCommit.getTree().getId(), currentCommit.getTree().getId());if (treeWalk != null) {if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))@@ -327,21 +363,24 @@ public abstract class EditSavePanel extends Panel {throw new RuntimeException(e2);}} catch (ObjectAlreadyExistsException e) {- EditSavePanel.this.error("A file with same name already exists. "+ CommitOptionPanel.this.error("A file with same name already exists. "+ "Please choose a different name and try again.");target.add(feedback);break;} catch (NotTreeException e) {- EditSavePanel.this.error("A file exists where you’re trying to create a subdirectory. "+ CommitOptionPanel.this.error("A file exists where you’re trying to create a subdirectory. "+ "Choose a new path and try again..");target.add(feedback);break;}}- if (newCommitId != null)- onCommitted(target, prevCommitId, newCommitId);- else+ if (newCommitId != null) {+ context.onCommitted(target, prevCommitId, newCommitId);+ return true;+ } else {newChangedContainer(target);+ return false;+ }}}@@ -369,7 +408,7 @@ public abstract class EditSavePanel extends Panel {@Overridepublic Blob getBlob(BlobIdent blobIdent) {- return depotModel.getObject().getBlob(blobIdent);+ return context.getDepot().getBlob(blobIdent);}};@@ -378,27 +417,35 @@ public abstract class EditSavePanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new EditSaveResourceReference()));-- String script = String.format("gitplex.server.editsave.init('%s');", getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));+ response.render(JavaScriptHeaderItem.forReference(new CommitOptionResourceReference()));}- protected abstract void onCommitted(AjaxRequestTarget target, ObjectId oldCommitId, ObjectId newCommitId);-- public void onNewPathChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.editsave.onPathChange('%s', '%s', %b);",- getMarkupId(), StringEscapeUtils.escapeEcmaScript(getDefaultCommitMessage()),- Objects.equal(fileEdit.getNewFile().getPath(), fileEdit.getOldPath()));- target.appendJavaScript(script);+ public void onContentChange(IPartialPageRequestHandler partialPageRequestHandler) {+ Preconditions.checkNotNull(blobEdit.getNewBlob());++ if (context.getMode() == Mode.EDIT) {+ contentModified = !Arrays.equals(+ blobEdit.getNewBlob().getContent(),+ context.getDepot().getBlob(context.getBlobIdent()).getBytes());+ } else {+ contentModified = blobEdit.getNewBlob().getContent().length != 0;+ }+ onBlobChange(partialPageRequestHandler);}@Override- protected void onDetach() {- depotModel.detach();-- super.onDetach();+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof BlobNameChanging) {+ BlobNameChanging payload = (BlobNameChanging) event.getPayload();+ onBlobChange(payload.getPartialPageRequestHandler());+ }+ }++ private void onBlobChange(IPartialPageRequestHandler partialPageRequestHandler) {+ String script = String.format("gitplex.server.commitOption.onBlobChange('%s', '%s', %b);", getMarkupId(),+ JavaScriptEscape.escapeJavaScript(getDefaultCommitMessage()), isBlobModified());+ partialPageRequestHandler.appendJavaScript(script);}}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.javasimilarity index 61%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.javaindex 6d53666c9d..3140d746bb 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.filelist;+package com.gitplex.server.web.page.depot.blob.render.commitoption;import java.util.List;@@ -8,18 +8,18 @@ import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class FileListResourceReference extends BaseDependentResourceReference {+public class CommitOptionResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public FileListResourceReference() {- super(FileListResourceReference.class, "file-list.js");+ public CommitOptionResourceReference() {+ super(CommitOptionResourceReference.class, "commit-option.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(FileListResourceReference.class, "file-list.css")));+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(CommitOptionResourceReference.class, "commit-option.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.csssimilarity index 55%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.cssindex b50d7deec1..8e5cc32936 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/edit-save.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.css@@ -1,16 +1,16 @@-.edit-save {+.commit-option {padding: 20px;overflow: auto;}-.edit-save>.head {+.commit-option>.head {font-weight: bold;font-size: 16px;margin-bottom: 20px;}-.edit-save>.body>.changed>.changes {+.commit-option>.body>.changed>.changes {margin-bottom: 20px;display: none;}-.edit-save .text-diff>.head>.actions {+.commit-option .text-diff>.head>.actions {display: none;}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.jsnew file mode 100644index 0000000000..d57de4430f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/commit-option.js@@ -0,0 +1,12 @@+gitplex.server.commitOption = {+ onBlobChange: function(containerId, defaultCommitMessage, blobModified) {+ var $commitOption = $("#" + containerId + ">.commit-option");+ $commitOption.find(".summary-commit-message").attr("placeholder", defaultCommitMessage);+ var $submitBtn = $commitOption.find("input[type=submit]");+ if (blobModified === true)+ $submitBtn.removeAttr("disabled");+ else+ $submitBtn.attr("disabled", "disabled");++ }+};diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.htmlnew file mode 100644index 0000000000..2c22827e68--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <div class="blob-edit autofit">+ <div class="head clearfix">+ <div class="pull-left active tab edit"><a><i class="fa fa-pencil"></i> Edit file</a></div>+ <div class="pull-left save tab"><a><i class="fa fa-floppy-o"></i> Save</a></div>+ <div class="pull-left cancel"><a wicket:id="cancelLink" tabindex="-1">Cancel</a></div>+ <div wicket:id="editOptions" class="options pull-right"></div>+ </div>+ <div class="body">+ <form wicket:id="content" class="content leave-confirm">+ <div wicket:id="editor" class="editor"></div>+ <a wicket:id="submit" class="submit">submit</a>+ </form>+ <div wicket:id="commitOptions" class="commit-options"></div>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..1400d6abd4--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditPanel.java@@ -0,0 +1,156 @@+package com.gitplex.server.web.page.depot.blob.render.edit;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import com.gitplex.server.util.Provider;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.navigator.BlobNameChanging;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.commitoption.CommitOptionPanel;+import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;+import com.google.common.base.Preconditions;++@SuppressWarnings("serial")+public abstract class BlobEditPanel extends Panel {++ protected final BlobRenderContext context;++ private FormComponentPanel<byte[]> contentEditor;++ private CommitOptionPanel commitOption;++ private AbstractDefaultAjaxBehavior recreateBehavior;++ public BlobEditPanel(String id, BlobRenderContext context) {+ super(id);+ this.context = context;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ViewStateAwareAjaxLink<Void>("cancelLink", true) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ context.onModeChange(target, Mode.VIEW);+ }++ });++ add(newEditOptions("editOptions"));++ add(new Form<Void>("content") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ byte[] content;+ if (context.getMode() == Mode.EDIT)+ content = context.getDepot().getBlob(context.getBlobIdent()).getBytes();+ else+ content = new byte[0];+ add(contentEditor = newContentEditor("editor", content));+ add(newContentSubmitLink("submit"));+ }++ @Override+ protected void onSubmit() {+ super.onSubmit();++ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);+ Preconditions.checkNotNull(target);++ commitOption.onContentChange(target);++ String script = String.format(+ "gitplex.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.save'));",+ BlobEditPanel.this.getMarkupId(true));+ target.appendJavaScript(script);+ }++ });++ add(commitOption = new CommitOptionPanel("commitOptions", context, new Provider<byte[]>() {++ @Override+ public byte[] get() {+ return contentEditor.getModelObject();+ }++ }));++ add(recreateBehavior = new AbstractDefaultAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ context.onModeChange(target, Mode.ADD);+ }++ });++ setOutputMarkupId(true);+ }++ protected Component newContentSubmitLink(String componentId) {+ return new AjaxSubmitLink(componentId) {+ };+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if ((event.getPayload() instanceof BlobNameChanging) && context.getMode() == Mode.ADD) {+ /*+ * Blob name is changing and current editor might be inappropriate for current+ * blob name, so we need to re-create the editor if the form does not have+ * any change yet+ */+ BlobNameChanging payload = (BlobNameChanging) event.getPayload();+ String script = String.format("gitplex.server.blobEdit.checkClean('%s', %s);",+ getMarkupId(), recreateBehavior.getCallbackFunction());+ payload.getPartialPageRequestHandler().appendJavaScript(script);+ }+ }++ protected WebMarkupContainer newEditOptions(String componentId) {+ WebMarkupContainer options = new WebMarkupContainer(componentId);+ options.setVisible(false);+ return options;+ }++ protected abstract FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent);++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new BlobEditResourceReference()));++ String script = String.format("gitplex.server.blobEdit.init('%s');", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.javasimilarity index 68%rename from web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.javaindex 41b0c43924..ed8ce44193 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/MarkdownResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/BlobEditResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.markdown;+package com.gitplex.server.web.page.depot.blob.render.edit;import java.util.List;@@ -10,20 +10,20 @@ import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class MarkdownResourceReference extends BaseDependentResourceReference {+public class BlobEditResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public MarkdownResourceReference() {- super(MarkdownResourceReference.class, "markdown.js");+ public BlobEditResourceReference() {+ super(BlobEditResourceReference.class, "blob-edit.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(CssHeaderItem.forReference(- new CssResourceReference(MarkdownResourceReference.class, "markdown.css")));+ new CssResourceReference(BlobEditResourceReference.class, "blob-edit.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.cssnew file mode 100644index 0000000000..611a120911--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.css@@ -0,0 +1,37 @@+.blob-edit>.head {+ border-bottom: 1px solid #BBB;+ height: 36px;+ background: #F2F2F2;+}+.blob-edit>.head .tab {+ padding: 4px 12px;+ margin-top: 7px;+}+.blob-edit>.head .tab a {+ color: #666;+ text-decoration: none;+}+.blob-edit>.head .edit {+ margin-left: 12px;+}+.blob-edit>.head .active.tab {+ background: white;+ border: 1px solid #BBB;+ border-radius: 4px 4px 0 0;+ border-bottom: 1px solid white;+}+.blob-edit>.head .active.tab a {+ font-weight: bold;+ color: #333;+}+.blob-edit>.head .cancel {+ margin: 11px 0 0 12px;+}+.blob-edit>.body {+ margin-top: 1px;+}+.blob-edit>.body>.content>.submit,+.blob-edit>.body>.commit-options,+.blob-edit>.body>.dirty-check {+ display: none;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.jsnew file mode 100644index 0000000000..12092adc2c--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/edit/blob-edit.js@@ -0,0 +1,63 @@+gitplex.server.blobEdit = {+ init: function(containerId) {+ var $container = $("#" + containerId);+ var $blobEdit = $container.children(".blob-edit");+ var $head = $blobEdit.children(".head");+ var $body = $blobEdit.children(".body");+ var $content = $body.children(".content");++ $head.find(".edit>a").click(function() {+ gitplex.server.blobEdit.selectTab($(this).parent());+ });+ $head.find(".save>a").click(function() {+ $body.children(".content").children(".submit").click();+ });++ $blobEdit.on("getViewState", function(e) {+ if ($content.is(":visible"))+ return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};+ else+ return undefined;+ });++ $blobEdit.on("setViewState", function(e, viewState) {+ if ($content.is(":visible") && viewState.scroll) {+ $body.scrollLeft(viewState.scroll.left);+ $body.scrollTop(viewState.scroll.top);+ }+ });++ $blobEdit.on("autofit", function(e, width, height) {+ $blobEdit.outerWidth(width);+ $blobEdit.outerHeight(height);+ height = $blobEdit.height()-$head.outerHeight();+ $body.outerWidth(width).outerHeight(height);+ $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);+ });++ },+ selectTab: function($tab) {+ gitplex.server.viewState.getFromViewAndSetToHistory();++ var $active = $tab.parent().find(".tab.active");+ $active.removeClass("active");+ $tab.addClass("active");+ var $blobEdit = $tab.closest(".blob-edit");+ var $body = $blobEdit.children(".body");++ $body.children().hide();+ if ($tab.hasClass("edit")) {+ $body.children(".content").show().find(".autofit:visible").first().triggerHandler("show");+ } else {+ /*+ * Show scroll bar in case it is hidden in edit tab by sub class+ */+ $body.css("overflow", "auto");+ $body.children(".commit-options").show();+ }+ },+ checkClean: function(containerId, recreateCallback) {+ if ($("#" + containerId + ">.blob-edit>.body form.dirty").length == 0)+ recreateCallback();+ }+};diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.javanew file mode 100644index 0000000000..b7ad386cfe--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/BlobDeletionProvider.java@@ -0,0 +1,39 @@+package com.gitplex.server.web.page.depot.blob.render.renderers;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.commitoption.CommitOptionPanel;++public class BlobDeletionProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.DELETE) {++ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new CommitOptionPanel(componentId, context, null);+ }++ @Override+ public int getPriority() {+ return 0;+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.javanew file mode 100644index 0000000000..60d3e0b081--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeRendererProvider.java@@ -0,0 +1,32 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;++public class FailsafeRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new FailsafeViewPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return Integer.MAX_VALUE;+ }++ };+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.javanew file mode 100644index 0000000000..d290e841fc--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;++import org.apache.wicket.request.resource.CssResourceReference;++public class FailsafeResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public FailsafeResourceReference() {+ super(FailsafeResourceReference.class, "failsafe.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.htmlnew file mode 100644index 0000000000..037535bbbf--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.html@@ -0,0 +1,5 @@+<wicket:extend>+ <div class="failsafe">+ Unable to show content+ </div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.javanew file mode 100644index 0000000000..2a870bad48--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/FailsafeViewPanel.java@@ -0,0 +1,33 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.failsafe;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;++import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;++@SuppressWarnings("serial")+public class FailsafeViewPanel extends BlobViewPanel {++ public FailsafeViewPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(CssHeaderItem.forReference(new FailsafeResourceReference()));+ }++ @Override+ protected boolean canEdit() {+ return false;+ }++ @Override+ protected boolean canBlame() {+ return false;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/binary-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/failsafe.csssimilarity index 57%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/binary-view.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/failsafe.cssindex e7c487d6a1..f192dc2e4f 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/binary/binary-view.css+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/failsafe/failsafe.css@@ -1,4 +1,4 @@-.binary-view {+.blob-content .failsafe {padding: 20px;font-style: italic;}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.htmlsimilarity index 93%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.htmlindex d56630918d..25341e3a14 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="file-list autofit">+ <div class="folder-view autofit"><table class="files"><tr wicket:id="parent" class="parent"><td colspan="3">diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.javasimilarity index 66%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.javaindex 58cf969dda..ac5d970726 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/FileListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.filelist;+package com.gitplex.server.web.page.depot.blob.render.renderers.folder;import java.io.IOException;import java.util.ArrayList;@@ -29,35 +29,33 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;-import com.google.common.base.Preconditions;import com.gitplex.server.git.Blob;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.server.web.component.markdown.MarkdownPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.component.markdown.MarkdownViewer;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")-public abstract class FileListPanel extends Panel {+public class FolderViewPanel extends Panel {- public static final String README_NAME = "readme";-- private final IModel<Depot> depotModel;-- private final BlobIdent directory;+ private final BlobRenderContext context;private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<List<BlobIdent>>() {@Overrideprotected List<BlobIdent> load() {- Repository repository = depotModel.getObject().getRepository();+ Repository repository = context.getDepot().getRepository();try (RevWalk revWalk = new RevWalk(repository)) {RevTree revTree = revWalk.parseCommit(getCommitId()).getTree();TreeWalk treeWalk;- if (directory.path != null) {- treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, directory.path, revTree));+ if (context.getBlobIdent().path != null) {+ treeWalk = Preconditions.checkNotNull(+ TreeWalk.forPath(repository, context.getBlobIdent().path, revTree));treeWalk.enterSubtree();} else {treeWalk = new TreeWalk(repository);@@ -65,7 +63,8 @@ public abstract class FileListPanel extends Panel {}List<BlobIdent> children = new ArrayList<>();while (treeWalk.next())- children.add(new BlobIdent(directory.revision, treeWalk.getPathString(), treeWalk.getRawMode(0)));+ children.add(new BlobIdent(context.getBlobIdent().revision, treeWalk.getPathString(),+ treeWalk.getRawMode(0)));for (int i=0; i<children.size(); i++) {BlobIdent child = children.get(i);while (child.isTree()) {@@ -73,7 +72,7 @@ public abstract class FileListPanel extends Panel {Preconditions.checkNotNull(treeWalk);treeWalk.enterSubtree();if (treeWalk.next()) {- BlobIdent grandChild = new BlobIdent(directory.revision,+ BlobIdent grandChild = new BlobIdent(context.getBlobIdent().revision,treeWalk.getPathString(), treeWalk.getRawMode(0));if (treeWalk.next() || !grandChild.isTree())break;@@ -100,8 +99,7 @@ public abstract class FileListPanel extends Panel {@Overrideprotected BlobIdent load() {for (BlobIdent blobIdent: childrenModel.getObject()) {- String readme = StringUtils.substringBefore(blobIdent.getName(), ".");- if (readme.equalsIgnoreCase(README_NAME))+ if (blobIdent.isFile() && blobIdent.getName().equalsIgnoreCase("readme.md"))return blobIdent;}return null;@@ -109,11 +107,10 @@ public abstract class FileListPanel extends Panel {};- public FileListPanel(String id, IModel<Depot> depotModel, BlobIdent directory) {+ public FolderViewPanel(String id, BlobRenderContext context) {super(id);- this.depotModel = depotModel;- this.directory = directory;+ this.context = context;}@Override@@ -125,37 +122,37 @@ public abstract class FileListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(directory.path != null);+ setVisible(context.getBlobIdent().path != null);}};final BlobIdent parentIdent;- if (directory.path == null) {+ if (context.getBlobIdent().path == null) {parentIdent = null;- } else if (directory.path.indexOf('/') != -1) {+ } else if (context.getBlobIdent().path.indexOf('/') != -1) {parentIdent = new BlobIdent(- directory.revision,- StringUtils.substringBeforeLast(directory.path, "/"),+ context.getBlobIdent().revision,+ StringUtils.substringBeforeLast(context.getBlobIdent().path, "/"),FileMode.TREE.getBits());} else {- parentIdent = new BlobIdent(directory.revision, null, FileMode.TREE.getBits());+ parentIdent = new BlobIdent(context.getBlobIdent().revision, null, FileMode.TREE.getBits());}- parent.add(new PreventDefaultAjaxLink<Void>("link") {+ parent.add(new ViewStateAwareAjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, parentIdent);+ context.onSelect(target, parentIdent, null);}@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = parentIdent;- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);- tag.put("href", urlFor(DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ tag.put("href", urlFor(DepotBlobPage.class, params));}});@@ -181,27 +178,27 @@ public abstract class FileListPanel extends Panel {item.add(pathIcon);- AjaxLink<Void> pathLink = new PreventDefaultAjaxLink<Void>("pathLink") {+ AjaxLink<Void> pathLink = new ViewStateAwareAjaxLink<Void>("pathLink") {@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = blobIdent;- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);- tag.put("href", urlFor(DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ tag.put("href", urlFor(DepotBlobPage.class, params));}@Overridepublic void onClick(AjaxRequestTarget target) {- onSelect(target, blobIdent);+ context.onSelect(target, blobIdent, null);}};- if (directory.path != null)- pathLink.add(new Label("label", blobIdent.path.substring(directory.path.length()+1)));+ if (context.getBlobIdent().path != null)+ pathLink.add(new Label("label", blobIdent.path.substring(context.getBlobIdent().path.length()+1)));elsepathLink.add(new Label("label", blobIdent.path));item.add(pathLink);@@ -233,31 +230,31 @@ public abstract class FileListPanel extends Panel {}));- readmeContainer.add(new AjaxLink<Void>("edit") {+ readmeContainer.add(new ViewStateAwareAjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = readmeModel.getObject();state.mode = Mode.EDIT;- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depotModel.getObject(), state));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state));}@Overrideprotected void onConfigure() {super.onConfigure();- Depot depot = depotModel.getObject();+ Depot depot = context.getDepot();BlobIdent blobIdent = readmeModel.getObject();setVisible(depot.getBranchRef(blobIdent.revision) != null- && SecurityUtils.canModify(depotModel.getObject(), blobIdent.revision, blobIdent.path));+ && SecurityUtils.canModify(depot, blobIdent.revision, blobIdent.path));}});- readmeContainer.add(new MarkdownPanel("body", new LoadableDetachableModel<String>() {+ readmeContainer.add(new MarkdownViewer("body", new LoadableDetachableModel<String>() {@Overrideprotected String load() {- Blob blob = depotModel.getObject().getBlob(readmeModel.getObject());+ Blob blob = context.getDepot().getBlob(readmeModel.getObject());Blob.Text text = blob.getText();if (text != null)return text.getContent();@@ -276,26 +273,23 @@ public abstract class FileListPanel extends Panel {public void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new FileListResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new FolderViewResourceReference()));- PageParameters params = LastCommitsResource.paramsOf(depotModel.getObject(),- directory.revision, directory.path);+ PageParameters params = LastCommitsResource.paramsOf(context.getDepot(),+ context.getBlobIdent().revision, context.getBlobIdent().path);String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();response.render(OnDomReadyHeaderItem.forScript(- String.format("gitplex.server.filelist.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));+ String.format("gitplex.server.folderView.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));}- protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);-private ObjectId getCommitId() {- return depotModel.getObject().getObjectId(directory.revision);+ return context.getCommit();}@Overrideprotected void onDetach() {childrenModel.detach();readmeModel.detach();- depotModel.detach();super.onDetach();}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.javanew file mode 100644index 0000000000..32d1cb2ba2--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewRendererProvider.java@@ -0,0 +1,37 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.folder;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;++public class FolderViewRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isTree()) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new FolderViewPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.javasimilarity index 54%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.javaindex 349dfa49e3..c6a64e2803 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/editsave/EditSaveResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/FolderViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.editsave;+package com.gitplex.server.web.page.depot.blob.render.renderers.folder;import java.util.List;@@ -8,18 +8,19 @@ import org.apache.wicket.request.resource.CssResourceReference;import com.gitplex.server.web.page.base.BaseDependentResourceReference;-public class EditSaveResourceReference extends BaseDependentResourceReference {+public class FolderViewResourceReference extends BaseDependentResourceReference {private static final long serialVersionUID = 1L;- public EditSaveResourceReference() {- super(EditSaveResourceReference.class, "edit-save.js");+ public FolderViewResourceReference() {+ super(FolderViewResourceReference.class, "folder-view.js");}@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(EditSaveResourceReference.class, "edit-save.css")));+ dependencies.add(CssHeaderItem.forReference(+ new CssResourceReference(FolderViewResourceReference.class, "folder-view.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.javasimilarity index 98%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.javaindex df2721f072..747ab49099 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResource.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResource.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.filelist;+package com.gitplex.server.web.page.depot.blob.render.renderers.folder;import java.io.IOException;import java.util.HashMap;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.javasimilarity index 85%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.javaindex 4c3443f592..561a4ea446 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/LastCommitsResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/LastCommitsResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.filelist;+package com.gitplex.server.web.page.depot.blob.render.renderers.folder;import org.apache.wicket.request.resource.IResource;import org.apache.wicket.request.resource.ResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.cssnew file mode 100644index 0000000000..4d9132564f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.css@@ -0,0 +1,54 @@+.folder-view {+ overflow: auto;+}+.folder-view>table>tbody>tr>td {+ padding: 6px 12px;+ border-top: 1px solid #EEE;+}++.folder-view>table>tbody>tr>td.path, .folder-view>table>tbody>tr>td.last-commit.author,+.folder-view>table>tbody>tr>td.last-commit.when {+ white-space: nowrap;+}+.folder-view>table>tbody>tr>td.last-commit img {+ width: 20px;+ height: 20px;+}+.folder-view>table>tbody>tr>td.last-commit, .folder-view>table>tbody>tr>td.last-commit a {+ color: #444;+ font-size: 13px;+}+.folder-view>table>tbody>tr>td.last-commit .when {+ color: #888;+}+.folder-view>table>tbody>tr:first-child>td {+ border-top: none;+}+.folder-view>table tr.parent td {+ padding: 3px 12px;+}+.folder-view>table tr.parent td a i {+ margin-right: 2px;+}+.folder-view>table tr.parent td a span {+ font-size: 18px;+}+.folder-view>.readme {+ border-top: 1px solid #BBB;+}+.folder-view>.readme>.head {+ padding: 6px 12px;+ background: #F2F2F2;+ font-weight: bold;+ border-bottom: 1px solid #BBB;+}+.folder-view>.readme>.head a {+ color: #333;+ margin-left: 4px;+}+.folder-view>.readme>.body {+ padding: 20px;+ max-width: 900px;+ margin-left: auto;+ margin-right: auto;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.jssimilarity index 61%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.jsrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.jsindex 3d4826e655..7b754d8c54 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/filelist/file-list.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/folder/folder-view.js@@ -1,30 +1,8 @@-gitplex.server.filelist = {+gitplex.server.folderView = {init: function(containerId, lastCommitsUrl) {var $container = $("#" + containerId);- var $fileList = $container.find(">.file-list");+ var $folderView = $container.find(">.folder-view");- $fileList.on("autofit", function(e, width, height) {- e.stopPropagation();- $fileList.outerWidth(width);- $fileList.outerHeight(height);-- var viewState = gitplex.server.history.getViewState();- if (viewState && viewState.scroll) {- $fileList.scrollLeft(viewState.scroll.left);- $fileList.scrollTop(viewState.scroll.top);- }- if (location.hash) { // scroll markdown headlines into view- var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0];- if (element)- element.scrollIntoView();- }- });-- $fileList.on("storeViewState", function(e) {- e.stopPropagation();- gitplex.server.history.setViewState({scroll:{left: $fileList.scrollLeft(), top: $fileList.scrollTop()}});- });-$.ajax({url: lastCommitsUrl,cache: false,@@ -34,7 +12,7 @@ gitplex.server.filelist = {},success: function(lastCommits) {if (jQuery.contains(document, $container[0])) { // add this check to avoid rendering last commits if directory is changed- var $table = $container.find(".file-list>table");+ var $table = $container.find(".folder-view>table");$table.find("tr.child").each(function() {var $row = $(this);var path = $row.find("td.path span").text();@@ -58,5 +36,22 @@ gitplex.server.filelist = {}}});++ $folderView.on("getViewState", function(e) {+ return {scroll:{left: $folderView.scrollLeft(), top: $folderView.scrollTop()}};+ });++ $folderView.on("setViewState", function(e, viewState) {+ if (viewState.scroll) {+ $folderView.scrollLeft(viewState.scroll.left);+ $folderView.scrollTop(viewState.scroll.top);+ }+ });++ $folderView.on("autofit", function(e, width, height) {+ $folderView.outerWidth(width);+ $folderView.outerHeight(height);+ });+}};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.javasimilarity index 76%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.javaindex 8455b313ac..1bce7453f9 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.gitlink;+package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;import org.apache.wicket.AttributeModifier;import org.apache.wicket.markup.head.CssHeaderItem;@@ -11,13 +11,13 @@ import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blob;import com.gitplex.server.git.Submodule;import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class GitLinkPanel extends BlobViewPanel {- public GitLinkPanel(String id, BlobViewContext context) {+ public GitLinkPanel(String id, BlobRenderContext context) {super(id, context);}@@ -31,7 +31,7 @@ public class GitLinkPanel extends BlobViewPanel {ConfigManager configManager = GitPlex.getInstance(ConfigManager.class);if (submodule.getUrl().startsWith(configManager.getSystemSetting().getServerUrl() + "/")) {link = new WebMarkupContainer("link");- link.add(AttributeModifier.replace("href", submodule.getUrl() + "/browse?revision=" + submodule.getCommitId()));+ link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId()));} else {link = new Link<Void>("link") {@@ -53,4 +53,14 @@ public class GitLinkPanel extends BlobViewPanel {response.render(CssHeaderItem.forReference(new GitLinkResourceReference()));}+ @Override+ protected boolean canEdit() {+ return false;+ }++ @Override+ protected boolean canBlame() {+ return false;+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.javanew file mode 100644index 0000000000..6a0430a693--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkRendererProvider.java@@ -0,0 +1,37 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;++public class GitLinkRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isGitLink()) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new GitLinkPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.javaindex 9a59c4e454..495f764882 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/GitLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.gitlink;+package com.gitplex.server.web.page.depot.blob.render.renderers.gitlink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/git-link.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/git-link.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/gitlink/git-link.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/gitlink/git-link.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.javanew file mode 100644index 0000000000..57977fe411--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageRendererProvider.java@@ -0,0 +1,38 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.image;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;++public class ImageRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {+ if (context.getDepot().getBlob(context.getBlobIdent()).getMediaType().getType().equalsIgnoreCase("image")) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new ImageViewPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }++ };+ }+ }+ return null;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.javasimilarity index 65%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.javaindex 810e3830b7..4af727a9c1 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewPanel.java@@ -1,18 +1,18 @@-package com.gitplex.server.web.component.depotfile.blobview.image;+package com.gitplex.server.web.page.depot.blob.render.renderers.image;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.image.Image;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;import com.gitplex.server.web.util.resource.RawBlobResource;import com.gitplex.server.web.util.resource.RawBlobResourceReference;@SuppressWarnings("serial")public class ImageViewPanel extends BlobViewPanel {- public ImageViewPanel(String id, BlobViewContext context) {+ public ImageViewPanel(String id, BlobRenderContext context) {super(id, context);}@@ -30,4 +30,14 @@ public class ImageViewPanel extends BlobViewPanel {response.render(CssHeaderItem.forReference(new ImageViewResourceReference()));}+ @Override+ protected boolean canEdit() {+ return false;+ }++ @Override+ protected boolean canBlame() {+ return false;+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.javasimilarity index 80%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.javaindex 9bbb0643fb..7a46b88a16 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/ImageViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/ImageViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.image;+package com.gitplex.server.web.page.depot.blob.render.renderers.image;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/image-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/image-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/image/image-view.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/image/image-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.javanew file mode 100644index 0000000000..7dcbd672ea--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobEditPanel.java@@ -0,0 +1,29 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.FormComponentPanel;++import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;++@SuppressWarnings("serial")+public class MarkdownBlobEditPanel extends BlobEditPanel {++ public MarkdownBlobEditPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MarkdownBlobResourceReference()));+ }++ @Override+ protected FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent) {+ return new MarkdownFormComponent(componentId, initialContent, context.getMode() == Mode.EDIT);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.javanew file mode 100644index 0000000000..a5d5c627b0--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++public class MarkdownBlobResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public MarkdownBlobResourceReference() {+ super(MarkdownBlobResourceReference.class, "markdown-blob.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.htmlnew file mode 100644index 0000000000..c9d8ad5d9e--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="markdown"></div>+</wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.javanew file mode 100644index 0000000000..f577460e33--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownBlobViewPanel.java@@ -0,0 +1,43 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.model.Model;++import com.gitplex.server.git.Blob;+import com.gitplex.server.web.component.markdown.MarkdownViewer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;++@SuppressWarnings("serial")+public class MarkdownBlobViewPanel extends BlobViewPanel {++ public MarkdownBlobViewPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ add(new MarkdownViewer("markdown", Model.of(blob.getText().getContent()), null));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MarkdownBlobResourceReference()));+ }++ @Override+ protected boolean canEdit() {+ return true;+ }++ @Override+ protected boolean canBlame() {+ return true;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.htmlnew file mode 100644index 0000000000..0588662f45--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.html@@ -0,0 +1,3 @@+<wicket:panel>+ <textarea wicket:id="input" class="input"></textarea>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.javanew file mode 100644index 0000000000..de8e822212--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownFormComponent.java@@ -0,0 +1,52 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.model.Model;++import com.gitplex.server.web.behavior.markdown.MarkdownBehavior;+import com.google.common.base.Charsets;++@SuppressWarnings("serial")+public class MarkdownFormComponent extends FormComponentPanel<byte[]> {++ private final boolean autoFocus;++ private TextArea<String> input;++ public MarkdownFormComponent(String id, byte[] initialContent, boolean autoFocus) {+ super(id, Model.of(initialContent));+ this.autoFocus = autoFocus;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ input = new TextArea<String>("input", Model.of(new String(getModelObject(), Charsets.UTF_8)));++ input.add(new MarkdownBehavior());+ add(input);+ }++ @Override+ public void convertInput() {+ String content = input.getConvertedInput();+ if (content != null)+ setConvertedInput(content.getBytes());+ else+ setConvertedInput(new byte[0]);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ if (autoFocus) {+ String script = String.format("$('#%s').focus();", input.getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.javanew file mode 100644index 0000000000..ebe5eaeab0--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/MarkdownRendererProvider.java@@ -0,0 +1,66 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.markdown;++import javax.annotation.Nullable;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.renderers.source.SourceViewPanel;++@SuppressWarnings("serial")+public class MarkdownRendererProvider implements BlobRendererContribution {++ private boolean isMarkdown(@Nullable String blobPath) {+ return blobPath != null && blobPath.endsWith(".md");+ }++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.ADD && isMarkdown(context.getNewPath())+ || context.getMode() == Mode.EDIT+ && isMarkdown(context.getBlobIdent().path)+ && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new MarkdownBlobEditPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }+ };+ } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)+ && context.getBlobIdent().isFile()+ && isMarkdown(context.getBlobIdent().path)+ && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ if (context.getMark() != null || context.getMode() == Mode.BLAME)+ return new SourceViewPanel(componentId, context);+ else+ return new MarkdownBlobViewPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }+ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.cssnew file mode 100644index 0000000000..7e5086c98f--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/markdown/markdown-blob.css@@ -0,0 +1,16 @@+.blob-view .markdown-viewer {+ padding: 20px;+ max-width: 900px;+ margin-left: auto;+ margin-right: auto;+}++.blob-edit .md-editor {+ border: none;+}++.blob-edit .md-preview {+ overflow: hidden;+ height: auto !important;+ width: auto !important;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.javanew file mode 100644index 0000000000..061d62dd42--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditPanel.java@@ -0,0 +1,166 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.source;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.attributes.IAjaxCallListener;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.unbescape.javascript.JavaScriptEscape;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.server.GitPlex;+import com.gitplex.server.model.support.TextRange;+import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;+import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.edit.BlobEditPanel;+import com.gitplex.server.web.page.depot.blob.render.view.MarkSupport;++@SuppressWarnings("serial")+public class SourceEditPanel extends BlobEditPanel implements MarkSupport {++ private SourceFormComponent sourceFormComponent;++ private SourceFormatPanel sourceFormat;++ public SourceEditPanel(String id, BlobRenderContext context) {+ super(id, context);+ }++ @Override+ protected FormComponentPanel<byte[]> newContentEditor(String componentId, byte[] initialContent) {+ sourceFormComponent = new SourceFormComponent(componentId, initialContent);+ return sourceFormComponent;+ }++ @Override+ protected WebMarkupContainer newEditOptions(String componentId) {+ sourceFormat = new SourceFormatPanel(componentId, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.server.sourceEdit.onIndentTypeChange('%s', '%s');",+ sourceFormComponent.getMarkupId(), sourceFormat.getIndentType());+ target.appendJavaScript(script);+ }++ }, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.server.sourceEdit.onTabSizeChange('%s', %s);",+ sourceFormComponent.getMarkupId(), sourceFormat.getTabSize());+ target.appendJavaScript(script);+ }++ }, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.server.sourceEdit.onLineWrapModeChange('%s', '%s');",+ sourceFormComponent.getMarkupId(), sourceFormat.getLineWrapMode());+ target.appendJavaScript(script);+ }++ });+ return sourceFormat;+ }++ @Override+ protected Component newContentSubmitLink(String componentId) {+ return new AjaxSubmitLink(componentId) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new IAjaxCallListener() {++ @Override+ public CharSequence getSuccessHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getPrecondition(Component component) {+ return null;+ }++ @Override+ public CharSequence getInitHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getFailureHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getDoneHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getCompleteHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeSendHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeHandler(Component component) {+ return String.format("gitplex.server.sourceEdit.onSubmit('%s');",+ sourceFormComponent.getMarkupId());+ }++ @Override+ public CharSequence getAfterHandler(Component component) {+ return null;+ }+ });+ }++ };+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));+ String script = String.format("gitplex.server.sourceEdit.init('%s', '%s', %s, '%s', %s, '%s', %b);",+ sourceFormComponent.getMarkupId(),+ JavaScriptEscape.escapeJavaScript(context.getNewPath()),+ context.getMark()!=null?getJson(context.getMark()):"undefined",+ sourceFormat.getIndentType(),+ sourceFormat.getTabSize(),+ sourceFormat.getLineWrapMode(),+ context.getMode() == Mode.EDIT);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ private String getJson(TextRange mark) {+ try {+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ public void mark(AjaxRequestTarget target, TextRange mark) {+ String script = String.format("gitplex.server.sourceEdit.mark('%s', %s);",+ sourceFormComponent.getMarkupId(), getJson(mark));+ target.appendJavaScript(script);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.javanew file mode 100644index 0000000000..867292a28b--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceEditResourceReference.java@@ -0,0 +1,36 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.source;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import com.gitplex.server.web.assets.js.codemirror.CodeMirrorResourceReference;+import com.gitplex.server.web.assets.js.cookies.CookiesResourceReference;+import com.gitplex.server.web.assets.js.diffmatchpatch.DiffMatchPatchResourceReference;+import com.gitplex.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;+import com.gitplex.server.web.page.base.BaseDependentResourceReference;++public class SourceEditResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public SourceEditResourceReference() {+ super(SourceEditResourceReference.class, "source-edit.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new DiffMatchPatchResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));+ dependencies.add(CssHeaderItem.forReference(+ new BaseDependentCssResourceReference(SourceEditResourceReference.class, "source-edit.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.htmlnew file mode 100644index 0000000000..21f3d7dec8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.html@@ -0,0 +1,6 @@+<wicket:panel>+ <div class="source-edit autofit">+ <div class="code"></div>+ <textarea wicket:id="input" class="input"></textarea>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.javanew file mode 100644index 0000000000..9f9effc0be--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceFormComponent.java@@ -0,0 +1,35 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.source;++import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.model.Model;++import com.google.common.base.Charsets;++@SuppressWarnings("serial")+class SourceFormComponent extends FormComponentPanel<byte[]> {++ private TextArea<String> input;++ public SourceFormComponent(String id, byte[] initialContent) {+ super(id, Model.of(initialContent));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(input = new TextArea<String>("input", Model.of(new String(getModelObject(), Charsets.UTF_8))));+ setOutputMarkupId(true);+ }++ @Override+ public void convertInput() {+ String content = input.getConvertedInput();+ if (content != null)+ setConvertedInput(content.getBytes());+ else+ setConvertedInput(new byte[0]);+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.javanew file mode 100644index 0000000000..04ad10fcbe--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceRendererProvider.java@@ -0,0 +1,55 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.source;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;++public class SourceRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.ADD+ || context.getMode() == Mode.EDIT+ && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new SourceEditPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return Integer.MAX_VALUE-1;+ }+ };+ } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)+ && context.getBlobIdent().isFile()+ && context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new SourceViewPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return Integer.MAX_VALUE-1;+ }+ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.htmlsimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.htmlindex 8d2e79582b..b977bcaf43 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html@@ -42,7 +42,6 @@</form></wicket:fragment><wicket:fragment wicket:id="actionsFrag">- <a wicket:id="blame" class="btn btn-default btn-xs blame-toggle"><i class="fa fa-user"></i> Blame</a><a wicket:id="outline" class="btn btn-default btn-xs outline-toggle"><i class="fa fa-list-ul"></i> Outline</a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.javaindex e3fbbfe256..8d06ce4501 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.source;+package com.gitplex.server.web.page.depot.blob.render.renderers.source;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -48,6 +48,11 @@ import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.jsymbol.ExtractException;+import com.gitplex.jsymbol.Range;+import com.gitplex.jsymbol.Symbol;+import com.gitplex.jsymbol.SymbolExtractor;+import com.gitplex.jsymbol.SymbolExtractorRegistry;import com.gitplex.server.GitPlex;import com.gitplex.server.git.Blame;import com.gitplex.server.git.Blob;@@ -65,28 +70,24 @@ import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;-import com.gitplex.server.web.component.DropdownLink;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;import com.gitplex.server.web.component.comment.CodeCommentPanel;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;import com.gitplex.server.web.component.comment.comparecontext.CompareContextPanel;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;+import com.gitplex.server.web.page.depot.blob.render.view.MarkSupport;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;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.jsymbol.ExtractException;-import com.gitplex.jsymbol.Range;-import com.gitplex.jsymbol.Symbol;-import com.gitplex.jsymbol.SymbolExtractor;-import com.gitplex.jsymbol.SymbolExtractorRegistry;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -98,7 +99,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel**/@SuppressWarnings("serial")-public class SourceViewPanel extends BlobViewPanel {+public class SourceViewPanel extends BlobViewPanel implements MarkSupport {private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);@@ -131,7 +132,7 @@ public class SourceViewPanel extends BlobViewPanel {private BlameMessageBehavior blameMessageBehavior;- public SourceViewPanel(String id, BlobViewContext context) {+ public SourceViewPanel(String id, BlobRenderContext context) {super(id, context);Blob blob = context.getDepot().getBlob(context.getBlobIdent());@@ -155,7 +156,7 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.sourceview.onTabSizeChange(%s);", sourceFormat.getTabSize());+ String script = String.format("gitplex.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize());target.appendJavaScript(script);}@@ -163,7 +164,7 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.server.sourceview.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());+ String script = String.format("gitplex.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());target.appendJavaScript(script);}@@ -174,29 +175,6 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic WebMarkupContainer newAdditionalActions(String id) {WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);- actions.add(new PreventDefaultAjaxLink<Void>("blame") {-- @Override- public void onClick(AjaxRequestTarget target) {- boolean blamed = (context.getMode() != Mode.BLAME);- String jsonOfBlameInfos = getJsonOfBlameInfos(blamed);- String script = String.format("gitplex.server.sourceview.onBlame(%s);", jsonOfBlameInfos);- target.appendJavaScript(script);- context.onBlameChange(target, blamed);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (context.getMode() == Mode.BLAME)- return "active";- else- return "";- }-- })));-if (!symbols.isEmpty()) {actions.add(new AjaxLink<Void>("outline") {@@ -235,15 +213,15 @@ public class SourceViewPanel extends BlobViewPanel {cookie.setMaxAge(Integer.MAX_VALUE);response.addCookie(cookie);target.add(outlineContainer);- target.appendJavaScript("gitplex.server.sourceview.onToggleOutline();");+ target.appendJavaScript("gitplex.server.sourceView.onToggleOutline();");}- public void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {+ private void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {String script;if (mark != null) {- script = String.format("gitplex.server.sourceview.mark(%s, %s);", getJson(mark), scroll);+ script = String.format("gitplex.server.sourceView.mark(%s, %s);", getJson(mark), scroll);} else {- script = String.format("gitplex.server.sourceview.mark(undefined, false);");+ script = String.format("gitplex.server.sourceView.mark(undefined, false);");}target.appendJavaScript(script);}@@ -265,7 +243,7 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceview.initComment();"));+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceView.initComment();"));}};@@ -337,12 +315,12 @@ public class SourceViewPanel extends BlobViewPanel {@Overrideprotected String load() {if (context.getOpenComment() != null) {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = new BlobIdent(context.getBlobIdent());state.blobIdent.revision = context.getCommit().name();state.commentId = context.getOpenComment().getId();state.mark = context.getOpenComment().getCommentPos().getRange();- return urlFor(DepotFilePage.class, DepotFilePage.paramsOf(context.getDepot(), state)).toString();+ return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();} else {return "";}@@ -372,7 +350,7 @@ public class SourceViewPanel extends BlobViewPanel {clearComment(target);if (context.getOpenComment() != null)context.onCommentOpened(target, null);- target.appendJavaScript("gitplex.server.sourceview.onCloseComment();");+ target.appendJavaScript("gitplex.server.sourceView.onCloseComment();");}});@@ -410,7 +388,7 @@ public class SourceViewPanel extends BlobViewPanel {public void onClick(AjaxRequestTarget target) {if (SecurityUtils.getAccount() != null) {((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);- target.appendJavaScript("gitplex.server.sourceview.scrollToCommentBottom();");+ target.appendJavaScript("gitplex.server.sourceView.scrollToCommentBottom();");} else {Session.get().warn("Please login to resolve/unresolve comment");}@@ -458,7 +436,7 @@ public class SourceViewPanel extends BlobViewPanel {switch(params.getParameterValue("action").toString()) {case "openSelectionPopover":TextRange mark = getMark(params, "param1", "param2", "param3", "param4");- String script = String.format("gitplex.server.sourceview.openSelectionPopover(%s, '%s', %s);",+ String script = String.format("gitplex.server.sourceView.openSelectionPopover(%s, '%s', %s);",getJson(mark), context.getMarkUrl(mark),SecurityUtils.getAccount()!=null);target.appendJavaScript(script);@@ -507,8 +485,8 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic void onClick(AjaxRequestTarget target) {clearComment(target);- target.appendJavaScript("gitplex.server.sourceview.mark(undefined, false);");- target.appendJavaScript("gitplex.server.sourceview.onLayoutChange();");+ target.appendJavaScript("gitplex.server.sourceView.mark(undefined, false);");+ target.appendJavaScript("gitplex.server.sourceView.onLayoutChange();");context.onMark(target, null);}@@ -565,7 +543,7 @@ public class SourceViewPanel extends BlobViewPanel {commentContainer.replace(commentPanel);target.add(commentContainer);- String script = String.format("gitplex.server.sourceview.onCommentAdded(%s);",+ String script = String.format("gitplex.server.sourceView.onCommentAdded(%s);",getJsonOfComment(comment));target.appendJavaScript(script);context.onCommentOpened(target, comment);@@ -577,7 +555,7 @@ public class SourceViewPanel extends BlobViewPanel {commentContainer.setVisible(true);target.add(commentContainer);context.onAddComment(target, mark);- target.appendJavaScript(String.format("gitplex.server.sourceview.onAddComment(%s);", getJson(mark)));+ target.appendJavaScript(String.format("gitplex.server.sourceView.onAddComment(%s);", getJson(mark)));break;case "openComment":Long commentId = params.getParameterValue("param1").toLong();@@ -608,7 +586,7 @@ public class SourceViewPanel extends BlobViewPanel {commentContainer.setVisible(true);target.add(commentContainer);CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);- script = String.format("gitplex.server.sourceview.onOpenComment(%s);", getJsonOfComment(comment));+ script = String.format("gitplex.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));target.appendJavaScript(script);context.onCommentOpened(target, comment);break;@@ -630,7 +608,7 @@ public class SourceViewPanel extends BlobViewPanel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceview.initOutline();"));+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.sourceView.initOutline();"));}};@@ -684,7 +662,7 @@ public class SourceViewPanel extends BlobViewPanel {fragment.add(symbol.renderIcon("icon"));- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -692,12 +670,12 @@ public class SourceViewPanel extends BlobViewPanel {}};- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent = context.getBlobIdent();state.commentId = CodeComment.idOf(context.getOpenComment());state.mark = TextRange.of(symbol.getPosition());- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- link.add(AttributeAppender.replace("href", urlFor(DepotFilePage.class, params).toString()));+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ link.add(AttributeAppender.replace("href", urlFor(DepotBlobPage.class, params).toString()));link.add(symbol.render("label", null));fragment.add(link);@@ -786,7 +764,7 @@ public class SourceViewPanel extends BlobViewPanel {private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {clearComment(target);- String script = String.format("gitplex.server.sourceview.onCommentDeleted(%s);",+ String script = String.format("gitplex.server.sourceView.onCommentDeleted(%s);",getJsonOfComment(comment));target.appendJavaScript(script);context.onCommentOpened(target, null);@@ -879,19 +857,18 @@ public class SourceViewPanel extends BlobViewPanel {CharSequence callback = ajaxBehavior.getCallbackFunction(explicit("action"), explicit("param1"), explicit("param2"),explicit("param3"), explicit("param4"));- String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);- String script = String.format("gitplex.server.sourceview.init('%s', '%s', %s, %s, '%s', '%s', "- + "%s, %s, %s, %s, %s, %s, %s, '%s');",- JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),+ String script = String.format("gitplex.server.sourceView.init('%s', '%s', %s, %s, '%s', '%s', "+ + "%s, %s, %s, %s, %s, '%s', %s, '%s');",JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),+ JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",context.getMark()!=null?getJson(context.getMark()):"undefined",symbolTooltip.getMarkupId(),context.getBlobIdent().revision,jsonOfBlameInfos,jsonOfCommentInfos,- callback, blameMessageBehavior.getCallback(),- viewState!=null?"JSON.parse('"+viewState+"')":"undefined",+ callback,+ blameMessageBehavior.getCallback(),SecurityUtils.getAccount()!=null,context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",sourceFormat.getTabSize(),@@ -929,5 +906,20 @@ public class SourceViewPanel extends BlobViewPanel {TextRange mark;}++ @Override+ protected boolean canEdit() {+ return true;+ }++ @Override+ protected boolean canBlame() {+ return true;+ }++ @Override+ public void mark(AjaxRequestTarget target, TextRange mark) {+ mark(target, mark, true);+ }}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.javasimilarity index 87%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.javaindex d12e1fe29d..970a4c6404 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.source;+package com.gitplex.server.web.page.depot.blob.render.renderers.source;import java.util.List;@@ -31,7 +31,8 @@ public class SourceViewResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));- dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SourceViewResourceReference.class, "source-view.css")));+ dependencies.add(CssHeaderItem.forReference(+ new BaseDependentCssResourceReference(SourceViewResourceReference.class, "source-view.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.cssnew file mode 100644index 0000000000..f4fac9cf86--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.css@@ -0,0 +1,6 @@+.blob-edit>.head .source-format {+ margin: 8px 12px 0 0;+}+.blob-edit .source-edit .input {+ display: none;+}\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.jsnew file mode 100644index 0000000000..fc935c9804--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-edit.js@@ -0,0 +1,175 @@+gitplex.server.sourceEdit = {+ init: function(containerId, filePath, mark, indentType,+ tabSize, lineWrapMode, autoFocus) {+ var $container = $("#" + containerId);+ var $sourceEdit = $container.children(".source-edit");+ var $code = $sourceEdit.children(".code");++ var cm = CodeMirror($code[0], {+ value: $sourceEdit.children(".input").val(),+ autofocus: autoFocus,+ theme: "eclipse",+ indentWithTabs: indentType == "Tabs",+ indentUnit: tabSize,+ lineNumbers: true,+ lineWrapping: lineWrapMode == "Soft wrap",+ tabSize: tabSize,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ highlightIdentifiers: {delay: 500},+ extraKeys: {+ "F11": function(cm) {+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));+ },+ "Esc": function(cm) {+ if (cm.getOption("fullScreen")) {+ cm.setOption("fullScreen", false);+ $(window).resize();+ }+ }+ }+ });+ CodeMirror.keyMap.default["Ctrl-L"] = "gotoLine";++ gitplex.server.codemirror.setMode(cm, filePath);++ /*+ * AreYouSure can not track dirty correctly for CodeMirror generated+ * textarea, and it will always mark the form as clean even if we+ * mark it as dirty explicitly. So we use no-dirtycheck class to+ * disable automatic dirty track+ */+ $sourceEdit.closest("form").find("textarea").addClass("no-dirtytrack");++ if (mark) {+ gitplex.server.codemirror.mark(cm, mark, true);+ }++ cm.oldDocValue = cm.doc.getValue();++ cm.on("change", function() {+ $sourceEdit.closest("form").addClass("dirty");+ });++ $sourceEdit.on("getViewState", function(e) {+ return gitplex.server.codemirror.getViewState(cm);+ });+ $sourceEdit.on("setViewState", function(e, viewState) {+ gitplex.server.codemirror.setViewState(cm, viewState);+ });++ $sourceEdit.on("autofit", function(e, width, height) {+ if (cm.getOption("fullScreen"))+ return;++ $sourceEdit.outerWidth(width);+ $sourceEdit.outerHeight(height);+ if (cm.getOption("fullScreen"))+ cm.setOption("fullScreen", false);+ cm.setSize($sourceEdit.width(), $sourceEdit.height());+ });++ function hideParentScrollBar() {+ var $scrollable = $sourceEdit.closest(".scrollable");+ /*+ * Hide scroll bar of parent scrollable as we will be using+ * CodeMirror scroll bar+ */+ $scrollable.css("overflow", "visible");+ }++ hideParentScrollBar();+ $sourceEdit.on("show", hideParentScrollBar);+ },+ mark: function(containerId, mark) {+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);+ if (cm.oldDocValue) {+ var dmp = new diff_match_patch();+ var diffs = dmp.diff_main(cm.oldDocValue, cm.doc.getValue());++ var beginLine = mark.beginLine, beginChar = mark.beginChar;+ var endLine = mark.endLine, endChar = mark.endChar;+ var newBeginLine, newBeginChar, newEndLine, newEndChar;+ var oldLine = oldChar = newLine = newChar = 0;+ for (var i=0; i<diffs.length; i++) {+ var diff = diffs[i];+ var chars = diff[1];+ var quit = false;+ for (var j=0; j<chars.length; j++) {+ var char = chars[j];+ if (diff[0] == -1) {+ if (char == '\n') {+ oldLine++;+ oldChar = 0;+ } else {+ oldChar++;+ }+ } else if (diff[0] == 1) {+ if (char == '\n') {+ newLine++;+ newChar = 0;+ } else {+ newChar++;+ }+ } else {+ if (oldLine == beginLine && oldChar == beginChar) {+ newBeginLine = newLine;+ newBeginChar = newChar;+ }+ if (char == '\n') {+ oldLine++;+ oldChar = 0;+ newLine++;+ newChar = 0;+ } else {+ oldChar++;+ newChar++;+ }+ if (oldLine == endLine && oldChar == endChar) {+ newEndLine = newLine;+ newEndChar = newChar;+ }+ }+ if (oldLine>beginLine && newBeginLine==undefined || oldLine>endLine) {+ quit = true;+ break;+ }+ }+ if (quit)+ break;+ }+ }++ if (newBeginLine!=undefined && newEndLine!=undefined) {+ var newMark = {+ beginLine: newBeginLine,+ beginChar: newBeginChar,+ endLine: newEndLine,+ endChar: newEndChar+ };+ gitplex.server.codemirror.mark(cm, newMark, true);+ }+ },+ getCodeMirror: function(containerId) {+ return $("#" + containerId + ">.source-edit>.code>.CodeMirror")[0].CodeMirror;+ },+ onSubmit: function(containerId) {+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);+ $("#" + containerId + ">.source-edit>textarea").val(cm.getValue());+ },+ onIndentTypeChange: function(containerId, indentType) {+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);+ cm.setOption("indentWithTabs", indentType == "Tabs");+ },+ onLineWrapModeChange: function(containerId, lineWrapMode) {+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);+ cm.setOption("lineWrapping", lineWrapMode == "Soft wrap");+ },+ onTabSizeChange: function(containerId, tabSize) {+ var cm = gitplex.server.sourceEdit.getCodeMirror(containerId);+ cm.setOption("tabSize", tabSize);+ }+};diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.jssimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.jsrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.jsindex 5c6d1b2424..3dce3a88bc 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/source-view.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js@@ -1,52 +1,121 @@-gitplex.server.sourceview = {- init: function(fileContent, filePath, openComment, mark, symbolTooltipId,- revision, blameInfos, comments, markCallback, blameMessageCallback,- viewState, loggedIn, anchor, tabSize, lineWrapMode) {- var cm;+gitplex.server.sourceView = {+ init: function(filePath, fileContent, openComment, mark, symbolTooltipId,+ revision, blameInfos, comments, callback, blameMessageCallback,+ loggedIn, anchor, tabSize, lineWrapMode) {var $sourceView = $(".source-view");- if (openComment)- $sourceView.data("openComment", openComment);- if (mark)- $sourceView.data("mark", mark);-- $sourceView.data("markCallback", markCallback);+ var $code = $sourceView.children(".code");+ var options = {+ value: fileContent,+ readOnly: gitplex.server.isDevice()?"nocursor":true,+ theme: "eclipse",+ lineNumbers: true,+ lineWrapping: lineWrapMode == "Soft wrap",+ indentUnit: tabSize,+ tabSize: tabSize,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ highlightIdentifiers: {delay: 500},+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],+ extraKeys: {+ "F11": function(cm) {+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));+ },+ "Esc": function(cm) {+ if (cm.getOption("fullScreen")) {+ cm.setOption("fullScreen", false);+ $(window).resize();+ }+ }+ }+ };++ var cm = CodeMirror($code[0], options);+ gitplex.server.codemirror.setMode(cm, filePath);++ $sourceView.data("callback", callback);$sourceView.data("blameMessageCallback", blameMessageCallback);- var $code = $sourceView.children(".code");+ // hide scroll bar of parent scrollable as we will be using+ // CodeMirror scroll bar$sourceView.closest(".scrollable").css("overflow", "visible");- function repositionCommentPopovers() {- $(".comment-popover:visible").each(function() {- var $popover = $(this);- var lineInfo = cm.lineInfo($popover.data("line"));- if (lineInfo.gutterMarkers) {- var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];- if (gutter) {- var $indicator = $(gutter).children("a");- if ($indicator.offset().top+$indicator.height() < $sourceView.offset().top- || $indicator.offset().top > $sourceView.offset().top+$sourceView.height()) {- $popover.css("left", "-10000px");- } else {- $popover.css({- "left": $indicator.offset().left + $indicator.outerWidth() - $sourceView.offset().left,- "top": $indicator.offset().top + ($indicator.outerHeight() - $popover.outerHeight())/2 - $sourceView.offset().top- });- }- }- }- });- }+ if (mark) {+ gitplex.server.codemirror.mark(cm, mark, true);+ $sourceView.data("mark", mark);+ }++ if (openComment)+ $sourceView.data("openComment", openComment);++ if (anchor) {+ var $anchor = $("#"+anchor);+ if ($anchor.length != 0) {+ setTimeout(function() {+ $anchor.closest(".code-comment").parent().scrollIntoView($anchor);+ }, 0);+ }+ }- $sourceView.on("storeViewState", function(event) {- event.stopPropagation();- if (cm) {- gitplex.server.history.setViewState(gitplex.server.codemirror.getViewState(cm));+ // add gutters with a timer to avoid the issue that occasionally+ // gutter becomes much wider than expected+ setTimeout(function() {+ var gutters = cm.getOption("gutters").slice();+ gutters.splice(0, 0, "CodeMirror-comments");+ cm.setOption("gutters", gutters);+ for (var line in comments) {+ if (comments.hasOwnProperty(line)) {+ gitplex.server.sourceView.addCommentGutter(line, comments[line][1]);+ }}++ if (blameInfos) {+ gitplex.server.sourceView.blame(blameInfos);+ }+ gitplex.server.sourceView.highlightCommentTrigger();+ }, 10);++ $code.selectionPopover("init", function() {+ if (cm.hasFocus()) {+ var from = cm.getCursor("from");+ var to = cm.getCursor("to");+ if (from.line != to.line || from.ch != to.ch) {+ callback("openSelectionPopover", from.line, from.ch, to.line, to.ch);+ return;+ }+ }+ return "close";+ });++ $code.mouseover(function(e) {+ var node = e.target || e.srcElement, $node = $(node);+ if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")+ || $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")+ || $node.hasClass("cm-string") || $node.hasClass("cm-tag") || $node.hasClass("cm-attribute")) {+ document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);+ }+ });++ cm.on("scroll", function() {+ gitplex.server.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId));+ gitplex.server.mouseState.moved = false;+ repositionCommentPopovers();+ });++ $sourceView.on("getViewState", function() {+ return gitplex.server.codemirror.getViewState(cm);+ });+ $sourceView.on("setViewState", function(e, viewState) {+ return gitplex.server.codemirror.setViewState(cm, viewState);});$sourceView.on("autofit", function(event, width, height) {- event.stopPropagation();+ if (cm.getOption("fullScreen"))+ return;+$sourceView.outerWidth(width);$sourceView.outerHeight(height);$code.outerHeight($sourceView.height());@@ -78,105 +147,31 @@ gitplex.server.sourceview = {$sourceView.css("padding-right", "0");}- /*- * initialize codemirror here when we know the container width and height- * as otherwise the annotatescrollbar addon is inaccurate when window- * initially loads- */- var initState = !cm;- if (!cm) {- var options = {- value: fileContent,- readOnly: gitplex.server.isDevice()?"nocursor":true,- theme: "eclipse",- lineNumbers: true,- lineWrapping: lineWrapMode == "Soft wrap",- indentUnit: tabSize,- tabSize: tabSize,- styleActiveLine: true,- styleSelectedText: true,- foldGutter: true,- matchBrackets: true,- scrollbarStyle: "simple",- highlightIdentifiers: {delay: 500},- gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],- extraKeys: {- "F11": function(cm) {- cm.setOption("fullScreen", !cm.getOption("fullScreen"));- },- "Esc": function(cm) {- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- }- }- };-- cm = CodeMirror($code[0], options);- gitplex.server.codemirror.setMode(cm, filePath);-- // add gutters with a timer to avoid the issue that occasionally- // gutter becomes much wider than expected- setTimeout(function() {- var gutters = cm.getOption("gutters").slice();- gutters.splice(0, 0, "CodeMirror-comments");- cm.setOption("gutters", gutters);- for (var line in comments) {- if (comments.hasOwnProperty(line)) {- gitplex.server.sourceview.addCommentGutter(line, comments[line][1]);- }- }-- if (blameInfos) {- gitplex.server.sourceview.blame(blameInfos);- }- gitplex.server.sourceview.highlightCommentTrigger();- }, 10);-- $code.selectionPopover("init", function() {- if (cm.hasFocus()) {- var from = cm.getCursor("from");- var to = cm.getCursor("to");- if (from.line != to.line || from.ch != to.ch) {- markCallback("openSelectionPopover", from.line, from.ch, to.line, to.ch);- return;- }- }- return "close";- });-- $code.mouseover(function(e) {- var node = e.target || e.srcElement, $node = $(node);- if ($node.hasClass("cm-property") || $node.hasClass("cm-variable") || $node.hasClass("cm-variable-2")- || $node.hasClass("cm-variable-3") || $node.hasClass("cm-def") || $node.hasClass("cm-meta")- || $node.hasClass("cm-string") || $node.hasClass("cm-tag") || $node.hasClass("cm-attribute")) {- document.getElementById(symbolTooltipId).onMouseOverSymbol(revision, node);- }- });- cm.setSize($code.width(), $code.height());- if (mark)- gitplex.server.codemirror.mark(cm, mark, true);- if (initState) // restore cursor and scroll- gitplex.server.codemirror.initState(cm, viewState);- cm.on("scroll", function() {- gitplex.server.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId));- gitplex.server.mouseState.moved = false;- repositionCommentPopovers(cm);- });- } else {- cm.setSize($code.width(), $code.height());- if (cm.getOption("fullScreen"))- cm.setOption("fullScreen", false);- repositionCommentPopovers(cm);- }+ cm.setSize($code.width(), $code.height());+ repositionCommentPopovers();});- if (anchor) {- var $anchor = $("#"+anchor);- if ($anchor.length != 0) {- setTimeout(function() {- $anchor.closest(".code-comment").parent().scrollIntoView($anchor);- }, 10);- }- }++ function repositionCommentPopovers() {+ $(".comment-popover:visible").each(function() {+ var $popover = $(this);+ var lineInfo = cm.lineInfo($popover.data("line"));+ if (lineInfo.gutterMarkers) {+ var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];+ if (gutter) {+ var $indicator = $(gutter).children("a");+ if ($indicator.offset().top+$indicator.height() < $sourceView.offset().top+ || $indicator.offset().top > $sourceView.offset().top+$sourceView.height()) {+ $popover.css("left", "-10000px");+ } else {+ $popover.css({+ "left": $indicator.offset().left + $indicator.outerWidth() - $sourceView.offset().left,+ "top": $indicator.offset().top + ($indicator.outerHeight() - $popover.outerHeight())/2 - $sourceView.offset().top+ });+ }+ }+ }+ });+ }},initComment: function() {var $sourceView = $(".source-view");@@ -203,6 +198,12 @@ gitplex.server.sourceview = {}});},+ exitFullScreen: function() {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ if (cm.getOption("fullScreen")) {+ cm.setOption("fullScreen", false);+ }+ },initOutline: function() {var $sourceView = $(".source-view");var $code = $sourceView.children(".code");@@ -242,7 +243,7 @@ gitplex.server.sourceview = {$(".comment-popover[data-line='" + line + "']").remove();var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var markCallback = $(".source-view").data("markCallback");+ var callback = $(".source-view").data("callback");var $gutter = $(document.createElement("div"));$gutter.addClass("CodeMirror-comment");@@ -276,7 +277,7 @@ gitplex.server.sourceview = {gitplex.server.codemirror.mark(cm, comment.mark, false);});$(this).mouseout(function() {- gitplex.server.sourceview.restoreMark();+ gitplex.server.sourceView.restoreMark();});$(this).click(function() {if ($(".source-view form.dirty").length != 0@@ -284,10 +285,10 @@ gitplex.server.sourceview = {return;}var comment = comments[$(this).index()];- markCallback("openComment", comment.id);+ callback("openComment", comment.id);});});- gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceView.highlightCommentTrigger();});} else {var comment = comments[0];@@ -297,14 +298,14 @@ gitplex.server.sourceview = {gitplex.server.codemirror.mark(cm, comment.mark, false);});$indicator.mouseout(function() {- gitplex.server.sourceview.restoreMark();+ gitplex.server.sourceView.restoreMark();});$indicator.click(function() {if ($(".source-view form.dirty").length != 0&& !confirm("There are unsaved changes, discard and continue?")) {return;}- markCallback("openComment", comment.id);+ callback("openComment", comment.id);});}cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);@@ -323,8 +324,8 @@ gitplex.server.sourceview = {&& !confirm("There are unsaved changes, discard and continue?")) {return;}- var markCallback = $(".source-view").data("markCallback");- markCallback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);+ var callback = $(".source-view").data("callback");+ callback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);});} else {$content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");@@ -353,9 +354,9 @@ gitplex.server.sourceview = {comments = [];}comments.push(comment);- gitplex.server.sourceview.addCommentGutter(line, comments);- gitplex.server.sourceview.highlightCommentTrigger();- gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceView.addCommentGutter(line, comments);+ gitplex.server.sourceView.highlightCommentTrigger();+ gitplex.server.sourceView.onLayoutChange();},onCommentDeleted: function(comment) {var $sourceView = $(".source-view");@@ -375,18 +376,19 @@ gitplex.server.sourceview = {break;}}- gitplex.server.sourceview.addCommentGutter(line, comments);+ gitplex.server.sourceView.addCommentGutter(line, comments);}- gitplex.server.sourceview.highlightCommentTrigger();- gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceView.highlightCommentTrigger();+ gitplex.server.sourceView.onLayoutChange();- gitplex.server.sourceview.mark(undefined, false);+ gitplex.server.sourceView.mark(undefined, false);},onLayoutChange: function() {$sourceView = $('.source-view');- $sourceView.trigger('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]);+ $sourceView.triggerHandler('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]);},onAddComment: function(mark) {+ gitplex.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");$sourceView.removeData("openComment");$sourceView.data("mark", mark);@@ -394,34 +396,36 @@ gitplex.server.sourceview = {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;gitplex.server.codemirror.clearSelection(cm);- gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceView.onLayoutChange();// mark and scroll after changing layout to make sure scroll// works correctlygitplex.server.codemirror.mark(cm, mark, true);- gitplex.server.sourceview.highlightCommentTrigger();+ gitplex.server.sourceView.highlightCommentTrigger();},onOpenComment: function(comment) {+ gitplex.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");$sourceView.data("openComment", comment);$sourceView.data("mark", comment.mark);- gitplex.server.sourceview.highlightCommentTrigger();- gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceView.highlightCommentTrigger();+ gitplex.server.sourceView.onLayoutChange();// mark and scroll after changing layout to make sure scroll// works correctly- gitplex.server.sourceview.mark(comment.mark, true);+ gitplex.server.sourceView.mark(comment.mark, true);},onCloseComment: function() {var $sourceView = $(".source-view");$sourceView.removeData("openComment");- gitplex.server.sourceview.highlightCommentTrigger();- gitplex.server.sourceview.onLayoutChange();- gitplex.server.sourceview.mark(undefined, false);+ gitplex.server.sourceView.highlightCommentTrigger();+ gitplex.server.sourceView.onLayoutChange();+ gitplex.server.sourceView.mark(undefined, false);},onToggleOutline: function() {- gitplex.server.sourceview.onLayoutChange();+ gitplex.server.sourceView.exitFullScreen();+ gitplex.server.sourceView.onLayoutChange();$(".outline-toggle").toggleClass("active");},highlightCommentTrigger: function() {@@ -490,7 +494,10 @@ gitplex.server.sourceview = {var range = blameInfo.ranges[j];var $gutter = $(document.createElement("div"));$gutter.addClass("CodeMirror-annotation");- $("<a class='hash'>" + blameInfo.abbreviatedHash + "</a>").appendTo($gutter).attr("href", blameInfo.url);+ $("<a class='hash'>" + blameInfo.abbreviatedHash + "</a>")+ .appendTo($gutter)+ .attr("href", blameInfo.url)+ .attr("onclick", "gitplex.server.viewState.getFromViewAndSetToHistory();");var $hashLink = $gutter.children("a.hash");$hashLink.data("hash", blameInfo.hash);$hashLink.data("line", range.from);@@ -525,11 +532,6 @@ gitplex.server.sourceview = {cm.setOption("gutters", gutters);}},- onBlame: function(blameInfos) {- gitplex.server.sourceview.blame(blameInfos);- gitplex.server.sourceview.onLayoutChange();- $(".blame-toggle").toggleClass("active");- },scrollToCommentBottom: function() {var $body = $(".source-view>.comment>.content>.body");$body.scrollTop($body[0].scrollHeight);diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/vgrabber.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/vgrabber.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/vgrabber.pngrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/vgrabber.pngdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.javasimilarity index 75%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.javaindex 272e5a3e6f..62e5379d05 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.symbollink;+package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;import java.io.File;import java.io.IOException;@@ -9,7 +9,6 @@ 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.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;@@ -18,14 +17,15 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;import com.gitplex.server.git.Blob;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class SymbolLinkPanel extends BlobViewPanel {- public SymbolLinkPanel(String id, BlobViewContext context) {+ public SymbolLinkPanel(String id, BlobRenderContext context) {super(id, context);}@@ -64,11 +64,11 @@ public class SymbolLinkPanel extends BlobViewPanel {};link.setEnabled(false);} else {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = context.getBlobIdent().revision;state.blobIdent.path = targetPath;- link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(context.getDepot(), state));+ link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,+ DepotBlobPage.paramsOf(context.getDepot(), state));}link.add(new Label("label", blob.getText().getContent()));add(link);@@ -81,4 +81,14 @@ public class SymbolLinkPanel extends BlobViewPanel {response.render(CssHeaderItem.forReference(new SymbolLinkResourceReference()));}+ @Override+ protected boolean canEdit() {+ return false;+ }++ @Override+ protected boolean canBlame() {+ return false;+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.javanew file mode 100644index 0000000000..12688aa0c6--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java@@ -0,0 +1,37 @@+package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;++import org.apache.wicket.Component;++import com.gitplex.server.web.PrioritizedComponentRenderer;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRendererContribution;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;++public class SymbolLinkRendererProvider implements BlobRendererContribution {++ private static final long serialVersionUID = 1L;++ @Override+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isSymbolLink()) {+ return new PrioritizedComponentRenderer() {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new SymbolLinkPanel(componentId, context);+ }++ @Override+ public int getPriority() {+ return 0;+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.javasimilarity index 79%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.javaindex f96aa2bd0d..350c2d4ad0 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/SymbolLinkResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview.symbollink;+package com.gitplex.server.web.page.depot.blob.render.renderers.symbollink;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/symbol-link.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/symbol-link.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/symbollink/symbol-link.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/symbollink/symbol-link.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.htmlsimilarity index 86%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.htmlindex 27ea73a2e9..1ffd27840d 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.html+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.html@@ -23,7 +23,8 @@<div class="others pull-left"><div class="btn-group"><a wicket:id="raw" class="btn btn-default btn-xs"><i class="fa fa-file-o"></i> Raw</a>- <wicket:container wicket:id="additionalActions"></wicket:container>+ <a wicket:id="blame" class="btn btn-default btn-xs"><i class="fa fa-user"></i> Blame</a>+ <wicket:container wicket:id="extraActions"></wicket:container></div></div></div>diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.javasimilarity index 67%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.javaindex 08fcd4dc25..87fc1aeab1 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview;+package com.gitplex.server.web.page.depot.blob.render.view;import javax.annotation.Nullable;@@ -15,25 +15,24 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.cycle.RequestCycle;-import com.google.common.base.Preconditions;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.FileUtils;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.ViewStateAwareAjaxLink;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.gitplex.server.web.util.resource.RawBlobResource;import com.gitplex.server.web.util.resource.RawBlobResourceReference;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public abstract class BlobViewPanel extends Panel {- protected final BlobViewContext context;+ protected final BlobRenderContext context;- public BlobViewPanel(String id, BlobViewContext context) {+ public BlobViewPanel(String id, BlobRenderContext context) {super(id);BlobIdent blobIdent = context.getBlobIdent();@@ -43,6 +42,10 @@ public abstract class BlobViewPanel extends Panel {this.context = context;}+ protected abstract boolean canEdit();++ protected abstract boolean canBlame();+protected WebMarkupContainer newOptions(String id) {WebMarkupContainer options = new WebMarkupContainer(id);options.setVisible(false);@@ -59,33 +62,8 @@ public abstract class BlobViewPanel extends Panel {&& (context.isOnBranch()));changeActions.setOutputMarkupId(true);- if (context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {- if (context.isOnBranch()) {- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("edit") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target, String viewState) {- RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);- context.onEdit(target);- }- };- link.add(AttributeAppender.append("title", "Edit on branch " + context.getBlobIdent().revision));- changeActions.add(link);- } else {- changeActions.add(new WebMarkupContainer("edit").setVisible(false));- }- } else {- changeActions.add(new WebMarkupContainer("edit").setVisible(false));- }-- if (context.isOnBranch()) {- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("delete") {+ if (canEdit()) {+ AjaxLink<Void> editLink = new ViewStateAwareAjaxLink<Void>("edit", true) {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -95,16 +73,33 @@ public abstract class BlobViewPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- context.onDelete(target);+ context.onModeChange(target, Mode.EDIT);}-+};- link.add(AttributeAppender.append("title", "Delete from branch " + context.getBlobIdent().revision));- changeActions.add(link);+ editLink.add(AttributeAppender.append("title", "Edit on branch " + context.getBlobIdent().revision));+ changeActions.add(editLink);} else {- changeActions.add(new WebMarkupContainer("delete").setVisible(false));+ changeActions.add(new WebMarkupContainer("edit").setVisible(false));}+ AjaxLink<Void> deleteLink = new ViewStateAwareAjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ context.onModeChange(target, Mode.DELETE);+ }++ };+ deleteLink.add(AttributeAppender.append("title", "Delete from branch " + context.getBlobIdent().revision));+ changeActions.add(deleteLink);+if (target != null) {replace(changeActions);target.add(changeActions);@@ -159,7 +154,35 @@ public abstract class BlobViewPanel extends Panel {add(new ResourceLink<Void>("raw", new RawBlobResourceReference(),RawBlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));- add(newAdditionalActions("additionalActions"));+ add(new ViewStateAwareAjaxLink<Void>("blame", true) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (context.getMode() == Mode.BLAME)+ context.onModeChange(target, Mode.VIEW);+ else+ context.onModeChange(target, Mode.BLAME);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (context.getMode() == Mode.BLAME)+ return "active";+ else+ return "";+ }++ })));++ add(newAdditionalActions("extraActions"));newChangeActions(null);setOutputMarkupId(true);@@ -174,7 +197,7 @@ public abstract class BlobViewPanel extends Panel {response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.server.blobView('%s');", getMarkupId())));}- public BlobViewContext getContext() {+ public BlobRenderContext getContext() {return context;}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.javasimilarity index 92%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.javaindex a63b280c40..ce979aba6f 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/BlobViewResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobview;+package com.gitplex.server.web.page.depot.blob.render.view;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.javanew file mode 100644index 0000000000..a6f1351bee--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java@@ -0,0 +1,9 @@+package com.gitplex.server.web.page.depot.blob.render.view;++import org.apache.wicket.ajax.AjaxRequestTarget;++import com.gitplex.server.model.support.TextRange;++public interface MarkSupport {+ void mark(AjaxRequestTarget target, TextRange mark);+}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/blob-view.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.cssdiff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.jsnew file mode 100644index 0000000000..edbea34ff1--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/blob-view.js@@ -0,0 +1,26 @@+gitplex.server.blobView = function(containerId) {+ var $blobView = $("#" + containerId + ">.blob-view");+ var $head = $blobView.find(">.head");+ var $body = $blobView.find(">.body");++ $blobView.on("getViewState", function(e) {+ return {scroll:{left: $body.scrollLeft(), top: $body.scrollTop()}};+ });++ $blobView.on("setViewState", function(e, viewState) {+ if (viewState.scroll) {+ $body.scrollLeft(viewState.scroll.left);+ $body.scrollTop(viewState.scroll.top);+ }+ });++ $blobView.on("autofit", function(e, width, height) {+ $blobView.outerWidth(width);+ $blobView.outerHeight(height);++ height = $blobView.height()-$head.outerHeight();+ $body.outerWidth(width).outerHeight(height);+ $body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);+ });++};\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.javasimilarity index 99%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.javaindex 8f860aad11..b24f48f9bd 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.advanced;+package com.gitplex.server.web.page.depot.blob.search.advanced;import java.io.Serializable;import java.util.ArrayList;@@ -49,10 +49,10 @@ import com.gitplex.server.search.query.TextQuery;import com.gitplex.server.search.query.TooGeneralQueryException;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.RunTaskBehavior;-import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;import com.gitplex.server.web.component.tabbable.Tabbable;+import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.javaindex 23f3ee64bf..ae7077ceaf 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/AdvancedSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.advanced;+package com.gitplex.server.web.page.depot.blob.search.advanced;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/advanced-search.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/advanced-search.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/advanced/advanced-search.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/advanced/advanced-search.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.javaindex 4e61a71a0a..7b52f4964a 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.instant;+package com.gitplex.server.web.page.depot.blob.search.instant;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;@@ -10,6 +10,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxChannel;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.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -41,12 +42,12 @@ import com.gitplex.server.search.query.TooGeneralQueryException;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;import com.gitplex.server.web.behavior.RunTaskBehavior;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.ComponentTarget;import com.gitplex.server.web.component.floating.FloatingPanel;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -237,7 +238,7 @@ public abstract class InstantSearchPanel extends Panel {@Overrideprotected void populateItem(ListItem<QueryHit> item) {QueryHit hit = item.getModelObject();- PreventDefaultAjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -256,12 +257,12 @@ public abstract class InstantSearchPanel extends Panel {link.add(new Label("scope", hit.getNamespace()).setVisible(hit.getNamespace()!=null));item.add(link);- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = revisionModel.getObject();state.blobIdent.path = hit.getBlobPath();state.mark = TextRange.of(hit.getTokenPos());- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, params);+ PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), state);+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);link.add(AttributeAppender.replace("href", url.toString()));if (item.getIndex() == 0)@@ -269,7 +270,7 @@ public abstract class InstantSearchPanel extends Panel {}});- searchResult.add(new PreventDefaultAjaxLink<Void>("moreSymbolHits") {+ searchResult.add(new AjaxLink<Void>("moreSymbolHits") {@Overrideprotected void onInitialize() {@@ -357,7 +358,8 @@ public abstract class InstantSearchPanel extends Panel {private void selectHit(AjaxRequestTarget target, QueryHit hit) {target.appendJavaScript(String.format("$('#%s').hide();", searchField.getMarkupId(true)));- searchHint.close();+ if (searchHint != null)+ searchHint.close();onSelect(target, hit);}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.javasimilarity index 95%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.javaindex dfcfb6b91f..d2caeb508a 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/InstantSearchResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.instant;+package com.gitplex.server.web.page.depot.blob.search.instant;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.jssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/instant-search.jsrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/instant-search.jsdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/point.png b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/point.pngsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/instant/point.pngrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/instant/point.pngdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.javasimilarity index 87%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.javaindex eec395caa9..8ab6f6878e 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/ConfirmSwitchFileListener.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.page.depot.blob.search.result;import org.apache.commons.lang3.StringEscapeUtils;import org.apache.wicket.Component;@@ -24,10 +24,10 @@ class ConfirmSwitchFileListener implements IAjaxCallListener {@Overridepublic CharSequence getPrecondition(Component component) {if (path != null) {- return String.format("return gitplex.server.searchresult.confirmSwitchFileByPath('%s');",+ return String.format("return gitplex.server.searchResult.confirmSwitchFileByPath('%s');",StringEscapeUtils.escapeEcmaScript(path));} else {- return String.format("return gitplex.server.searchresult.confirmSwitchFileByLink('%s');",+ return String.format("return gitplex.server.searchResult.confirmSwitchFileByLink('%s');",component.getMarkupId(true));}}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.javasimilarity index 90%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.javaindex 2da7dedd5c..2e6a6277f7 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/MatchedBlob.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.page.depot.blob.search.result;import java.io.Serializable;import java.util.List;diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.htmlsimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.htmlrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.htmldiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.javasimilarity index 94%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.javaindex e27c7b5c3c..df817a929e 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultPanel.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.page.depot.blob.search.result;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -30,9 +30,9 @@ import com.gitplex.server.model.support.TextRange;import com.gitplex.server.search.hit.FileHit;import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.TextHit;-import com.gitplex.server.web.component.PreventDefaultAjaxLink;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;import com.gitplex.jsymbol.Range;import com.gitplex.jsymbol.util.HighlightableLabel;@@ -49,7 +49,7 @@ public abstract class SearchResultPanel extends Panel {private static final String NAV_CHANNEL = "blob-search-result-nav";- private final BlobViewContext context;+ private final BlobRenderContext context;private final List<MatchedBlob> blobs;@@ -65,7 +65,7 @@ public abstract class SearchResultPanel extends Panel {private AjaxLink<Void> nextMatchLink;- public SearchResultPanel(String id, BlobViewContext context, List<QueryHit> hits) {+ public SearchResultPanel(String id, BlobRenderContext context, List<QueryHit> hits) {super(id);this.context = context;@@ -386,7 +386,7 @@ public abstract class SearchResultPanel extends Panel {});- blobItem.add(new PreventDefaultAjaxLink<Void>("blobLink") {+ blobItem.add(new ViewStateAwareAjaxLink<Void>("blobLink") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -405,11 +405,11 @@ public abstract class SearchResultPanel extends Panel {if (activeBlobIndex == blobItem.getIndex() && activeHitIndex == -1)add(AttributeAppender.append("class", " active"));- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = context.getBlobIdent().revision;state.blobIdent.path = blobPath;- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, params);+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));setMarkupId(SearchResultPanel.this.getMarkupId() + "-" + blobItem.getIndex());@@ -441,7 +441,7 @@ public abstract class SearchResultPanel extends Panel {@Overrideprotected void populateItem(final ListItem<QueryHit> hitItem) {final QueryHit hit = hitItem.getModelObject();- hitItem.add(new PreventDefaultAjaxLink<Void>("hitLink") {+ hitItem.add(new ViewStateAwareAjaxLink<Void>("hitLink") {@Overrideprotected void onInitialize() {@@ -456,12 +456,12 @@ public abstract class SearchResultPanel extends Panel {if (activeBlobIndex == blobItem.getIndex() && activeHitIndex == hitItem.getIndex())add(AttributeAppender.append("class", " active"));- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.mark = TextRange.of(hit.getTokenPos());state.blobIdent.revision = context.getBlobIdent().revision;state.blobIdent.path = hit.getBlobPath();- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, params);+ PageParameters params = DepotBlobPage.paramsOf(context.getDepot(), state);+ CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));setMarkupId(SearchResultPanel.this.getMarkupId()diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.javasimilarity index 81%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.javarename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.javaindex 7138aea767..97b4d4741c 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/SearchResultResourceReference.java@@ -1,4 +1,4 @@-package com.gitplex.server.web.component.depotfile.blobsearch.result;+package com.gitplex.server.web.page.depot.blob.search.result;import java.util.List;@@ -22,7 +22,8 @@ public class SearchResultResourceReference extends BaseDependentResourceReferencpublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new URIResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(SearchResultResourceReference.class, "search-result.css")));+ dependencies.add(CssHeaderItem.forReference(+ new CssResourceReference(SearchResultResourceReference.class, "search-result.css")));return dependencies;}diff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.css b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.csssimilarity index 100%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.cssrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.cssdiff --git a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.jssimilarity index 73%rename from web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.jsrename to web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.jsindex fe6d6236b8..3ac11e8b5c 100644--- a/web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/search-result.js+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/search/result/search-result.js@@ -1,15 +1,15 @@-gitplex.server.searchresult = {+gitplex.server.searchResult = {confirmSwitchFileByLink: function(linkId) {var linkURI = new URI(document.getElementById(linkId));var currentURI = new URI(window.location.href);- if (linkURI.search(true).path != currentURI.search(true).path)+ if (linkURI.path() != currentURI.path())return gitplex.server.form.confirmLeave();elsereturn true;},confirmSwitchFileByPath: function(path) {var currentURI = new URI(window.location.href);- if (path != currentURI.search(true).path)+ if (path != currentURI.path())return gitplex.server.form.confirmLeave();elsereturn true;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.javaindex ef724dc532..cbc24b85d7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/branches/DepotBranchesPage.java@@ -29,7 +29,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.AbstractLink;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -46,7 +45,6 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.RefInfo;@@ -63,18 +61,20 @@ import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.revisionpicker.RevisionPicker;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.page.depot.NoBranchesPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import 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.depot.pullrequest.requestlist.SearchOption;-import com.gitplex.server.web.page.depot.pullrequest.requestlist.SortOption;import com.gitplex.server.web.page.depot.pullrequest.requestlist.SearchOption.Status;+import com.gitplex.server.web.page.depot.pullrequest.requestlist.SortOption;+import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;@@ -416,10 +416,10 @@ public class DepotBranchesPage extends DepotPage {RefInfo ref = item.getModelObject();String branch = GitUtils.ref2branch(ref.getRef().getName());- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = branch;- AbstractLink link = new BookmarkablePageLink<Void>("branchLink",- DepotFilePage.class, DepotFilePage.paramsOf(getDepot(), state));+ AbstractLink link = new ViewStateAwarePageLink<Void>("branchLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));link.add(new Label("name", branch));item.add(link);@@ -453,13 +453,13 @@ public class DepotBranchesPage extends DepotPage {RevCommit lastCommit = getDepot().getRevCommit(ref.getRef().getObjectId());PageParameters params = CommitDetailPage.paramsOf(getDepot(), lastCommit.name());- link = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);+ link = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);link.add(new Label("hash", GitUtils.abbreviateSHA(lastCommit.name())));item.add(link);item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(lastCommit.name()))));item.add(new ContributorPanel("contributor", lastCommit.getAuthorIdent(), lastCommit.getCommitterIdent(), true));- link = new BookmarkablePageLink<Void>("messageLink", CommitDetailPage.class, params);+ link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);link.add(new Label("message", lastCommit.getShortMessage()));item.add(link);@@ -641,7 +641,7 @@ public class DepotBranchesPage extends DepotPage {searchOption.setStatus(Status.OPEN);searchOption.setBranch(branch);PageParameters params = RequestListPage.paramsOf(getDepot(), searchOption, new SortOption());- bodyFrag.add(new BookmarkablePageLink<Void>("openRequests", RequestListPage.class, params));+ bodyFrag.add(new ViewStateAwarePageLink<Void>("openRequests", RequestListPage.class, params));bodyFrag.add(new Label("branch", branch));fragment.add(bodyFrag);} else {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.javaindex 1e17249ca4..7b73025ef7 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java@@ -9,8 +9,8 @@ import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.CodeCommentRelation;import com.gitplex.server.model.support.CompareContext;import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;@SuppressWarnings("serial")@@ -43,8 +43,8 @@ public class CodeCommentPage extends DepotPage {RevisionComparePage.paramsOf(getDepot(), comment, anchor));} else {throw new RestartResponseException(- DepotFilePage.class,- DepotFilePage.paramsOf(getDepot(), comment, anchor));+ DepotBlobPage.class,+ DepotBlobPage.paramsOf(getDepot(), comment, anchor));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.javaindex fa5fe54b02..d1b9c6e69a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java@@ -20,7 +20,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -34,8 +33,6 @@ import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;-import com.google.common.base.Joiner;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;@@ -55,10 +52,13 @@ import com.gitplex.server.web.component.createbranch.CreateBranchLink;import com.gitplex.server.web.component.createtag.CreateTagLink;import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.tags.DepotTagsPage;+import com.google.common.base.Joiner;+import com.google.common.base.Preconditions;@SuppressWarnings("serial")public class CommitDetailPage extends DepotPage implements CommentSupport {@@ -113,10 +113,10 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {add(new CommitMessageLabel("text", depotModel, Model.of(getCommit().getShortMessage())));- DepotFilePage.State browseState = new DepotFilePage.State();+ DepotBlobPage.State browseState = new DepotBlobPage.State();browseState.blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);+ add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));add(new CreateBranchLink("createBranch", depotModel, state.revision) {@@ -178,19 +178,19 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {String ref = item.getModelObject().getRef().getName();String branch = GitUtils.ref2branch(ref);if (branch != null) {- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = branch;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.getObject(), state));+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,+ DepotBlobPage.paramsOf(depotModel.getObject(), state));link.add(new Label("label", branch));item.add(link);item.add(AttributeAppender.append("class", "branch"));} else {String tag = Preconditions.checkNotNull(GitUtils.ref2tag(ref));- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = tag;- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotFilePage.class,- DepotFilePage.paramsOf(depotModel.getObject(), state));+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", DepotBlobPage.class,+ DepotBlobPage.paramsOf(depotModel.getObject(), state));link.add(new Label("label", tag));item.add(link);item.add(AttributeAppender.append("class", "tag"));@@ -227,7 +227,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {newState.revision = parent.name();newState.whitespaceOption = state.whitespaceOption;newState.pathFilter = state.pathFilter;- Link<Void> link = new BookmarkablePageLink<Void>("parent", CommitDetailPage.class,+ Link<Void> link = new ViewStateAwarePageLink<Void>("parent", CommitDetailPage.class,paramsOf(depotModel.getObject(), newState));link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));parentsContainer.add(link);@@ -253,7 +253,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {newState.whitespaceOption = state.whitespaceOption;newState.pathFilter = state.pathFilter;- Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class,+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", CommitDetailPage.class,paramsOf(depotModel.getObject(), newState));link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.javaindex dac5fb9703..0d45fe5bfc 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java@@ -26,7 +26,6 @@ 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.form.TextField;-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.repeater.RepeatingView;@@ -44,8 +43,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;-import com.google.common.base.Optional;-import com.google.common.base.Throwables;import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;@@ -62,15 +59,16 @@ import com.gitplex.server.web.component.commitgraph.CommitGraphResourceReferenceimport com.gitplex.server.web.component.commitgraph.CommitGraphUtils;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.DepotPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;+import com.gitplex.server.web.page.depot.commit.CommitQueryParser.CriteriaContext;+import com.gitplex.server.web.page.depot.commit.CommitQueryParser.QueryContext;import com.gitplex.server.web.page.depot.compare.RevisionComparePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.util.ajaxlistener.IndicateLoadingListener;import com.gitplex.server.web.util.model.CommitRefsModel;-import com.gitplex.server.web.page.depot.commit.CommitQueryLexer;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser.CriteriaContext;-import com.gitplex.server.web.page.depot.commit.CommitQueryParser.QueryContext;+import com.google.common.base.Optional;+import com.google.common.base.Throwables;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import jersey.repackaged.com.google.common.collect.Lists;@@ -442,11 +440,11 @@ public class DepotCommitsPage extends DepotPage {}}- DepotFilePage.State browseState = new DepotFilePage.State();+ DepotBlobPage.State browseState = new DepotBlobPage.State();browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);browseState.blobIdent.path = path;- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));+ PageParameters params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);+ item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));if (state.getCompareWith() != null) {RevisionComparePage.State compareState = new RevisionComparePage.State();@@ -456,7 +454,7 @@ public class DepotCommitsPage extends DepotPage {compareState.tabPanel = RevisionComparePage.TabPanel.CHANGES;params = RevisionComparePage.paramsOf(getDepot(), compareState);- item.add(new BookmarkablePageLink<Void>("compare", RevisionComparePage.class, params));+ item.add(new ViewStateAwarePageLink<Void>("compare", RevisionComparePage.class, params));} else {item.add(new WebMarkupContainer("compare").setVisible(false));}@@ -464,7 +462,7 @@ public class DepotCommitsPage extends DepotPage {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);item.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));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 2d097810fa..d424fd8262 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@@ -18,7 +18,6 @@ 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.CheckBox;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;@@ -47,6 +46,7 @@ import com.gitplex.server.web.behavior.TooltipBehavior;import com.gitplex.server.web.component.commitlist.CommitListPanel;import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.revisionpicker.AffinalRevisionPicker;import com.gitplex.server.web.component.tabbable.AjaxActionTab;import com.gitplex.server.web.component.tabbable.Tab;@@ -327,12 +327,12 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {add(new WebMarkupContainer("mergeBaseTooltip").add(new TooltipBehavior(Model.of(tooltip))));PageParameters params = CommitDetailPage.paramsOf(state.leftSide.getDepot(), state.leftSide.getCommit().name());- Link<Void> leftCommitLink = new BookmarkablePageLink<Void>("leftCommitLink", CommitDetailPage.class, params);+ Link<Void> leftCommitLink = new ViewStateAwarePageLink<Void>("leftCommitLink", CommitDetailPage.class, params);leftCommitLink.add(new Label("message", state.leftSide.getCommit().getShortMessage()));add(leftCommitLink);params = CommitDetailPage.paramsOf(state.rightSide.getDepot(), state.rightSide.getCommit().name());- Link<Void> rightCommitLink = new BookmarkablePageLink<Void>("rightCommitLink", CommitDetailPage.class, params);+ Link<Void> rightCommitLink = new ViewStateAwarePageLink<Void>("rightCommitLink", CommitDetailPage.class, params);rightCommitLink.add(new Label("message", state.rightSide.getCommit().getShortMessage()));add(rightCommitLink);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.javadeleted file mode 100644index cd7aab1155..0000000000--- a/web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java+++ /dev/null@@ -1,1096 +0,0 @@-package com.gitplex.server.web.page.depot.file;--import java.io.IOException;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.concurrent.atomic.AtomicReference;--import javax.annotation.Nullable;--import org.apache.commons.lang3.SerializationUtils;-import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.apache.wicket.Component;-import org.apache.wicket.MetaDataKey;-import org.apache.wicket.RestartResponseException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.behavior.AttributeAppender;-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.html.WebMarkupContainer;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.PackageResourceReference;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevTree;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.treewalk.TreeWalk;--import com.gitplex.jsymbol.TokenPosition;-import com.gitplex.jsymbol.util.NoAntiCacheImage;-import com.gitplex.launcher.loader.ListenerRegistry;-import com.gitplex.server.GitPlex;-import com.gitplex.server.event.RefUpdated;-import com.gitplex.server.git.Blob;-import com.gitplex.server.git.BlobIdent;-import com.gitplex.server.git.GitUtils;-import com.gitplex.server.git.exception.ObjectNotFoundException;-import com.gitplex.server.manager.CodeCommentManager;-import com.gitplex.server.manager.DepotManager;-import com.gitplex.server.manager.PullRequestManager;-import com.gitplex.server.model.CodeComment;-import com.gitplex.server.model.Depot;-import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.PullRequestUpdate;-import com.gitplex.server.model.support.CommentPos;-import com.gitplex.server.model.support.TextRange;-import com.gitplex.server.persistence.UnitOfWork;-import com.gitplex.server.search.IndexManager;-import com.gitplex.server.search.SearchManager;-import com.gitplex.server.search.hit.QueryHit;-import com.gitplex.server.search.query.BlobQuery;-import com.gitplex.server.search.query.TextQuery;-import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.util.diff.DiffUtils;-import com.gitplex.server.web.WebSession;-import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;-import com.gitplex.server.web.component.depotfile.blobsearch.advanced.AdvancedSearchPanel;-import com.gitplex.server.web.component.depotfile.blobsearch.instant.InstantSearchPanel;-import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;-import com.gitplex.server.web.component.depotfile.blobview.BlobNameChangeCallback;-import com.gitplex.server.web.component.depotfile.blobview.BlobRenderer;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.server.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.server.web.component.depotfile.blobview.source.SourceViewPanel;-import com.gitplex.server.web.component.depotfile.editsave.CancelListener;-import com.gitplex.server.web.component.depotfile.editsave.EditSavePanel;-import com.gitplex.server.web.component.depotfile.fileedit.FileEditPanel;-import com.gitplex.server.web.component.depotfile.filelist.FileListPanel;-import com.gitplex.server.web.component.depotfile.filenavigator.FileNavigator;-import com.gitplex.server.web.component.modal.ModalLink;-import com.gitplex.server.web.component.revisionpicker.RevisionPicker;-import com.gitplex.server.web.page.depot.DepotPage;-import com.gitplex.server.web.page.depot.NoBranchesPage;-import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;-import com.gitplex.server.web.websocket.CodeCommentChangedRegion;-import com.gitplex.server.web.websocket.CommitIndexedRegion;-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;--@SuppressWarnings("serial")-public class DepotFilePage extends DepotPage implements BlobViewContext {-- private static class SearchResultKey extends MetaDataKey<ArrayList<QueryHit>> {- };-- public static final SearchResultKey SEARCH_RESULT_KEY = new SearchResultKey();-- private static class ViewStateKey extends MetaDataKey<String> {- };-- public static final ViewStateKey VIEW_STATE_KEY = new ViewStateKey();-- private static final String PARAM_REVISION = "revision";-- private static final String PARAM_PATH = "path";-- private static final String PARAM_REQUEST_COMPARE_INFO = "request_compare_info";-- private static final String PARAM_COMMENT = "comment";-- private static final String PARAM_MODE = "mode";-- private static final String PARAM_QUERY = "query";-- private static final String PARAM_VIEW_STATE = "view_state";-- private static final String PARAM_MARK = "mark";-- private static final String PARAM_ANCHOR = "anchor";-- private static final String REVISION_PICKER_ID = "revisionPicker";-- private static final String FILE_NAVIGATOR_ID = "fileNavigator";-- private static final String FILE_VIEWER_ID = "fileViewer";-- private static final String SEARCH_RESULD_ID = "searchResult";-- private BlobIdent blobIdent = new BlobIdent();-- private ObjectId resolvedRevision;-- private TextRange mark;-- private String anchor;-- private Mode mode;-- private RequestCompareInfo requestCompareInfo;-- private Long commentId;-- private Component revisionIndexing;-- private WebMarkupContainer searchResultContainer;-- private AtomicReference<String> newPathRef;-- private ObjectId commitId;-- private transient List<QueryHit> queryHits;-- public DepotFilePage(final PageParameters params) {- super(params);-- if (getDepot().getDefaultBranch() == null)- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));-- List<String> revisionAndPathSegments = new ArrayList<>();- String segment = params.get(PARAM_REVISION).toString();- if (segment != null && segment.length() != 0)- revisionAndPathSegments.add(segment);- segment = params.get(PARAM_PATH).toString();- if (segment != null && segment.length() != 0)- revisionAndPathSegments.add(segment);-- for (int i=0; i<params.getIndexedCount(); i++) {- segment = params.get(i).toString();- if (segment.length() != 0)- revisionAndPathSegments.add(segment);- }-- blobIdent = new BlobIdent(getDepot(), revisionAndPathSegments);-- if (blobIdent.revision == null)- blobIdent.revision = getDepot().getDefaultBranch();-- resolvedRevision = getDepot().getObjectId(blobIdent.revision);-- RevCommit commit = getDepot().getRevCommit(blobIdent.revision);- commitId = commit.copy();-- if (blobIdent.path != null) {- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = commit.getTree();- TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), blobIdent.path, revTree);- if (treeWalk == null) {- throw new ObjectNotFoundException("Unable to find blob path '" + blobIdent.path- + "' in revision '" + blobIdent.revision + "'");- }- blobIdent.mode = treeWalk.getRawMode(0);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- blobIdent.mode = FileMode.TREE.getBits();- }-- String modeStr = params.get(PARAM_MODE).toString();- if (modeStr != null)- mode = Mode.valueOf(modeStr.toUpperCase());- mark = TextRange.of(params.get(PARAM_MARK).toString());- anchor = params.get(PARAM_ANCHOR).toString();-- commentId = params.get(PARAM_COMMENT).toOptionalLong();-- requestCompareInfo = RequestCompareInfo.fromString(params.get(PARAM_REQUEST_COMPARE_INFO).toString());-- queryHits = WebSession.get().getMetaData(SEARCH_RESULT_KEY);- if (queryHits != null) {- WebSession.get().setMetaData(SEARCH_RESULT_KEY, null);- } else {- String symbol = params.get(PARAM_QUERY).toString();- if (symbol != null) {- BlobQuery query = new TextQuery.Builder()- .term(symbol)- .wholeWord(true)- .caseSensitive(true)- .count(SearchResultPanel.MAX_QUERY_ENTRIES)- .build();- try {- SearchManager searchManager = GitPlex.getInstance(SearchManager.class);- queryHits = searchManager.search(depotModel.getObject(), commitId, query);- } catch (InterruptedException e) {- throw new RuntimeException(e);- }- }- }-- if (mode == Mode.EDIT || mode == Mode.DELETE) {- if (!isOnBranch())- throw new RuntimeException("Files can only be edited on branch");-- String path = blobIdent.path;- if (path != null && blobIdent.isTree())- path += "/";- if (!SecurityUtils.canModify(getDepot(), blobIdent.revision, path))- unauthorized();- }-- String viewStateStr = params.get(PARAM_VIEW_STATE).toString();- if (viewStateStr == null) {- CodeComment comment = getOpenComment();- if (comment != null) {- int cursorLine;- CommentPos commentPos = comment.getCommentPos();- try {- if (commentPos.getCommit().equals(resolvedRevision.name())) {- cursorLine = commentPos.getRange().getBeginLine();- } else {- BlobIdent commentBlobIdent = new BlobIdent(- commentPos.getCommit(), commentPos.getPath(), FileMode.TYPE_FILE);- Blob blob = getDepot().getBlob(commentBlobIdent);- List<String> oldLines = new ArrayList<>();- for (String line: blob.getText().getLines()) {- oldLines.add(comment.getCompareContext().getWhitespaceOption().process(line));- }- List<String> newLines = new ArrayList<>();- for (String line: getDepot().getBlob(blobIdent).getText().getLines()) {- newLines.add(comment.getCompareContext().getWhitespaceOption().process(line));- }- cursorLine = DiffUtils.getNewLineAround(oldLines, newLines, commentPos.getRange().getBeginLine());- }- viewStateStr = String.format("{\"cursor\":{\"line\":%d, \"ch\":0}}", cursorLine);- } catch (ObjectNotFoundException e) {- }- }- }- RequestCycle.get().setMetaData(VIEW_STATE_KEY, viewStateStr);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new InstantSearchPanel("instantSearch", depotModel, new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return blobIdent.revision;- }-- }) {-- @Override- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {- BlobIdent selected = new BlobIdent(blobIdent.revision, hit.getBlobPath(),- FileMode.REGULAR_FILE.getBits());- DepotFilePage.this.onSelect(target, selected, hit.getTokenPos());- }-- @Override- protected void onMoreQueried(AjaxRequestTarget target, List<QueryHit> hits) {- newSearchResult(target, hits);- resizeWindow(target);- }-- });-- add(new ModalLink("advancedSearch") {-- @Override- protected Component newContent(String id) {- return new AdvancedSearchPanel(id, depotModel, new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return blobIdent.revision;- }-- }) {-- @Override- protected void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {- newSearchResult(target, hits);- resizeWindow(target);- close(target);- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- close(target);- }-- @Override- protected BlobIdent getCurrentBlob() {- return blobIdent;- }-- };- }-- });-- add(new Link<Void>("history") {-- @Override- public void onClick() {- DepotCommitsPage.State state = new DepotCommitsPage.State();- state.setCompareWith(resolvedRevision.name());- if (blobIdent.path != null)- state.setQuery(String.format("path(%s)", blobIdent.path));- setResponsePage(DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot(), state));- }-- });-- add(new ArchiveMenuLink("download", depotModel) {-- @Override- protected String getRevision() {- return blobIdent.revision;- }-- });-- newRevisionPicker(null);-- newFileNavigator(null);-- add(revisionIndexing = new WebMarkupContainer("revisionIndexing") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new NoAntiCacheImage("icon", new PackageResourceReference(DepotFilePage.class, "indexing.gif")));- setOutputMarkupPlaceholderTag(true);- }-- @Override- protected void onConfigure() {- super.onConfigure();-- IndexManager indexManager = GitPlex.getInstance(IndexManager.class);- if (!indexManager.isIndexed(getDepot(), commitId)) {- GitPlex.getInstance(IndexManager.class).indexAsync(getDepot(), commitId);- setVisible(true);- } else {- setVisible(false);- }- }-- });-- newFileViewer(null);-- add(searchResultContainer = new WebMarkupContainer("searchResultContainer"));-- newSearchResult(null, queryHits);-- add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- handler.add(revisionIndexing);- resizeWindow(handler);- }-- });- }-- /*- * In case we are on a branch, this operation makes sure that the branch resolves- * to a certain commit during the life cycle of our page, unless the page is- * refreshed. This can avoid the issue that displayed file content and subsequent- * operations encounters different commit if someone commits to the branch while- * we are staying on the page.- */- @Override- protected Map<String, ObjectId> getObjectIdCache() {- Map<String, ObjectId> objectIdCache = new HashMap<>();- if (resolvedRevision != null)- objectIdCache.put(blobIdent.revision, resolvedRevision);- return objectIdCache;- }-- @Override- public CodeComment getOpenComment() {- if (commentId != null)- return GitPlex.getInstance(CodeCommentManager.class).load(commentId);- else- return null;- }-- private void newFileNavigator(@Nullable AjaxRequestTarget target) {- final BlobNameChangeCallback callback;-- if (mode == Mode.EDIT) {- callback = new BlobNameChangeCallback() {-- @Override- public void onChange(AjaxRequestTarget target, String blobName) {- String newPath;- if (blobIdent.isTree()) {- if (blobIdent.path != null)- newPath = blobIdent.path + "/" + blobName;- else- newPath = blobName;- } else {- if (blobIdent.path.contains("/"))- newPath = StringUtils.substringBeforeLast(blobIdent.path, "/") + "/" + blobName;- else- newPath = blobName;- }- newPathRef.set(GitUtils.normalizePath(newPath));- ((FileEditPanel) get(FILE_VIEWER_ID)).onNewPathChange(target, newPathRef.get());- }-- };- } else {- callback = null;- }-- Component fileNavigator = new FileNavigator(FILE_NAVIGATOR_ID, this, callback) {-- @Override- protected void onNewFile(AjaxRequestTarget target) {- mode = Mode.EDIT;-- newFileNavigator(target);- newFileViewer(target);-- pushState(target);- resizeWindow(target);- }-- };- if (target != null) {- replace(fileNavigator);- target.add(fileNavigator);- } else {- add(fileNavigator);- }- }-- private BlobViewPanel renderBlobViewer(String panelId) {- for (BlobRenderer renderer: GitPlex.getExtensions(BlobRenderer.class)) {- BlobViewPanel panel = renderer.render(panelId, this);- if (panel != null)- return panel;- }-- throw new IllegalStateException("No applicable blob renderer found.");- }-- private void newFileViewer(@Nullable AjaxRequestTarget target) {- Component fileViewer;- if (mode == Mode.EDIT) {- final String refName = GitUtils.branch2ref(blobIdent.revision);- newPathRef = new AtomicReference<>(blobIdent.isTree()?null:blobIdent.path);- fileViewer = new FileEditPanel(- FILE_VIEWER_ID, depotModel, refName,- blobIdent.isTree()?null:blobIdent.path,- blobIdent.isTree()?"":getDepot().getBlob(blobIdent).getText().getContent(),- getDepot().getObjectId(blobIdent.revision), mark) {-- @Override- protected void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- Depot depot = getDepot();- String branch = blobIdent.revision;- depot.cacheObjectId(branch, newCommit);- resolvedRevision = newCommit;- BlobIdent committed = new BlobIdent(- branch, newPathRef.get(), FileMode.REGULAR_FILE.getBits());-- Subject subject = SecurityUtils.getSubject();-- Long depotId = depot.getId();- ObjectId oldCommitId = oldCommit.copy();- ObjectId newCommitId = newCommit.copy();- GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);- depot.cacheObjectId(branch, oldCommitId);- RefUpdated event = new RefUpdated(depot, refName, oldCommitId, newCommitId);- GitPlex.getInstance(ListenerRegistry.class).post(event);- } finally {- ThreadContext.unbindSubject();- }- }-- });-- if (requestCompareInfo != null) {- showRequestChanges(target, oldCommitId, newCommitId);- } else {- State state = getState();- state.blobIdent = committed;- state.mode = null;- applyState(target, state);- pushState(target);- resizeWindow(target);- }- // fix the issue that sometimes indexing indicator of new commit does not disappear- target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- if (requestCompareInfo != null) {- PullRequest request = GitPlex.getInstance(PullRequestManager.class).load(requestCompareInfo.requestId);- if (requestCompareInfo.compareState != null) {- PageParameters params = RequestChangesPage.paramsOf(request, requestCompareInfo.compareState);- setResponsePage(RequestChangesPage.class, params);- } else {- PageParameters params = IntegrationPreviewPage.paramsOf(request, requestCompareInfo.previewState);- setResponsePage(IntegrationPreviewPage.class, params);- }- } else {- mode = null;- newFileNavigator(target);- newFileViewer(target);- pushState(target);- resizeWindow(target);- }- }-- };- } else if (mode == Mode.DELETE) {- final String refName = GitUtils.branch2ref(blobIdent.revision);-- CancelListener cancelListener = new CancelListener() {-- @Override- public void onCancel(AjaxRequestTarget target) {- if (requestCompareInfo != null) {- PullRequest request = GitPlex.getInstance(PullRequestManager.class).load(requestCompareInfo.requestId);- if (requestCompareInfo.compareState != null) {- PageParameters params = RequestChangesPage.paramsOf(request, requestCompareInfo.compareState);- setResponsePage(RequestChangesPage.class, params);- } else {- PageParameters params = IntegrationPreviewPage.paramsOf(request, requestCompareInfo.previewState);- setResponsePage(IntegrationPreviewPage.class, params);- }- } else {- mode = null;- newFileViewer(target);-- pushState(target);- resizeWindow(target);- }- }-- };-- fileViewer = new EditSavePanel(FILE_VIEWER_ID, depotModel, refName, blobIdent.path,- null, getDepot().getObjectId(blobIdent.revision), cancelListener) {-- @Override- protected void onCommitted(AjaxRequestTarget target, ObjectId oldCommit, ObjectId newCommit) {- Depot depot = getDepot();- String branch = blobIdent.revision;- depot.cacheObjectId(branch, newCommit);- resolvedRevision = newCommit;- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = getDepot().getRevCommit(newCommit).getTree();- String parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/");- while (TreeWalk.forPath(getDepot().getRepository(), parentPath, revTree) == null) {- if (parentPath.contains("/")) {- parentPath = StringUtils.substringBeforeLast(parentPath, "/");- } else {- parentPath = null;- break;- }- }-- Long depotId = depot.getId();- Subject subject = SecurityUtils.getSubject();- ObjectId oldCommitId = oldCommit.copy();- ObjectId newCommitId = newCommit.copy();- GitPlex.getInstance(UnitOfWork.class).doAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Depot depot = GitPlex.getInstance(DepotManager.class).load(depotId);- depot.cacheObjectId(branch, newCommitId);- RefUpdated event = new RefUpdated(depot, refName, oldCommitId, newCommitId);- GitPlex.getInstance(ListenerRegistry.class).post(event);- } finally {- ThreadContext.unbindSubject();- }- }-- });-- if (requestCompareInfo != null) {- showRequestChanges(target, oldCommitId, newCommitId);- } else {- BlobIdent parentBlobIdent = new BlobIdent(branch, parentPath, FileMode.TREE.getBits());- State state = getState();- state.blobIdent = parentBlobIdent;- state.mode = null;- applyState(target, state);- pushState(target);- resizeWindow(target);- }- // fix the issue that sometimes indexing indicator of new commit does not disappear- target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- };- } else if (blobIdent.path == null || blobIdent.isTree()) {- fileViewer = new FileListPanel(FILE_VIEWER_ID, depotModel, blobIdent) {-- @Override- protected void onSelect(AjaxRequestTarget target, BlobIdent blobIdent) {- DepotFilePage.this.onSelect(target, blobIdent, null);- }-- };- } else {- fileViewer = renderBlobViewer(FILE_VIEWER_ID);- }- if (target != null) {- replace(fileViewer);- target.add(fileViewer);- } else {- add(fileViewer);- }- }-- private void showRequestChanges(AjaxRequestTarget target, ObjectId oldCommitId, ObjectId newCommitId) {- if (requestCompareInfo.compareState != null) {- RequestChangesPage.State state = SerializationUtils.clone(requestCompareInfo.compareState);- state.newCommit = newCommitId.name();- state.pathFilter = null;- if (state.commentId != null) {- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);- state.oldCommit = comment.getCommentPos().getCommit();- } else {- state.oldCommit = oldCommitId.name();- }- get(FILE_VIEWER_ID).add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- PullRequest request = GitPlex.getInstance(PullRequestManager.class).load(requestCompareInfo.requestId);- for (PullRequestUpdate update: request.getUpdates()) {- if (update.getHeadCommitHash().equals(newCommitId.name())) {- setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, state));- break;- }- }- }-- });- } else {- get(FILE_VIEWER_ID).add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- PullRequest request = GitPlex.getInstance(PullRequestManager.class).load(requestCompareInfo.requestId);- for (PullRequestUpdate update: request.getUpdates()) {- if (update.getHeadCommitHash().equals(newCommitId.name())) {- setResponsePage(RequestChangesPage.class, IntegrationPreviewPage.paramsOf(request));- break;- }- }- }-- });- }- }-- private void pushState(AjaxRequestTarget target) {- PageParameters params = paramsOf(getDepot(), getState());- CharSequence url = RequestCycle.get().urlFor(DepotFilePage.class, params);- pushState(target, url.toString(), getState());- }-- private State getState() {- State state = new State();- state.blobIdent = new BlobIdent(blobIdent);- state.mark = mark;- state.mode = mode;- state.anchor = anchor;- state.commentId = commentId;- state.requestCompareInfo = requestCompareInfo;- return state;- }-- private void setState(State state) {- if (!blobIdent.revision.equals(state.blobIdent.revision)) {- blobIdent = new BlobIdent(state.blobIdent);- /*- * a hack to reset resolved revision to null to disable getObjectIdCache()- * temporarily as otherwise getObjectId() method below will always- * resolved to existing value of resolvedRevision- */- resolvedRevision = null;- resolvedRevision = getDepot().getObjectId(blobIdent.revision);- } else {- blobIdent = new BlobIdent(state.blobIdent);- }- mark = state.mark;- anchor = state.anchor;- mode = state.mode;- commentId = state.commentId;- requestCompareInfo = state.requestCompareInfo;- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);- }-- private void onSelect(AjaxRequestTarget target, String revision) {- State state = getState();- state.blobIdent.revision = revision;- state.requestCompareInfo = null;- state.commentId = null;- state.mode = null;- state.mark = null;-- if (state.blobIdent.path != null) {- try (RevWalk revWalk = new RevWalk(getDepot().getRepository())) {- RevTree revTree = getDepot().getRevCommit(revision, true).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getDepot().getRepository(), blobIdent.path, revTree);- if (treeWalk != null) {- state.blobIdent.mode = treeWalk.getRawMode(0);- } else {- state.blobIdent.path = null;- state.blobIdent.mode = FileMode.TREE.getBits();- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- applyState(target, state);- pushState(target);- resizeWindow(target);- }-- private void newRevisionPicker(@Nullable AjaxRequestTarget target) {- Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, depotModel, blobIdent.revision, true) {-- @Override- protected String getRevisionUrl(String revision) {- State state = new State();- state.blobIdent.revision = revision;- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);- return urlFor(DepotFilePage.class, params).toString();- }-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- DepotFilePage.this.onSelect(target, revision);- }-- };- if (target != null) {- replace(revisionPicker);- target.add(revisionPicker);- } else {- add(revisionPicker);- }- }-- private void applyState(AjaxRequestTarget target, State state) {- if (!state.blobIdent.revision.equals(blobIdent.revision))- newSearchResult(target, null);-- setState(state);- commitId = getDepot().getRevCommit(blobIdent.revision).copy();- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);-- newRevisionPicker(target);-- newFileNavigator(target);-- target.add(revisionIndexing);-- newFileViewer(target);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotFileResourceReference()));- }-- public static PageParameters paramsOf(Depot depot, CodeComment comment, @Nullable String anchor) {- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent.revision = comment.getCommentPos().getCommit();- state.blobIdent.path = comment.getCommentPos().getPath();- state.blobIdent.mode = FileMode.TYPE_FILE;- state.commentId = comment.getId();- state.mark = comment.getCommentPos().getRange();- state.anchor = anchor;- return paramsOf(depot, state);- }-- public static PageParameters paramsOf(Depot depot, State state) {- PageParameters params = paramsOf(depot);- if (state.blobIdent.revision != null)- params.set(PARAM_REVISION, state.blobIdent.revision);- if (state.blobIdent.path != null)- params.set(PARAM_PATH, state.blobIdent.path);- if (state.mark != null)- params.set(PARAM_MARK, state.mark.toString());- if (state.anchor != null)- params.set(PARAM_ANCHOR, state.anchor);- if (state.requestCompareInfo != null)- params.set(PARAM_REQUEST_COMPARE_INFO, state.requestCompareInfo.toString());- if (state.commentId != null)- params.set(PARAM_COMMENT, state.commentId);- if (state.mode != null)- params.set(PARAM_MODE, state.mode.name().toLowerCase());- if (state.query != null)- params.set(PARAM_QUERY, state.query);- if (state.viewState != null)- params.set(PARAM_VIEW_STATE, state.viewState);- return params;- }-- private void newSearchResult(@Nullable AjaxRequestTarget target, @Nullable List<QueryHit> hits) {- Component searchResult;- if (hits != null) {- searchResult = new SearchResultPanel(SEARCH_RESULD_ID, this, hits) {-- @Override- protected void onClose(AjaxRequestTarget target) {- newSearchResult(target, null);- resizeWindow(target);- }-- };- if (target != null) {- target.appendJavaScript(""- + "$('#repo-file>.search-result').show(); "- + "$('#repo-file .search-result>.body').focus();");- }- } else {- searchResult = new WebMarkupContainer(SEARCH_RESULD_ID).setOutputMarkupId(true);- if (target != null)- target.appendJavaScript("$('#repo-file>.search-result').hide();");- else- searchResultContainer.add(AttributeAppender.replace("style", "display: none;"));- }- if (target != null) {- searchResultContainer.replace(searchResult);- target.add(searchResult);- } else {- searchResultContainer.add(searchResult);- }- }-- @Override- protected void onPopState(AjaxRequestTarget target, Serializable data) {- super.onPopState(target, data);-- applyState(target, (State) data);- resizeWindow(target);- }-- private void resizeWindow(IPartialPageRequestHandler partialPageRequestHandler) {- partialPageRequestHandler.appendJavaScript("$(window).resize();");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotFilePage.class, paramsOf(depot));- }-- @Override- public BlobIdent getBlobIdent() {- return blobIdent;- }-- @Override- public TextRange getMark() {- return mark;- }-- @Override- public String getAnchor() {- return anchor;- }-- @Override- public void onMark(AjaxRequestTarget target, TextRange mark) {- this.mark = mark;- pushState(target);- }-- @Override- public String getMarkUrl(TextRange mark) {- State state = getState();- state.blobIdent.revision = resolvedRevision.name();- state.requestCompareInfo = null;- state.commentId = null;- state.mark = mark;- PageParameters params = paramsOf(getDepot(), state);- return RequestCycle.get().urlFor(DepotFilePage.class, params).toString();- }-- @Override- public Mode getMode() {- return mode;- }-- @Override- public void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable TokenPosition tokenPos) {- mark = TextRange.of(tokenPos);- if (Objects.equal(DepotFilePage.this.blobIdent.path, blobIdent.path)) {- if (mark != null) {- Component fileViewer = get(FILE_VIEWER_ID);- if (fileViewer instanceof SourceViewPanel) {- SourceViewPanel sourceViewer = (SourceViewPanel) fileViewer;- sourceViewer.mark(target, mark, true);- } else if (fileViewer instanceof FileEditPanel) {- FileEditPanel fileEditor = (FileEditPanel) fileViewer;- fileEditor.mark(target, mark);- } else {- newFileViewer(target);- resizeWindow(target);- }- }- } else {- DepotFilePage.this.blobIdent.path = blobIdent.path;- DepotFilePage.this.blobIdent.mode = blobIdent.mode;-- mode = null;- commentId = null;- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);-- newFileNavigator(target);- newFileViewer(target);-- resizeWindow(target);- }- pushState(target);- }-- @Override- public void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits) {- newSearchResult(target, hits);- resizeWindow(target);- }-- @Override- public void onBlameChange(AjaxRequestTarget target, boolean blame) {- mode = (blame?Mode.BLAME:null);- Component fileViewer = get(FILE_VIEWER_ID);- if (!(fileViewer instanceof SourceViewPanel)) {- newFileViewer(target);- resizeWindow(target);- }- pushState(target);- }-- @Override- public void onDelete(AjaxRequestTarget target) {- mode = Mode.DELETE;-- newFileViewer(target);- pushState(target);- resizeWindow(target);- }-- @Override- public void onEdit(AjaxRequestTarget target) {- mode = Mode.EDIT;-- newFileNavigator(target);- newFileViewer(target);- pushState(target);- resizeWindow(target);- }-- @Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- commentId = comment.getId();- mark = comment.getCommentPos().getRange();- } else {- commentId = null;- mark = null;- }- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);- pushState(target);- }-- @Override- public void onAddComment(AjaxRequestTarget target, TextRange mark) {- commentId = null;- GitPlex.getInstance(WebSocketManager.class).onRegionChange(this);- this.mark = mark;- pushState(target);- }-- @Override- public boolean isOnBranch() {- return getDepot().getBranchRef(blobIdent.revision) != null;- }-- @Override- public RevCommit getCommit() {- return getDepot().getRevCommit(getBlobIdent().revision);- }-- @Override- protected boolean isFootVisible() {- return false;- }-- @Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(getDepot().getId(), commitId));- if (commentId != null)- regions.add(new CodeCommentChangedRegion(commentId));-- /*- * add below so that we can jump to request changes page after editing a file- */- if (requestCompareInfo != null)- regions.add(new PullRequestChangedRegion(requestCompareInfo.requestId));- return regions;- }-- public static class State implements Serializable {-- private static final long serialVersionUID = 1L;-- public Long commentId;-- public BlobIdent blobIdent = new BlobIdent();-- public TextRange mark;-- public String anchor;-- public Mode mode;-- public RequestCompareInfo requestCompareInfo;-- public transient String query;-- public transient String viewState;- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.javaindex c2ddc5d120..59c93bbc38 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/ForkOptionPanel.java@@ -19,7 +19,7 @@ import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoicimport com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")abstract class ForkOptionPanel extends Panel {@@ -82,7 +82,7 @@ abstract class ForkOptionPanel extends Panel {} else {depotManager.fork(getDepot(), depot);Session.get().success("Repository forked");- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.javaindex 0d423b1d7c..053597b145 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/moreinfo/MoreInfoPanel.java@@ -10,7 +10,6 @@ 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.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;@@ -24,13 +23,14 @@ import com.gitplex.server.manager.UrlManager;import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.depotselector.DepotSelector;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.component.modal.ModalLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.page.depot.tags.DepotTagsPage;@SuppressWarnings("serial")@@ -48,8 +48,8 @@ public abstract class MoreInfoPanel extends Panel {super.onInitialize();if (getDepot().getForkedFrom() != null) {- Link<Void> link = new BookmarkablePageLink<Void>("forkedFromLink",- DepotFilePage.class, DepotFilePage.paramsOf(getDepot().getForkedFrom()));+ Link<Void> link = new ViewStateAwarePageLink<Void>("forkedFromLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot().getForkedFrom()));link.add(new Label("name", getDepot().getForkedFrom().getFQN()));add(link);} else {@@ -66,12 +66,12 @@ public abstract class MoreInfoPanel extends Panel {add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));if (getDepot().getDescription() != null) {- add(new MarkdownPanel("description", Model.of(getDepot().getDescription()), null));+ add(new MarkdownViewer("description", Model.of(getDepot().getDescription()), null));} else {add(new WebMarkupContainer("description").setVisible(false));}- add(new BookmarkablePageLink<Void>("commitsLink",+ add(new ViewStateAwarePageLink<Void>("commitsLink",DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot())) {@Override@@ -89,7 +89,7 @@ public abstract class MoreInfoPanel extends Panel {});- add(new BookmarkablePageLink<Void>("branchesLink",+ add(new ViewStateAwarePageLink<Void>("branchesLink",DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot())) {@Override@@ -100,7 +100,7 @@ public abstract class MoreInfoPanel extends Panel {});- add(new BookmarkablePageLink<Void>("tagsLink",+ add(new ViewStateAwarePageLink<Void>("tagsLink",DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot())) {@Override@@ -149,7 +149,7 @@ public abstract class MoreInfoPanel extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}};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 17cb805a8b..e4b0e4a6f8 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@@ -20,7 +20,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Button;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -43,10 +42,10 @@ import com.gitplex.server.model.Account;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.PullRequestReviewInvitation;-import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.PullRequest.IntegrationStrategy;import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.PullRequestReviewInvitation;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.support.CloseInfo;import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.model.support.DepotAndBranch;@@ -54,13 +53,14 @@ import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.ObjectPermission;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.BranchLink;import com.gitplex.server.web.component.branchpicker.AffinalBranchPicker;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;import com.gitplex.server.web.component.commitlist.CommitListPanel;import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.link.BranchLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.pullrequest.requestassignee.AssigneeChoice;import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerAvatar;import com.gitplex.server.web.component.pullrequest.requestreviewer.ReviewerChoice;@@ -247,7 +247,7 @@ public class NewRequestPage extends DepotPage implements CommentSupport {});PageParameters params = CommitDetailPage.paramsOf(target.getDepot(), target.getObjectName());- Link<Void> targetCommitLink = new BookmarkablePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);+ Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));add(targetCommitLink);@@ -262,7 +262,7 @@ public class NewRequestPage extends DepotPage implements CommentSupport {});params = CommitDetailPage.paramsOf(source.getDepot(), source.getObjectName());- Link<Void> sourceCommitLink = new BookmarkablePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);+ Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));add(sourceCommitLink);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.javaindex a8a670a390..66a8331598 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java@@ -2,7 +2,6 @@ package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import java.util.Collection;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -13,6 +12,7 @@ import com.gitplex.server.model.Account;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")@@ -30,7 +30,7 @@ public class ApprovalHintPanel extends GenericPanel<PullRequest> {PageParameters params = RequestCodeCommentsPage.paramsOf(request);getFilter().fillPageParams(params);- add(new BookmarkablePageLink<Void>("link", RequestCodeCommentsPage.class, params));+ add(new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, params));}private CodeCommentFilter getFilter() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.javaindex 4407a37be8..131bcb69f0 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java@@ -2,7 +2,6 @@ package com.gitplex.server.web.page.depot.pullrequest.requestdetail;import java.util.Collection;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -10,6 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentFilter;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;@SuppressWarnings("serial")@@ -27,7 +27,7 @@ public class IntegrationHintPanel extends GenericPanel<PullRequest> {PageParameters params = RequestCodeCommentsPage.paramsOf(request);getFilter().fillPageParams(params);- add(new BookmarkablePageLink<Void>("link", RequestCodeCommentsPage.class, params));+ add(new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, params));}private CodeCommentFilter getFilter() {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 fbae92cb49..393199ebbc 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@@ -40,7 +40,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponent;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -55,24 +54,24 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;-import com.google.common.base.Preconditions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.VisitInfoManager;import com.gitplex.server.model.Depot;import com.gitplex.server.model.PullRequest;-import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.PullRequest.Status;+import com.gitplex.server.model.PullRequestUpdate;import com.gitplex.server.model.support.DepotAndBranch;import com.gitplex.server.model.support.IntegrationPreview;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.AccountLink;-import com.gitplex.server.web.component.BranchLink;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.BranchLink;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;import com.gitplex.server.web.component.tabbable.PageTab;import com.gitplex.server.web.component.tabbable.PageTabLink;@@ -91,6 +90,7 @@ import com.gitplex.server.web.websocket.PullRequestChanged;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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -936,7 +936,7 @@ public abstract class RequestDetailPage extends DepotPage {public Component render(String componentId) {if (getMainPageClass() == RequestCodeCommentsPage.class) {Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", RequestDetailPage.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", RequestCodeCommentsPage.class, paramsOf(getPullRequest())) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, paramsOf(getPullRequest())) {@Overridepublic void onEvent(IEvent<?> event) {@@ -967,7 +967,7 @@ public abstract class RequestDetailPage extends DepotPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest()));+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest()));}};diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.javaindex 21b9d24faf..cf7b733972 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java@@ -1,15 +1,15 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;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;@SuppressWarnings("serial")-public class UpdateChangesLink extends BookmarkablePageLink<Void> {+public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {public UpdateChangesLink(String id, PullRequestUpdate update) {super(id, RequestChangesPage.class, paramsOf(update));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 aecf6a1159..01cc4975b4 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@@ -44,9 +44,9 @@ import com.gitplex.server.model.support.CodeCommentActivity;import com.gitplex.server.model.support.CommentPos;import com.gitplex.server.util.diff.WhitespaceOption;import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.diff.revision.CommentSupport;import com.gitplex.server.web.component.diff.revision.RevisionDiffPanel;+import com.gitplex.server.web.component.link.DropdownLink;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.CodeCommentChangedRegion;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 5e7fd80077..fc7811f292 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@@ -4,18 +4,18 @@ import java.util.Date;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.IEvent;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;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;@SuppressWarnings("serial")-public class SinceChangesLink extends BookmarkablePageLink<Void> {+public class SinceChangesLink extends ViewStateAwarePageLink<Void> {private final IModel<PullRequest> requestModel;diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.javaindex 8b37ebb79c..24a73b06e5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java@@ -23,11 +23,11 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestComment;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.markdown.MarkdownEditSupport;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -85,7 +85,7 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {} else {editSupport = null;}- viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {+ viewer.add(new MarkdownViewer("content", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.javaindex d3634ba600..26880cde2e 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java@@ -23,11 +23,11 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.markdown.MarkdownEditSupport;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -64,7 +64,7 @@ class OpenedPanel extends GenericPanel<PullRequest> {} else {editSupport = null;}- viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {+ viewer.add(new MarkdownViewer("content", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.javaindex 0329cfb7f9..e7b7b98275 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java@@ -1,15 +1,15 @@package com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.activity;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestReference;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;@@ -30,7 +30,7 @@ class ReferencedPanel extends GenericPanel<PullRequestReference> {add(new AccountLink("name", reference.getUser()));add(new Label("age", DateUtils.formatAge(reference.getDate())));- BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("link",+ ViewStateAwarePageLink<Void> link = new ViewStateAwarePageLink<Void>("link",RequestOverviewPage.class, RequestOverviewPage.paramsOf(reference.getReferencedBy()));link.add(new Label("number", "#" + reference.getReferencedBy().getNumber()));link.add(new Label("title", reference.getReferencedBy().getTitle()));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.javaindex 6e14edf94e..d6f4c0af94 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java@@ -25,12 +25,12 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.PullRequestStatusChange;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.behavior.markdown.AttachmentSupport;-import com.gitplex.server.web.component.AccountLink;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.comment.CommentInput;import com.gitplex.server.web.component.comment.DepotAttachmentSupport;+import com.gitplex.server.web.component.link.AccountLink;import com.gitplex.server.web.component.markdown.MarkdownEditSupport;-import com.gitplex.server.web.component.markdown.MarkdownPanel;+import com.gitplex.server.web.component.markdown.MarkdownViewer;import com.gitplex.server.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -68,7 +68,7 @@ class StatusChangePanel extends GenericPanel<PullRequestStatusChange> {} else {editSupport = null;}- viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {+ viewer.add(new MarkdownViewer("content", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.javaindex f6f05c1f51..96fe66c05a 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java@@ -6,7 +6,6 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -30,9 +29,10 @@ import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.commitmessage.ExpandableCommitMessagePanel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.pullrequest.verificationstatus.VerificationStatusPanel;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.websocket.PullRequestChanged;import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;@@ -117,15 +117,15 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), commitState);- Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);item.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- DepotFilePage.State browseState = new DepotFilePage.State();+ DepotBlobPage.State browseState = new DepotBlobPage.State();browseState.blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- params = DepotFilePage.paramsOf(depotModel.getObject(), browseState);- item.add(new BookmarkablePageLink<Void>("browseCode", DepotFilePage.class, params));+ params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);+ item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));if (getUpdate().getRequest().getTarget().getObjectId(false) != null) {if (getUpdate().getRequest().getMergedCommits().contains(commit)) {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.javaindex a0501ac906..67821de186 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java@@ -21,7 +21,6 @@ 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.AbstractLink;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;@@ -40,8 +39,9 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.AccountLink;-import com.gitplex.server.web.component.BranchLink;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.BranchLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.menu.MenuItem;import com.gitplex.server.web.component.menu.MenuLink;import com.gitplex.server.web.component.pullrequest.requeststatus.RequestStatusPanel;@@ -317,7 +317,7 @@ public class RequestListPage extends DepotPage {PullRequest request = rowModel.getObject();Fragment fragment = new Fragment(componentId, "requestFrag", RequestListPage.this);fragment.add(new Label("number", "#" + request.getNumber()));- fragment.add(new BookmarkablePageLink<Void>("title", RequestOverviewPage.class,+ fragment.add(new ViewStateAwarePageLink<Void>("title", RequestOverviewPage.class,RequestOverviewPage.paramsOf(request)) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.javaindex ae8d571f58..a1907360da 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/DepotSettingTabLink.java@@ -3,10 +3,11 @@ package com.gitplex.server.web.page.depot.setting;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+@SuppressWarnings("serial")public class DepotSettingTabLink extends Panel {@@ -23,7 +24,7 @@ public class DepotSettingTabLink extends Panel {super.onInitialize();DepotSettingPage page = (DepotSettingPage) getPage();- Link<Void> link = new BookmarkablePageLink<Void>("link",+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",tab.getMainPageClass(), DepotSettingPage.paramsOf(page.getDepot()));link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));link.add(new Label("label", tab.getTitleModel()));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.javaindex dea3d245f3..141fc99252 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotCollaboratorListPage.java@@ -15,7 +15,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -32,10 +31,11 @@ import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.accountchoice.AbstractAccountChoiceProvider;import com.gitplex.server.web.component.accountchoice.AccountChoiceResourceReference;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;@@ -242,12 +242,12 @@ public class DepotCollaboratorListPage extends DepotSettingPage {protected void populateItem(ListItem<UserAuthorization> item) {UserAuthorization authorization = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("avatarLink", CollaboratorDepotListPage.class,+ Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink", CollaboratorDepotListPage.class,CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));link.add(new Avatar("avatar", authorization.getUser()));item.add(link);- link = new BookmarkablePageLink<Void>("nameLink", CollaboratorDepotListPage.class,+ link = new ViewStateAwarePageLink<Void>("nameLink", CollaboratorDepotListPage.class,CollaboratorDepotListPage.paramsOf(getAccount(), authorization.getUser()));link.add(new Label("name", authorization.getUser().getDisplayName()));item.add(link);@@ -265,7 +265,7 @@ public class DepotCollaboratorListPage extends DepotSettingPage {};- greaterPrivileges.add(new BookmarkablePageLink<Void>("detail",+ greaterPrivileges.add(new ViewStateAwarePageLink<Void>("detail",CollaboratorPrivilegeSourcePage.class,CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javaindex c809526ae9..1faa54aec5 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java@@ -11,7 +11,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -27,8 +26,9 @@ import com.gitplex.server.model.UserAuthorization;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.avatar.Avatar;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.page.account.collaborators.CollaboratorDepotListPage;import com.gitplex.server.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;@@ -188,14 +188,14 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {getAccount().getOrganizationMembersMap().get(permission.getUser());if (membership != null) {PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);- Link<Void> link = new BookmarkablePageLink<Void>(+ Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",MemberEffectivePrivilegePage.class,params);link.add(new Avatar("avatar", permission.getUser()));item.add(link);- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("nameLink",MemberEffectivePrivilegePage.class,params);@@ -203,7 +203,7 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {item.add(link);params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("privilegeLink",MemberPrivilegeSourcePage.class,params);@@ -213,14 +213,14 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {PageParameters params = CollaboratorDepotListPage.paramsOf(getAccount(), permission.getUser());- Link<Void> link = new BookmarkablePageLink<Void>(+ Link<Void> link = new ViewStateAwarePageLink<Void>("avatarLink",CollaboratorDepotListPage.class,params);link.add(new Avatar("avatar", permission.getUser()));item.add(link);- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("nameLink",CollaboratorDepotListPage.class,params);@@ -228,7 +228,7 @@ public class DepotEffectivePrivilegePage extends DepotSettingPage {item.add(link);params = CollaboratorPrivilegeSourcePage.paramsOf(depotModel.getObject(), permission.getUser());- link = new BookmarkablePageLink<Void>(+ link = new ViewStateAwarePageLink<Void>("privilegeLink",CollaboratorPrivilegeSourcePage.class,params);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.javaindex 482f7ff11e..f5a982addf 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/authorization/DepotTeamListPage.java@@ -15,7 +15,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;@@ -32,8 +31,9 @@ import com.gitplex.server.model.TeamAuthorization;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.security.privilege.DepotPrivilege;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.greaterprivilege.GreaterPrivilegesPanel;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.privilegeselection.PrivilegeSelectionPanel;import com.gitplex.server.web.component.select2.Response;@@ -238,7 +238,7 @@ public class DepotTeamListPage extends DepotSettingPage {protected void populateItem(ListItem<TeamAuthorization> item) {TeamAuthorization authorization = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", TeamDepotListPage.class,+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", TeamDepotListPage.class,TeamDepotListPage.paramsOf(authorization.getTeam()));link.add(new Label("name", authorization.getTeam().getName()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.javaindex 6649342e0d..e2b50ca3a4 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/setting/gatekeeper/GateKeeperLink.java@@ -7,9 +7,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import com.gitplex.server.gatekeeper.GateKeeper;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.floating.AlignPlacement;import com.gitplex.server.web.component.floating.FloatingPanel;+import com.gitplex.server.web.component.link.DropdownLink;@SuppressWarnings("serial")abstract class GateKeeperLink extends DropdownLink {diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.javaindex 0bb838831d..1bca41bcdb 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/tags/DepotTagsPage.java@@ -18,7 +18,6 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.AbstractLink;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;@@ -40,15 +39,16 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;-import com.gitplex.server.web.component.AccountLink;-import com.gitplex.server.web.component.archivemenulink.ArchiveMenuLink;import com.gitplex.server.web.component.contributorpanel.ContributorPanel;+import com.gitplex.server.web.component.link.AccountLink;+import com.gitplex.server.web.component.link.ArchiveMenuLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.modal.ModalLink;import com.gitplex.server.web.component.revisionpicker.RevisionPicker;import com.gitplex.server.web.page.depot.DepotPage;import com.gitplex.server.web.page.depot.NoBranchesPage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.depot.commit.CommitDetailPage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;import com.gitplex.server.web.util.DateUtils;import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;@@ -248,10 +248,10 @@ public class DepotTagsPage extends DepotPage {RefInfo ref = item.getModelObject();String tagName = GitUtils.ref2tag(ref.getRef().getName());- DepotFilePage.State state = new DepotFilePage.State();+ DepotBlobPage.State state = new DepotBlobPage.State();state.blobIdent.revision = tagName;- AbstractLink link = new BookmarkablePageLink<Void>("tagLink",- DepotFilePage.class, DepotFilePage.paramsOf(getDepot(), state));+ AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",+ DepotBlobPage.class, DepotBlobPage.paramsOf(getDepot(), state));link.add(new Label("name", tagName));item.add(link);@@ -281,14 +281,14 @@ public class DepotTagsPage extends DepotPage {RevCommit commit = (RevCommit) ref.getPeeledObj();PageParameters params = CommitDetailPage.paramsOf(getDepot(), commit.name());- link = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);+ link = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);link.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(link);item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent(), true));- link = new BookmarkablePageLink<Void>("messageLink", CommitDetailPage.class, params);+ link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);link.add(new Label("message", commit.getShortMessage()));item.add(link);diff --git a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.javaindex fe27d1a31a..33550a13dc 100644--- a/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/error/ExpectedExceptionPage.java@@ -4,12 +4,12 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.util.string.Strings;import com.gitplex.server.util.WordUtils;import com.gitplex.server.web.component.MultilineLabel;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.home.DashboardPage;@SuppressWarnings("serial")@@ -39,7 +39,7 @@ public class ExpectedExceptionPage extends BaseErrorPage {container.add(new Label("title", title));container.add(new Label("description", exception.getMessage()));- container.add(new BookmarkablePageLink<Void>("dashboard", DashboardPage.class));+ container.add(new ViewStateAwarePageLink<Void>("dashboard", DashboardPage.class));container.add(new AjaxLink<Void>("showDetail") {diff --git a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.javaindex 61900b4055..533fc7b977 100644--- a/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/error/UnexpectedExceptionPage.java@@ -27,7 +27,6 @@ import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.model.Model;@@ -38,6 +37,7 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.model.Account;import com.gitplex.server.util.FileUtils;import com.gitplex.server.util.StringUtils;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.home.DashboardPage;import com.gitplex.server.web.util.DateUtils;@@ -119,8 +119,8 @@ public class UnexpectedExceptionPage extends BaseErrorPage {}});- add(new BookmarkablePageLink<Void>("dashboardTop", DashboardPage.class));- add(new BookmarkablePageLink<Void>("dashboardBottom", DashboardPage.class));+ add(new ViewStateAwarePageLink<Void>("dashboardTop", DashboardPage.class));+ add(new ViewStateAwarePageLink<Void>("dashboardBottom", DashboardPage.class));add(new WebMarkupContainer("dashboardUrl") {diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.javaindex 2c2487c7d7..0b2b261b3d 100644--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java@@ -10,7 +10,6 @@ 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.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.PageableListView;@@ -22,7 +21,8 @@ import com.gitplex.server.manager.DepotManager;import com.gitplex.server.model.Depot;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;import com.gitplex.server.web.page.layout.LayoutPage;import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;@@ -92,8 +92,8 @@ public class DashboardPage extends LayoutPage {@Overrideprotected void populateItem(ListItem<Depot> item) {Depot depot = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link",- DepotFilePage.class, DepotFilePage.paramsOf(depot));+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ DepotBlobPage.class, DepotBlobPage.paramsOf(depot));link.add(new Label("name", depot.getFQN()));item.add(link);}diff --git a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.javaindex 04a9ed4046..e78138100e 100644--- a/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/init/WelcomePage.java@@ -2,8 +2,8 @@ package com.gitplex.server.web.page.init;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.overview.NewDepotPage;import com.gitplex.server.web.page.account.overview.NewOrganizationPage;import com.gitplex.server.web.page.layout.LayoutPage;@@ -15,10 +15,10 @@ public class WelcomePage extends LayoutPage {protected void onInitialize() {super.onInitialize();- add(new BookmarkablePageLink<Void>("addOrganization", NewOrganizationPage.class,+ add(new ViewStateAwarePageLink<Void>("addOrganization", NewOrganizationPage.class,NewOrganizationPage.paramsOf(getLoginUser())));- add(new BookmarkablePageLink<Void>("addDepot", NewDepotPage.class,+ add(new ViewStateAwarePageLink<Void>("addDepot", NewDepotPage.class,NewDepotPage.paramsOf(getLoginUser())));}diff --git a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.javaindex ba37a06582..2344597f10 100644--- a/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/layout/CreateDepotPage.java@@ -15,7 +15,7 @@ import com.gitplex.server.web.component.accountchoice.AdministrativeAccountChoicimport com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.editable.BeanEditor;import com.gitplex.server.web.editable.PathSegment;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;@SuppressWarnings("serial")public class CreateDepotPage extends LayoutPage {@@ -50,7 +50,7 @@ public class CreateDepotPage extends LayoutPage {} else {depotManager.save(depot, null, null);Session.get().success("New repository created");- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}}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 b2c4baf702..8eb32e13a8 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@@ -15,7 +15,6 @@ 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.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;@@ -30,17 +29,18 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.model.Account;import com.gitplex.server.model.Depot;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.web.component.DropdownLink;import com.gitplex.server.web.component.avatar.Avatar;import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.floating.AlignPlacement;+import com.gitplex.server.web.component.link.DropdownLink;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.overview.AccountOverviewPage;import com.gitplex.server.web.page.account.overview.NewOrganizationPage;import com.gitplex.server.web.page.account.setting.ProfileEditPage;import com.gitplex.server.web.page.account.tasks.TaskListPage;import com.gitplex.server.web.page.admin.SystemSettingPage;import com.gitplex.server.web.page.base.BasePage;-import com.gitplex.server.web.page.depot.file.DepotFilePage;+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;@@ -67,7 +67,7 @@ public abstract class LayoutPage extends BasePage {WebMarkupContainer head = new WebMarkupContainer("mainHead");add(head);- head.add(new BookmarkablePageLink<Void>("home", getApplication().getHomePage()));+ head.add(new ViewStateAwarePageLink<Void>("home", getApplication().getHomePage()));head.add(newContextHead("context"));@@ -77,8 +77,8 @@ public abstract class LayoutPage extends BasePage {@Overrideprotected Component newContent(String id) {Fragment fragment = new Fragment(id, "createNewFrag", LayoutPage.this);- fragment.add(new BookmarkablePageLink<Void>("createNewDepot", CreateDepotPage.class));- fragment.add(new BookmarkablePageLink<Void>("createNewOrganization",+ fragment.add(new ViewStateAwarePageLink<Void>("createNewDepot", CreateDepotPage.class));+ fragment.add(new ViewStateAwarePageLink<Void>("createNewOrganization",NewOrganizationPage.class, NewOrganizationPage.paramsOf(getLoginUser())));return fragment;}@@ -103,10 +103,10 @@ public abstract class LayoutPage extends BasePage {}.setVisible(!signedIn));boolean enableSelfRegister = GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister();- head.add(new BookmarkablePageLink<Void>("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister));- head.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class).setVisible(signedIn));+ head.add(new ViewStateAwarePageLink<Void>("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister));+ head.add(new ViewStateAwarePageLink<Void>("logout", LogoutPage.class).setVisible(signedIn));if (user != null) {- head.add(new BookmarkablePageLink<Void>("tasks", TaskListPage.class, TaskListPage.paramsOf(user)) {+ head.add(new ViewStateAwarePageLink<Void>("tasks", TaskListPage.class, TaskListPage.paramsOf(user)) {@Overrideprotected void onInitialize() {@@ -155,7 +155,7 @@ public abstract class LayoutPage extends BasePage {if (!organizations.isEmpty()) {for (Account organization: organizations) {WebMarkupContainer item = new WebMarkupContainer(organizationsView.newChildId());- Link<Void> link = new BookmarkablePageLink<Void>("link",+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",AccountOverviewPage.class, AccountOverviewPage.paramsOf(organization));link.add(new Avatar("avatar", organization));link.add(new Label("name", organization.getDisplayName()));@@ -166,8 +166,8 @@ public abstract class LayoutPage extends BasePage {organizationsView.setVisible(false);}- fragment.add(new BookmarkablePageLink<Void>("profile", ProfileEditPage.class, ProfileEditPage.paramsOf(user)));- fragment.add(new BookmarkablePageLink<Void>("administration", SystemSettingPage.class) {+ fragment.add(new ViewStateAwarePageLink<Void>("profile", ProfileEditPage.class, ProfileEditPage.paramsOf(user)));+ fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class) {@Overrideprotected void onConfigure() {@@ -176,7 +176,7 @@ public abstract class LayoutPage extends BasePage {}});- fragment.add(new BookmarkablePageLink<Void>("logout", LogoutPage.class));+ fragment.add(new ViewStateAwarePageLink<Void>("logout", LogoutPage.class));return fragment;}@@ -242,7 +242,7 @@ public abstract class LayoutPage extends BasePage {}protected void onSelect(AjaxRequestTarget target, Depot depot) {- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));+ setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.javaindex 92d8a6d152..b23a95e7a3 100644--- a/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/security/LoginPage.java@@ -13,7 +13,6 @@ import org.apache.wicket.markup.html.form.CheckBox;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.PasswordTextField;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -25,6 +24,7 @@ import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.MailManager;import com.gitplex.server.model.Account;import com.gitplex.server.web.WebSession;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.base.BasePage;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -174,7 +174,7 @@ public class LoginPage extends BasePage {add(form);- add(new BookmarkablePageLink<Void>("forgetPassword", ForgetPage.class) {+ add(new ViewStateAwarePageLink<Void>("forgetPassword", ForgetPage.class) {@Overrideprotected void onConfigure() {@@ -185,7 +185,7 @@ public class LoginPage extends BasePage {});boolean enableSelfRegister = GitPlex.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister();- add(new BookmarkablePageLink<Void>("registerAccount", RegisterPage.class).setVisible(enableSelfRegister));+ add(new ViewStateAwarePageLink<Void>("registerAccount", RegisterPage.class).setVisible(enableSelfRegister));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmlindex 795b443f3a..51257a846e 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html@@ -1,3 +1,15 @@<wicket:extend>- <a wicket:id="test">test</a>+ <div class="autofit">content</div>+ <script type="text/javascript">+ $(function() {+ $(window).resize(function() {+ var state = {};+ $(document).find(".autofit:visible").first().trigger("autofit", state);+ console.log(state.name);+ });+ $(".autofit").on("autofit", function(e, state) {+ state.name = "robin";+ });+ });+ </script></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 4fcb6ef7dd..8c9092a3c1 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -1,7 +1,5 @@package com.gitplex.server.web.page.test;-import org.apache.wicket.markup.html.link.Link;-import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -10,15 +8,6 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();-- add(new Link<Void>("test") {-- @Override- public void onClick() {- setResponsePage(TestPage.class);- }-- });}}diff --git a/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/TrackViewStateListener.java b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/TrackViewStateListener.javanew file mode 100644index 0000000000..1cf069d973--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/ajaxlistener/TrackViewStateListener.java@@ -0,0 +1,63 @@+package com.gitplex.server.web.util.ajaxlistener;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.attributes.IAjaxCallListener;++public class TrackViewStateListener implements IAjaxCallListener {++ private final boolean carryOver;++ public TrackViewStateListener(boolean carryOver) {+ this.carryOver = carryOver;+ }++ @Override+ public CharSequence getInitHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeHandler(Component component) {+ return "gitplex.server.viewState.getFromViewAndSetToHistory();";+ }++ @Override+ public CharSequence getPrecondition(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeSendHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getAfterHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getSuccessHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getFailureHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getCompleteHandler(Component component) {+ if (carryOver) {+ return "gitplex.server.viewState.getFromCarryOverAndSetToView();";+ } else {+ return null;+ }+ }++ @Override+ public CharSequence getDoneHandler(Component component) {+ return null;+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.javaindex bce7c77f72..688fa6fd00 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsDepotCollaboratorPanel.java@@ -1,11 +1,11 @@package com.gitplex.server.web.util.depotaccess;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.UserAuthorization;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.depot.setting.authorization.DepotCollaboratorListPage;@SuppressWarnings("serial")@@ -22,7 +22,7 @@ public class IsDepotCollaboratorPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new BookmarkablePageLink<Void>("collaborator", DepotCollaboratorListPage.class,+ add(new ViewStateAwarePageLink<Void>("collaborator", DepotCollaboratorListPage.class,DepotCollaboratorListPage.paramsOf(authorizationModel.getObject().getDepot())));add(new Label("privilege", authorizationModel.getObject().getPrivilege()));}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.javaindex d79963a6c2..12d55e1711 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationAdminPanel.java@@ -1,11 +1,11 @@package com.gitplex.server.web.util.depotaccess;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.OrganizationMembership;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.members.MemberTeamListPage;@SuppressWarnings("serial")@@ -22,7 +22,7 @@ public class IsOrganizationAdminPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new BookmarkablePageLink<Void>("member",+ add(new ViewStateAwarePageLink<Void>("member",MemberTeamListPage.class, MemberTeamListPage.paramsOf(membershipModel.getObject())));add(new Label("organizationName", membershipModel.getObject().getOrganization().getName()));}diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.javaindex 07edc79035..848cfa2777 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsOrganizationMemberPanel.java@@ -1,13 +1,13 @@package com.gitplex.server.web.util.depotaccess;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.Account;import com.gitplex.server.model.OrganizationMembership;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.setting.ProfileEditPage;public class IsOrganizationMemberPanel extends Panel {@@ -28,7 +28,7 @@ public class IsOrganizationMemberPanel extends Panel {Account organization = membershipModel.getObject().getOrganization();add(new Label("organizationName", organization.getDisplayName()));- BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("organizationSetting",+ ViewStateAwarePageLink<Void> link = new ViewStateAwarePageLink<Void>("organizationSetting",ProfileEditPage.class, ProfileEditPage.paramsOf(organization));link.add(new Label("privilegeName", organization.getDefaultPrivilege()));link.setEnabled(SecurityUtils.canManage(organization));diff --git a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.javaindex 9a5d6e528d..81ae47af7f 100644--- a/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java+++ b/web/src/main/java/com/gitplex/server/web/util/depotaccess/IsTeamMemberPanel.java@@ -1,13 +1,13 @@package com.gitplex.server.web.util.depotaccess;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import com.gitplex.server.model.TeamMembership;import com.gitplex.server.security.privilege.DepotPrivilege;+import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.account.teams.TeamDepotListPage;import com.gitplex.server.web.page.account.teams.TeamMemberListPage;@@ -28,14 +28,14 @@ public class IsTeamMemberPanel extends Panel {protected void onInitialize() {super.onInitialize();- Link<Void> memberListLink = new BookmarkablePageLink<Void>(+ Link<Void> memberListLink = new ViewStateAwarePageLink<Void>("memberListLink",TeamMemberListPage.class,TeamMemberListPage.paramsOf(membershipModel.getObject().getTeam()));memberListLink.add(new Label("name", membershipModel.getObject().getTeam().getName()));add(memberListLink);- Link<Void> depotListLink = new BookmarkablePageLink<Void>(+ Link<Void> depotListLink = new ViewStateAwarePageLink<Void>("depotListLink",TeamDepotListPage.class,TeamDepotListPage.paramsOf(membershipModel.getObject().getTeam()));