Skip to content

The Unified and Autonomous Development Platform

Extract MarkSupport out of CommentSupport

robin shend5b41393c46e
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
index e4ee206006..cfcab9d149 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
@@ -48,9 +48,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
public Collection<CodeComment> findAll(PullRequest request, ObjectId commitId, String path) {
EntityCriteria<CodeComment> criteria = newCriteria();
criteria.add(Restrictions.eq("request", request));
- criteria.add(Restrictions.eq("commentPos.commit", commitId.name()));
+ criteria.add(Restrictions.eq("markPos.commit", commitId.name()));
if (path != null)
- criteria.add(Restrictions.eq("commentPos.path", path));
+ criteria.add(Restrictions.eq("markPos.path", path));
return findAll(criteria);
}
@@ -63,7 +63,7 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
criteria.add(Restrictions.eq("request", request));
List<Criterion> criterions = new ArrayList<>();
for (ObjectId commitId: commitIds) {
- criterions.add(Restrictions.eq("commentPos.commit", commitId.name()));
+ criterions.add(Restrictions.eq("markPos.commit", commitId.name()));
}
criteria.add(Restrictions.or(criterions.toArray(new Criterion[criterions.size()])));
return findAll(criteria);
diff --git a/core/src/main/java/com/gitplex/server/model/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.java
index d835e0b7b8..ac0616dbbf 100644
--- a/core/src/main/java/com/gitplex/server/model/CodeComment.java
+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java
@@ -34,7 +34,7 @@ import com.gitplex.server.git.Blob;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.support.CodeCommentActivity;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.model.support.LastEvent;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.diff.DiffUtils;
@@ -80,7 +80,7 @@ public class CodeComment extends AbstractEntity {
private LastEvent lastEvent;
@Embedded
- private CommentPos commentPos;
+ private MarkPos markPos;
private boolean resolved;
@@ -143,12 +143,12 @@ public class CodeComment extends AbstractEntity {
this.date = date;
}
- public CommentPos getCommentPos() {
- return commentPos;
+ public MarkPos getCommentPos() {
+ return markPos;
}
- public void setCommentPos(CommentPos commentPos) {
- this.commentPos = commentPos;
+ public void setCommentPos(MarkPos markPos) {
+ this.markPos = markPos;
}
public Collection<CodeCommentReply> getReplies() {
@@ -221,21 +221,21 @@ public class CodeComment extends AbstractEntity {
public boolean isCodeChanged() {
if (codeChanged == null) {
- if (request.getHeadCommitHash().equals(commentPos.getCommit())) {
+ if (request.getHeadCommitHash().equals(markPos.getCommit())) {
codeChanged = false;
} else {
Depot depot = request.getTargetDepot();
try (RevWalk revWalk = new RevWalk(depot.getRepository())) {
- TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), commentPos.getPath(),
+ TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), markPos.getPath(),
request.getHeadCommit().getTree());
if (treeWalk != null) {
ObjectId blobId = treeWalk.getObjectId(0);
if (treeWalk.getRawMode(0) == FileMode.REGULAR_FILE.getBits()) {
- BlobIdent blobIdent = new BlobIdent(request.getHeadCommitHash(), commentPos.getPath(),
+ BlobIdent blobIdent = new BlobIdent(request.getHeadCommitHash(), markPos.getPath(),
treeWalk.getRawMode(0));
Blob newBlob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());
- Blob oldBlob = depot.getBlob(new BlobIdent(commentPos.getCommit(),
- commentPos.getPath(), FileMode.REGULAR_FILE.getBits()));
+ Blob oldBlob = depot.getBlob(new BlobIdent(markPos.getCommit(),
+ markPos.getPath(), FileMode.REGULAR_FILE.getBits()));
Preconditions.checkState(oldBlob != null && oldBlob.getText() != null);
List<String> oldLines = new ArrayList<>();
@@ -247,8 +247,8 @@ public class CodeComment extends AbstractEntity {
newLines.add(WhitespaceOption.DEFAULT.process(line));
Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);
- int oldBeginLine = commentPos.getRange().getBeginLine();
- int oldEndLine = commentPos.getRange().getEndLine();
+ int oldBeginLine = markPos.getRange().getBeginLine();
+ int oldEndLine = markPos.getRange().getEndLine();
Integer newBeginLine = lineMapping.get(oldBeginLine);
if (newBeginLine != null) {
for (int oldLine=oldBeginLine; oldLine<=oldEndLine; oldLine++) {
diff --git a/core/src/main/java/com/gitplex/server/model/support/CommentPos.java b/core/src/main/java/com/gitplex/server/model/support/MarkPos.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/model/support/CommentPos.java
rename to core/src/main/java/com/gitplex/server/model/support/MarkPos.java
index 1ddb218616..831ae645e3 100644
--- a/core/src/main/java/com/gitplex/server/model/support/CommentPos.java
+++ b/core/src/main/java/com/gitplex/server/model/support/MarkPos.java
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.hibernate.annotations.OptimisticLock;
@Embeddable
-public class CommentPos implements Serializable {
+public class MarkPos implements Serializable {
private static final long serialVersionUID = 1L;
@@ -52,10 +52,10 @@ public class CommentPos implements Serializable {
this.range = range;
}
- public CommentPos() {
+ public MarkPos() {
}
- public CommentPos(String commit, @Nullable String path, @Nullable TextRange mark) {
+ public MarkPos(String commit, @Nullable String path, @Nullable TextRange mark) {
this.commit = commit;
this.path = path;
this.range = mark;
@@ -71,7 +71,7 @@ public class CommentPos implements Serializable {
return commit;
}
- public static CommentPos fromString(@Nullable String str) {
+ public static MarkPos fromString(@Nullable String str) {
if (str != null) {
String commit = StringUtils.substringBefore(str, ":");
String path = null;
@@ -83,7 +83,7 @@ public class CommentPos implements Serializable {
if (markStr.length() != 0)
mark = new TextRange(markStr);
}
- return new CommentPos(commit, path, mark);
+ return new MarkPos(commit, path, mark);
} else {
return null;
}
@@ -91,11 +91,11 @@ public class CommentPos implements Serializable {
@Override
public boolean equals(Object other) {
- if (!(other instanceof CommentPos))
+ if (!(other instanceof MarkPos))
return false;
if (this == other)
return true;
- CommentPos otherPos = (CommentPos) other;
+ MarkPos otherPos = (MarkPos) other;
return new EqualsBuilder()
.append(commit, otherPos.commit)
.append(path, otherPos.path)
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
index 96b0b81740..51a592ebff 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
@@ -20,7 +20,7 @@ import com.gitplex.server.git.BlobChange;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.util.diff.DiffUtils;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.component.diff.DiffRenderer;
@@ -183,7 +183,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {
}
@Override
- public void mark(AjaxRequestTarget target, CommentPos mark) {
+ public void mark(AjaxRequestTarget target, MarkPos mark) {
Component content = get(CONTENT_ID);
if (content instanceof SourceAware) {
SourceAware sourceAware = (SourceAware) content;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
index feb9738832..b3f2ffec0b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/SourceAware.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
public interface SourceAware {
@@ -15,7 +15,7 @@ public interface SourceAware {
void onCommentAdded(AjaxRequestTarget target, CodeComment comment);
- void mark(AjaxRequestTarget target, @Nullable CommentPos mark);
+ void mark(AjaxRequestTarget target, @Nullable MarkPos mark);
void onUnblame(AjaxRequestTarget target);
}
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.java
index 2671c1f3ce..b9a06a0f50 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
@@ -52,7 +52,7 @@ import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.model.support.TextRange;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.security.SecurityUtils;
@@ -125,7 +125,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
}
}
- private String getJson(CommentPos mark) {
+ private String getJson(MarkPos mark) {
try {
MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());
return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(markInfo);
@@ -268,7 +268,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
add(callbackBehavior = new AbstractPostAjaxBehavior() {
- private String getMarkedText(CommentPos mark) {
+ private String getMarkedText(MarkPos mark) {
List<String> lines;
if (mark.getCommit().equals(getOldCommit().name()))
lines = change.getOldText().getLines();
@@ -338,7 +338,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
String jsonOfPosition = String.format("{left: %d, top: %d}",
params.getParameterValue("param1").toInt(),
params.getParameterValue("param2").toInt());
- CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
+ MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s, %s);",
getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),
JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),
@@ -401,7 +401,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
setOutputMarkupId(true);
}
- private CommentPos getMark(IRequestParameters params, String leftSideParam,
+ private MarkPos getMark(IRequestParameters params, String leftSideParam,
String beginLineParam, String beginCharParam,
String endLineParam, String endCharParam) {
boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();
@@ -410,7 +410,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
int endLine = params.getParameterValue(endLineParam).toInt();
int endChar = params.getParameterValue(endCharParam).toInt();
String commit = leftSide?getOldCommit().name():getNewCommit().name();
- return new CommentPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));
+ return new MarkPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));
}
private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
@@ -513,7 +513,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
throw new RuntimeException(e);
}
- CommentPos mark = markSupport.getMark();
+ MarkPos mark = markSupport.getMark();
if (mark != null) {
jsonOfMark = getJson(mark);
} else {
@@ -1028,8 +1028,8 @@ public class TextDiffPanel extends Panel implements SourceAware {
List<Range> oldRanges = new ArrayList<>();
List<Range> newRanges = new ArrayList<>();
if (markSupport != null) {
- List<CommentPos> marks = new ArrayList<>();
- CommentPos mark = markSupport.getMark();
+ List<MarkPos> marks = new ArrayList<>();
+ MarkPos mark = markSupport.getMark();
if (mark != null) {
marks.add(mark);
}
@@ -1038,7 +1038,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
mark = comment.getCommentPos();
marks.add(mark);
}
- for (CommentPos each: marks) {
+ for (MarkPos each: marks) {
Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);
if (each.getCommit().equals(oldCommitHash)) {
oldRanges.add(range);
@@ -1147,7 +1147,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
}
@Override
- public void mark(AjaxRequestTarget target, CommentPos mark) {
+ public void mark(AjaxRequestTarget target, MarkPos mark) {
String script;
if (mark != null) {
script = String.format(""
@@ -1198,7 +1198,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
leftSide = comment.getCommentPos().getCommit().equals(oldCommitHash);
}
- public MarkInfo(CommentPos mark, String oldCommitHash) {
+ public MarkInfo(MarkPos mark, String oldCommitHash) {
super(mark.getRange());
path = mark.getPath();
leftSide = mark.getCommit().equals(oldCommitHash);
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
index bd53d6db84..7c2a167df6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
@@ -1,6 +1,5 @@
package com.gitplex.server.web.component.diff.revision;
-import java.io.Serializable;
import java.util.Collection;
import javax.annotation.Nullable;
@@ -9,21 +8,17 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
-public interface BlobCommentSupport extends Serializable {
+public interface BlobCommentSupport extends MarkSupport {
Collection<CodeComment> getComments();
- @Nullable CommentPos getMark();
-
- String getMarkUrl(CommentPos mark);
-
@Nullable CodeComment getOpenComment();
void onOpenComment(AjaxRequestTarget target, CodeComment comment);
- void onAddComment(AjaxRequestTarget target, CommentPos commentPos);
+ void onAddComment(AjaxRequestTarget target, MarkPos markPos);
Component getDirtyContainer();
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
index 1bca42f52e..c204591031 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
@@ -1,21 +1,15 @@
package com.gitplex.server.web.component.diff.revision;
-import java.io.Serializable;
-
import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
-public interface CommentSupport extends Serializable {
-
- @Nullable CommentPos getMark();
-
- void onMark(AjaxRequestTarget target, CommentPos mark);
+public interface CommentSupport extends MarkSupport {
- String getMarkUrl(CommentPos mark);
+ void onMark(AjaxRequestTarget target, MarkPos mark);
String getCommentUrl(CodeComment comment);
@@ -23,6 +17,6 @@ public interface CommentSupport extends Serializable {
void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);
- void onAddComment(AjaxRequestTarget target, CommentPos commentPos);
+ void onAddComment(AjaxRequestTarget target, MarkPos markPos);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/MarkSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/MarkSupport.java
new file mode 100644
index 0000000000..9a37b59975
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/MarkSupport.java
@@ -0,0 +1,15 @@
+package com.gitplex.server.web.component.diff.revision;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import com.gitplex.server.model.support.MarkPos;
+
+public interface MarkSupport extends Serializable {
+
+ @Nullable MarkPos getMark();
+
+ String getMarkUrl(MarkPos mark);
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 1c49cb2722..bb7c856e46 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
@@ -70,7 +70,7 @@ import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.search.IndexManager;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.StringUtils;
@@ -121,7 +121,7 @@ public class RevisionDiffPanel extends Panel {
private final IModel<String> blameModel;
- private final CommentSupport commentSupport;
+ private final MarkSupport markSupport;
private final IModel<String> pathFilterModel;
@@ -179,7 +179,7 @@ public class RevisionDiffPanel extends Panel {
markedPaths.add(comment.getCommentPos().getPath());
}
- CommentPos mark = getMark();
+ MarkPos mark = getMark();
if (mark != null && !changedPaths.contains(mark.getPath()) && !markedPaths.contains(mark.getPath())) {
BlobIdent oldBlobIdent = new BlobIdent(oldRev, mark.getPath(), FileMode.TYPE_FILE);
BlobIdent newBlobIdent = new BlobIdent(newRev, mark.getPath(), FileMode.TYPE_FILE);
@@ -358,7 +358,7 @@ public class RevisionDiffPanel extends Panel {
@Override
protected Collection<CodeComment> load() {
- if (commentSupport != null && requestModel.getObject() != null) {
+ if (markSupport != null && requestModel.getObject() != null) {
return GitPlex.getInstance(CodeCommentManager.class).findAll(requestModel.getObject(),
getOldCommit(), getNewCommit());
} else {
@@ -388,7 +388,7 @@ public class RevisionDiffPanel extends Panel {
public RevisionDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,
String oldRev, String newRev, IModel<String> pathFilterModel, IModel<WhitespaceOption> whitespaceOptionModel,
- @Nullable IModel<String> blameModel, @Nullable CommentSupport commentSupport) {
+ @Nullable IModel<String> blameModel, @Nullable MarkSupport markSupport) {
super(id);
this.depotModel = depotModel;
@@ -422,7 +422,7 @@ public class RevisionDiffPanel extends Panel {
};
this.whitespaceOptionModel = whitespaceOptionModel;
- this.commentSupport = commentSupport;
+ this.markSupport = markSupport;
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
Cookie cookie = request.getCookie(COOKIE_VIEW_MODE);
@@ -768,13 +768,13 @@ public class RevisionDiffPanel extends Panel {
protected void populateItem(ListItem<BlobChange> item) {
BlobChange change = item.getModelObject();
item.setMarkupId("diff-" + change.getPath());
- if (commentSupport != null) {
+ if (markSupport != null) {
item.add(new BlobDiffPanel(DIFF_ID, depotModel, requestModel, change, diffMode,
getBlobBlameModel(change), new BlobCommentSupport() {
@Override
- public CommentPos getMark() {
- CommentPos mark = RevisionDiffPanel.this.getMark();
+ public MarkPos getMark() {
+ MarkPos mark = RevisionDiffPanel.this.getMark();
if (mark != null && change.getPaths().contains(mark.getPath()))
return mark;
else
@@ -782,8 +782,8 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- public String getMarkUrl(CommentPos mark) {
- return commentSupport.getMarkUrl(mark);
+ public String getMarkUrl(MarkPos mark) {
+ return markSupport.getMarkUrl(mark);
}
@Override
@@ -801,8 +801,8 @@ public class RevisionDiffPanel extends Panel {
}
@Override
- public void onAddComment(AjaxRequestTarget target, CommentPos commentPos) {
- commentContainer.setDefaultModelObject(commentPos);
+ public void onAddComment(AjaxRequestTarget target, MarkPos markPos) {
+ commentContainer.setDefaultModelObject(markPos);
Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", RevisionDiffPanel.this);
fragment.setOutputMarkupId(true);
@@ -849,12 +849,12 @@ public class RevisionDiffPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
clearComment(target);
- CommentPos mark = getMark();
+ MarkPos mark = getMark();
if (mark != null) {
SourceAware sourceAware = getSourceAware(mark.getPath());
if (sourceAware != null)
sourceAware.mark(target, null);
- commentSupport.onMark(target, null);
+ ((CommentSupport)markSupport).onMark(target, null);
}
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
@@ -878,7 +878,7 @@ public class RevisionDiffPanel extends Panel {
comment.setUUID(uuid);
comment.setRequest(requestModel.getObject());
comment.setUser(SecurityUtils.getAccount());
- comment.setCommentPos(commentPos);
+ comment.setCommentPos(markPos);
comment.setContent(contentInput.getModelObject());
GitPlex.getInstance(CodeCommentManager.class).save(comment);
@@ -903,7 +903,7 @@ public class RevisionDiffPanel extends Panel {
if (sourceAware != null)
sourceAware.onCommentAdded(target, comment);
- commentSupport.onCommentOpened(target, comment);
+ ((CommentSupport)markSupport).onCommentOpened(target, comment);
target.appendJavaScript(String.format(""
+ "gitplex.server.revisionDiff.reposition();"
+ "localStorage.removeItem('%s');",
@@ -917,7 +917,7 @@ public class RevisionDiffPanel extends Panel {
commentContainer.setVisible(true);
target.add(commentContainer);
- CommentPos prevMark = RevisionDiffPanel.this.getMark();
+ MarkPos prevMark = RevisionDiffPanel.this.getMark();
if (prevMark != null) {
SourceAware sourceAware = getSourceAware(prevMark.getPath());
if (sourceAware != null)
@@ -930,7 +930,7 @@ public class RevisionDiffPanel extends Panel {
if (sourceAware != null)
sourceAware.onCommentClosed(target, prevComment);
}
- commentSupport.onAddComment(target, commentPos);
+ ((CommentSupport)markSupport).onAddComment(target, markPos);
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
}
@@ -992,14 +992,14 @@ public class RevisionDiffPanel extends Panel {
sourceAware.onCommentClosed(target, prevComment);
}
- CommentPos prevMark = RevisionDiffPanel.this.getMark();
+ MarkPos prevMark = RevisionDiffPanel.this.getMark();
if (prevMark != null) {
SourceAware sourceAware = getSourceAware(prevMark.getPath());
if (sourceAware != null)
sourceAware.mark(target, null);
}
- commentSupport.onCommentOpened(target, comment);
+ ((CommentSupport)markSupport).onCommentOpened(target, comment);
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
}
@@ -1031,7 +1031,7 @@ public class RevisionDiffPanel extends Panel {
}
private WebMarkupContainer newCommentContainer() {
- WebMarkupContainer commentContainer = new WebMarkupContainer("comment", Model.of((CommentPos)null)) {
+ WebMarkupContainer commentContainer = new WebMarkupContainer("comment", Model.of((MarkPos)null)) {
@Override
public void renderHead(IHeaderResponse response) {
@@ -1067,8 +1067,8 @@ public class RevisionDiffPanel extends Panel {
@Override
public String getObject() {
- CommentPos commentPos = getCommentPos();
- if (commentPos.getRange() != null)
+ MarkPos markPos = getCommentPos();
+ if (markPos.getRange() != null)
return "Locate the text this comment applied to";
else
return "Locate the file this comment applied to";
@@ -1078,22 +1078,22 @@ public class RevisionDiffPanel extends Panel {
setOutputMarkupId(true);
}
- private CommentPos getCommentPos() {
+ private MarkPos getCommentPos() {
CodeComment comment = getOpenComment();
if (comment != null) {
return comment.getCommentPos();
} else {
- return (CommentPos)commentContainer.getDefaultModelObject();
+ return (MarkPos)commentContainer.getDefaultModelObject();
}
}
@Override
public void onClick(AjaxRequestTarget target) {
- CommentPos commentPos = getCommentPos();
- SourceAware sourceAware = getSourceAware(commentPos.getPath());
+ MarkPos markPos = getCommentPos();
+ SourceAware sourceAware = getSourceAware(markPos.getPath());
if (sourceAware != null)
- sourceAware.mark(target, commentPos);
- commentSupport.onMark(target, commentPos);
+ sourceAware.mark(target, markPos);
+ ((CommentSupport)markSupport).onMark(target, markPos);
target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
}
@@ -1115,7 +1115,7 @@ public class RevisionDiffPanel extends Panel {
SourceAware sourceAware = getSourceAware(comment.getCommentPos().getPath());
if (sourceAware != null)
sourceAware.onCommentClosed(target, comment);
- commentSupport.onCommentOpened(target, null);
+ ((CommentSupport)markSupport).onCommentOpened(target, null);
}
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
}
@@ -1207,8 +1207,8 @@ public class RevisionDiffPanel extends Panel {
@Nullable
private CodeComment getOpenComment() {
- if (commentSupport != null) {
- CodeComment comment = commentSupport.getOpenComment();
+ if (markSupport instanceof CommentSupport) {
+ CodeComment comment = ((CommentSupport)markSupport).getOpenComment();
if (comment != null) {
String commit = comment.getCommentPos().getCommit();
String oldCommitHash = getOldCommit().name();
@@ -1221,9 +1221,9 @@ public class RevisionDiffPanel extends Panel {
}
@Nullable
- private CommentPos getMark() {
- if (commentSupport != null) {
- CommentPos mark = commentSupport.getMark();
+ private MarkPos getMark() {
+ if (markSupport != null) {
+ MarkPos mark = markSupport.getMark();
if (mark != null) {
String commit = mark.getCommit();
String oldCommitHash = getOldCommit().name();
@@ -1260,9 +1260,9 @@ public class RevisionDiffPanel extends Panel {
SourceAware sourceAware = getSourceAware(comment.getCommentPos().getPath());
if (sourceAware != null)
sourceAware.onCommentDeleted(target, comment);
- commentSupport.onCommentOpened(target, null);
+ ((CommentSupport)markSupport).onCommentOpened(target, null);
target.appendJavaScript("gitplex.server.revisionDiff.reposition();");
- CommentPos mark = getMark();
+ MarkPos mark = getMark();
if (mark != null) {
sourceAware = getSourceAware(mark.getPath());
if (sourceAware != null) {
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.java
index 46fe8b1b02..1c655d2fe2 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -80,7 +80,7 @@ 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.render.view.Markable;
import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;
import com.gitplex.server.web.page.depot.blob.search.advanced.AdvancedSearchPanel;
import com.gitplex.server.web.page.depot.blob.search.quick.QuickSearchPanel;
@@ -823,7 +823,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
onResolvedRevisionChange(target);
} else {
if (!Objects.equal(state.blobIdent.path, blobIdent.path)
- || state.mark != null && !(get(BLOB_CONTENT_ID) instanceof MarkSupport)) {
+ || state.mark != null && !(get(BLOB_CONTENT_ID) instanceof Markable)) {
state.blobIdent.path = blobIdent.path;
state.blobIdent.mode = blobIdent.mode;
state.mode = Mode.VIEW;
@@ -836,7 +836,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
} 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);
+ ((Markable)get(BLOB_CONTENT_ID)).mark(target, state.mark);
}
}
pushState(target);
diff --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.java
index d20357d031..a774df32ce 100644
--- 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.java
@@ -22,10 +22,10 @@ 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;
+import com.gitplex.server.web.page.depot.blob.render.view.Markable;
@SuppressWarnings("serial")
-public class SourceEditPanel extends BlobEditPanel implements MarkSupport {
+public class SourceEditPanel extends BlobEditPanel implements Markable {
private SourceFormComponent sourceFormComponent;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index 812069621f..bcd0c5bd95 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -71,7 +71,7 @@ import com.gitplex.server.git.command.BlameCommand;
import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.model.support.TextRange;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
@@ -92,7 +92,7 @@ import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
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.blob.render.view.Markable;
import com.gitplex.server.web.page.depot.blob.search.SearchMenuContributor;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.util.DateUtils;
@@ -109,7 +109,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
*
*/
@SuppressWarnings("serial")
-public class SourceViewPanel extends BlobViewPanel implements MarkSupport, SearchMenuContributor {
+public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMenuContributor {
private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
@@ -462,7 +462,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
CodeComment comment = new CodeComment();
comment.setUUID(uuid);
- comment.setCommentPos(new CommentPos());
+ comment.setCommentPos(new MarkPos());
comment.getCommentPos().setCommit(context.getCommit().name());
comment.getCommentPos().setPath(context.getBlobIdent().path);
comment.setContent(contentInput.getModelObject());
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/Markable.java
similarity index 89%
rename from web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/MarkSupport.java
rename to web/src/main/java/com/gitplex/server/web/page/depot/blob/render/view/Markable.java
index 002a440af9..69e2a1d72e 100644
--- 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/Markable.java
@@ -6,6 +6,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import com.gitplex.server.model.support.TextRange;
-public interface MarkSupport {
+public interface Markable {
void mark(AjaxRequestTarget target, @Nullable TextRange mark);
}
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.java
index ceb37145a2..1d5a70c4a2 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
@@ -43,7 +43,7 @@ import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.avatar.ContributorAvatars;
@@ -444,7 +444,7 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {
public String blameFile;
@Nullable
- public CommentPos mark;
+ public MarkPos mark;
public State() {
}
@@ -466,18 +466,18 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {
pathFilter = params.get(PARAM_PATH_FILTER).toString();
blameFile = params.get(PARAM_BLAME_FILE).toString();
commentId = params.get(PARAM_COMMENT).toOptionalLong();
- mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
+ mark = MarkPos.fromString(params.get(PARAM_MARK).toString());
}
}
@Override
- public CommentPos getMark() {
+ public MarkPos getMark() {
return state.mark;
}
@Override
- public String getMarkUrl(CommentPos mark) {
+ public String getMarkUrl(MarkPos mark) {
State markState = new State();
markState.mark = mark;
markState.whitespaceOption = state.whitespaceOption;
@@ -521,13 +521,13 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {
}
@Override
- public void onMark(AjaxRequestTarget target, CommentPos mark) {
+ public void onMark(AjaxRequestTarget target, MarkPos mark) {
state.mark = mark;
pushState(target);
}
@Override
- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {
+ public void onAddComment(AjaxRequestTarget target, MarkPos mark) {
state.commentId = null;
state.mark = mark;
pushState(target);
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.java
index 81601013b3..1dc4e0a541 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
@@ -33,16 +33,15 @@ import org.eclipse.jgit.revwalk.RevWalk;
import com.gitplex.server.GitPlex;
import com.gitplex.server.git.GitUtils;
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.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.model.support.DepotAndBranch;
import com.gitplex.server.model.support.DepotAndRevision;
import com.gitplex.server.util.diff.WhitespaceOption;
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.MarkSupport;
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;
@@ -60,7 +59,7 @@ import com.gitplex.server.web.websocket.WebSocketManager;
import com.gitplex.server.web.websocket.WebSocketRegion;
@SuppressWarnings("serial")
-public class RevisionComparePage extends DepotPage implements CommentSupport {
+public class RevisionComparePage extends DepotPage implements MarkSupport {
public enum TabPanel {
COMMITS,
@@ -167,7 +166,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
state.whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());
- state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
+ state.mark = MarkPos.fromString(params.get(PARAM_MARK).toString());
state.tabPanel = TabPanel.of(params.get(PARAM_TAB).toString());
@@ -640,7 +639,7 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
public String blameFile;
@Nullable
- public CommentPos mark;
+ public MarkPos mark;
public State() {
}
@@ -659,12 +658,12 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
}
@Override
- public CommentPos getMark() {
+ public MarkPos getMark() {
return state.mark;
}
@Override
- public String getMarkUrl(CommentPos mark) {
+ public String getMarkUrl(MarkPos mark) {
State markState = new State();
markState.leftSide = new DepotAndRevision(state.rightSide.getDepot(),
state.compareWithMergeBase?mergeBase.name():leftCommitId.name());
@@ -677,12 +676,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
return urlFor(RevisionComparePage.class, paramsOf(markState.rightSide.getDepot(), markState)).toString();
}
- @Override
- public void onMark(AjaxRequestTarget target, CommentPos mark) {
- state.mark = mark;
- pushState(target);
- }
-
@Override
public Collection<WebSocketRegion> getWebSocketRegions() {
Collection<WebSocketRegion> regions = super.getWebSocketRegions();
@@ -694,24 +687,4 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
return regions;
}
- @Override
- public String getCommentUrl(CodeComment comment) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public CodeComment getOpenComment() {
- return null;
- }
-
- @Override
- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void onAddComment(AjaxRequestTarget target, CommentPos commentPos) {
- throw new UnsupportedOperationException();
- }
-
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index e56c2ad29d..ff9210c74c 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
@@ -40,13 +40,12 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.PullRequestManager;
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.PullRequestUpdate;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.model.support.CloseInfo;
-import com.gitplex.server.model.support.CommentPos;
+import com.gitplex.server.model.support.MarkPos;
import com.gitplex.server.model.support.DepotAndBranch;
import com.gitplex.server.model.support.MergeStrategy;
import com.gitplex.server.persistence.dao.Dao;
@@ -56,7 +55,7 @@ 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.MarkSupport;
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;
@@ -82,7 +81,7 @@ import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@SuppressWarnings("serial")
-public class NewRequestPage extends DepotPage implements CommentSupport {
+public class NewRequestPage extends DepotPage implements MarkSupport {
private static final String TABS_ID = "tabs";
@@ -96,7 +95,7 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
private IModel<PullRequest> requestModel;
- private CommentPos mark;
+ private MarkPos mark;
private String pathFilter;
@@ -735,12 +734,12 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
}
@Override
- public CommentPos getMark() {
+ public MarkPos getMark() {
return mark;
}
@Override
- public String getMarkUrl(CommentPos mark) {
+ public String getMarkUrl(MarkPos mark) {
RevisionComparePage.State state = new RevisionComparePage.State();
state.mark = mark;
state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());
@@ -752,31 +751,6 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();
}
- @Override
- public CodeComment getOpenComment() {
- return null;
- }
-
- @Override
- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getCommentUrl(CodeComment comment) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void onMark(AjaxRequestTarget target, CommentPos mark) {
- this.mark = mark;
- }
-
- @Override
- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {
- throw new UnsupportedOperationException();
- }
-
@Override
public Collection<WebSocketRegion> getWebSocketRegions() {
Collection<WebSocketRegion> regions = super.getWebSocketRegions();
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.java
index c585665de6..33aab12fdb 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
@@ -40,7 +40,7 @@ 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.MarkPos;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.component.diff.revision.CommentSupport;
@@ -93,7 +93,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
super(params);
state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
- state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
+ state.mark = MarkPos.fromString(params.get(PARAM_MARK).toString());
state.oldCommit = params.get(PARAM_OLD_COMMIT).toString();
state.newCommit = params.get(PARAM_NEW_COMMIT).toString();
@@ -490,12 +490,12 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
}
@Override
- public CommentPos getMark() {
+ public MarkPos getMark() {
return state.mark;
}
@Override
- public String getMarkUrl(CommentPos mark) {
+ public String getMarkUrl(MarkPos mark) {
State markState = new State();
markState.mark = mark;
markState.oldCommit = state.oldCommit;
@@ -539,7 +539,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
}
@Override
- public void onMark(AjaxRequestTarget target, CommentPos mark) {
+ public void onMark(AjaxRequestTarget target, MarkPos mark) {
state.mark = mark;
pushState(target);
}
@@ -549,7 +549,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
}
@Override
- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {
+ public void onAddComment(AjaxRequestTarget target, MarkPos mark) {
state.commentId = null;
state.mark = mark;
pushState(target);
@@ -586,7 +586,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
public Long commentId;
@Nullable
- public CommentPos mark;
+ public MarkPos mark;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
index d02a8f45c1..52192a5aaa 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -387,7 +387,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {
String pathQuery = path.replace('*', '%');
if (pathQuery.endsWith("/"))
pathQuery += "%";
- criteria.add(Restrictions.ilike("commentPos.path", pathQuery));
+ criteria.add(Restrictions.ilike("markPos.path", pathQuery));
}
if (before != null)