The Unified and Autonomous Development Platform
Add build reference support from markdown
Robin Shenb6bc40ec3c17
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 246789b00c..6ed75455fe 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -240,6 +240,8 @@ import io.onedev.server.web.ExpectedExceptionContribution;import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.ResourcePackScopeContribution;import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.avatar.AvatarManager;+import io.onedev.server.web.avatar.DefaultAvatarManager;import io.onedev.server.web.component.diff.DiffRenderer;import io.onedev.server.web.component.markdown.SourcePositionTrackExtension;import io.onedev.server.web.component.markdown.emoji.EmojiExtension;@@ -247,19 +249,12 @@ import io.onedev.server.web.editable.DefaultEditSupportRegistry;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EditSupportLocator;import io.onedev.server.web.editable.EditSupportRegistry;+import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.layout.MainNavContribution;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;import io.onedev.server.web.page.test.TestPage;-import io.onedev.server.web.util.avatar.AvatarManager;-import io.onedev.server.web.util.avatar.DefaultAvatarManager;-import io.onedev.server.web.util.mapper.OnePageMapper;-import io.onedev.server.web.util.markdown.CommitProcessor;-import io.onedev.server.web.util.markdown.IssueProcessor;-import io.onedev.server.web.util.markdown.MentionProcessor;-import io.onedev.server.web.util.markdown.PullRequestProcessor;-import io.onedev.server.web.util.markdown.UrlProcessor;import io.onedev.server.web.websocket.BuildEventBroadcaster;import io.onedev.server.web.websocket.CodeCommentEventBroadcaster;import io.onedev.server.web.websocket.CommitIndexedBroadcaster;@@ -463,11 +458,7 @@ public class CoreModule extends AbstractPluginModule {contribute(Extension.class, new EmojiExtension());contribute(Extension.class, new SourcePositionTrackExtension());- contribute(MarkdownProcessor.class, new MentionProcessor());- contribute(MarkdownProcessor.class, new PullRequestProcessor());- contribute(MarkdownProcessor.class, new IssueProcessor());- contribute(MarkdownProcessor.class, new CommitProcessor());- contribute(MarkdownProcessor.class, new UrlProcessor());+ contributeFromPackage(MarkdownProcessor.class, MarkdownProcessor.class);contribute(ResourcePackScopeContribution.class, new ResourcePackScopeContribution() {diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex a521d0ca1a..fc196b8b13 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -16,6 +16,7 @@ import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;import org.hibernate.Session;+import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -151,14 +152,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementslong buildNumber = Long.parseLong(term);criteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("version", "%#" + term + "%"));+ criteria.add(Restrictions.ilike("version", "#" + term, MatchMode.ANYWHERE));}} else {try {long buildNumber = Long.parseLong(term);criteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("version", "%" + term + "%"));+ criteria.add(Restrictions.ilike("version", term, MatchMode.ANYWHERE));}}}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 22ff27f73c..4406c4da43 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -20,6 +20,7 @@ import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;import org.hibernate.Session;+import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -291,8 +292,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementscriteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%#" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));+ Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));}} else {try {@@ -300,8 +301,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementscriteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%")));+ Restrictions.ilike("title", term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));}}}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 86410ec52c..f13635ef93 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -62,7 +62,7 @@ import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserAuthorizationFacade;import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.web.util.avatar.AvatarManager;+import io.onedev.server.web.avatar.AvatarManager;@Singletonpublic class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 4e4efcc900..90cde2cbc5 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -43,6 +43,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.Session;import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -1047,8 +1048,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcriteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%#" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%#" + term + "%")));+ Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));}} else {try {@@ -1056,8 +1057,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcriteria.add(Restrictions.eq("number", buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%")));+ Restrictions.ilike("title", term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));}}}diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 7cb9343c02..3b4400d44c 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -33,6 +33,7 @@ import com.google.common.base.Optional;import io.onedev.server.OneDev;import io.onedev.server.cache.BuildInfoManager;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;@Entity@@ -45,7 +46,7 @@ import io.onedev.server.util.facade.BuildFacade;uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-public class Build extends AbstractEntity {+public class Build extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;@@ -54,7 +55,12 @@ public class Build extends AbstractEntity {private static final int MAX_STATUS_MESSAGE = 1024;public enum Status {- WAITING, QUEUEING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED, TIMED_OUT+ IN_ERROR, FAILED, CANCELLED, TIMED_OUT, WAITING, QUEUEING, RUNNING, SUCCESSFUL;++ public String getTitle() {+ return StringUtils.capitalize(name().replace('_', ' ').toLowerCase());+ }+};@ManyToOne(fetch=FetchType.LAZY)@@ -169,6 +175,7 @@ public class Build extends AbstractEntity {this.version = version;}+ @Overridepublic long getNumber() {return number;}diff --git a/core/src/main/java/io/onedev/server/util/Referenceable.java b/core/src/main/java/io/onedev/server/util/Referenceable.javaindex 2f517e5052..5358ddf83f 100644--- a/core/src/main/java/io/onedev/server/util/Referenceable.java+++ b/core/src/main/java/io/onedev/server/util/Referenceable.java@@ -1,5 +1,7 @@package io.onedev.server.util;public interface Referenceable {+long getNumber();+}diff --git a/core/src/main/java/io/onedev/server/util/markdown/BuildParser.java b/core/src/main/java/io/onedev/server/util/markdown/BuildParser.javanew file mode 100644index 0000000000..877689278a--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/markdown/BuildParser.java@@ -0,0 +1,15 @@+package io.onedev.server.util.markdown;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;++public class BuildParser extends ReferenceParser<Build> {++ @Override+ protected Build findReferenceable(Project project, long number) {+ return OneDev.getInstance(BuildManager.class).find(project, number);+ }++}diff --git a/core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.javanew file mode 100644index 0000000000..fb2ffbc4a0--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java@@ -0,0 +1,24 @@+package io.onedev.server.util.markdown;++import org.apache.wicket.request.cycle.RequestCycle;+import org.jsoup.nodes.Document;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.web.page.project.builds.detail.BuildLogPage;++public class BuildProcessor extends BuildParser implements MarkdownProcessor {++ @Override+ public void process(Project project, Document document, Object context) {+ parseReferences(project, document);+ }++ @Override+ protected String toHtml(Build build, String text) {+ CharSequence url = RequestCycle.get().urlFor(+ BuildLogPage.class, BuildLogPage.paramsOf(build, null));+ return String.format("<a href='%s' class='build reference' data-reference=%d>%s</a>", url, build.getId(), text);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.javarename to core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.javaindex 841e3265df..fa3e585597 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/CommitProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.markdown;+package io.onedev.server.util.markdown;import java.util.Collection;import java.util.regex.Matcher;@@ -16,7 +16,6 @@ import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.TextNodeVisitor;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;-import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.web.page.project.commits.CommitDetailPage;public class CommitProcessor implements MarkdownProcessor {diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.javarename to core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.javaindex e3d90e263d..bc15dd4ca2 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java@@ -1,12 +1,10 @@-package io.onedev.server.web.util.markdown;+package io.onedev.server.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.markdown.IssueParser;-import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;public class IssueProcessor extends IssueParser implements MarkdownProcessor {diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.javarename to core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.javaindex 37637d6b0b..c564782486 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java@@ -1,12 +1,10 @@-package io.onedev.server.web.util.markdown;+package io.onedev.server.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.markdown.MarkdownProcessor;-import io.onedev.server.util.markdown.MentionParser;import io.onedev.server.web.page.admin.user.UserProfilePage;public class MentionProcessor extends MentionParser implements MarkdownProcessor {diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.javarename to core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.javaindex 958d4d685f..af9a7504bb 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java@@ -1,12 +1,10 @@-package io.onedev.server.web.util.markdown;+package io.onedev.server.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.markdown.MarkdownProcessor;-import io.onedev.server.util.markdown.PullRequestParser;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.javarename to core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.javaindex 4d7fa3d7da..60519fdb31 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/UrlProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.markdown;+package io.onedev.server.util.markdown;import java.io.IOException;import java.net.URLDecoder;@@ -23,7 +23,6 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 0b0ff0bb7e..128bbc0bc3 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -10,6 +10,8 @@ import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;import org.apache.wicket.request.mapper.CompoundRequestMapper;+import io.onedev.server.web.mapper.OnePageMapper;+import io.onedev.server.web.mapper.OneResourceMapper;import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;@@ -91,8 +93,6 @@ import io.onedev.server.web.stream.AttachmentStreamResourceReference;import io.onedev.server.web.stream.BuildLogStreamResourceReference;import io.onedev.server.web.stream.RawBlobStreamResourceReference;import io.onedev.server.web.stream.ServerLogStreamResourceReference;-import io.onedev.server.web.util.mapper.OnePageMapper;-import io.onedev.server.web.util.mapper.OneResourceMapper;public class OneUrlMapper extends CompoundRequestMapper {diff --git a/core/src/main/java/io/onedev/server/web/OneWebApplication.java b/core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex bb2641813c..3f30c515fa 100644--- a/core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -57,8 +57,8 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.error.ErrorPage;import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.resourcebundle.ResourceBundleReferences;import io.onedev.server.web.util.AbsoluteUrlRenderer;-import io.onedev.server.web.util.resourcebundle.ResourceBundleReferences;import io.onedev.server.web.websocket.WebSocketManager;@Singletondiff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.javaindex fc12520bba..547f6d5390 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/AjaxLoadingOverlay.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/AppendLoadingIndicatorListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/AppendLoadingIndicatorListener.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/AppendLoadingIndicatorListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/AppendLoadingIndicatorListener.javaindex f150ce4b1f..925ca9484d 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/AppendLoadingIndicatorListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/AppendLoadingIndicatorListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ChangeTextListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/ChangeTextListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.javaindex 9d091101ce..7f19cfd9a9 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ChangeTextListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/ChangeTextListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/CompositeAjaxCallListener.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/CompositeAjaxCallListener.javaindex 7904344b12..7781f3a315 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/CompositeAjaxCallListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmLeaveListener.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmLeaveListener.javaindex e32ec3b10b..d7493f743a 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmLeaveListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmListener.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmListener.javaindex 7c23a300a0..f6d5f8332b 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/ConfirmListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.commons.text.StringEscapeUtils;import org.apache.wicket.Component;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/DisableGlobalLoadingIndicatorListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/DisableGlobalLoadingIndicatorListener.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/DisableGlobalLoadingIndicatorListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/DisableGlobalLoadingIndicatorListener.javaindex cc7d702b48..24545efd59 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/DisableGlobalLoadingIndicatorListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/DisableGlobalLoadingIndicatorListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/SelfDisableListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/SelfDisableListener.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/SelfDisableListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/SelfDisableListener.javaindex 96c787298b..b9981d366a 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/SelfDisableListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/SelfDisableListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.javaindex 2c00aae407..5742ad1783 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/ShowGlobalLoadingIndicatorImmediatelyListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.java b/core/src/main/java/io/onedev/server/web/ajaxlistener/TrackViewStateListener.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.javarename to core/src/main/java/io/onedev/server/web/ajaxlistener/TrackViewStateListener.javaindex 0890fb2cf2..3bf5c66a1a 100644--- a/core/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.java+++ b/core/src/main/java/io/onedev/server/web/ajaxlistener/TrackViewStateListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.ajaxlistener;+package io.onedev.server.web.ajaxlistener;import org.apache.wicket.Component;import org.apache.wicket.ajax.attributes.IAjaxCallListener;diff --git a/core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.javaindex bc3463fcf4..8e1d00dff7 100644--- a/core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java@@ -11,7 +11,7 @@ import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceRimport io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class CodeMirrorResourceReference extends BaseDependentResourceReference {diff --git a/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.javaindex a9db18ee63..f250e16350 100644--- a/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class EChartsResourceReference extends JavaScriptResourceReference {diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.java b/core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.javarename to core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.javaindex a39bb6670a..0b61d782ce 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.java+++ b/core/src/main/java/io/onedev/server/web/avatar/AvatarGenerator.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.avatar;+package io.onedev.server.web.avatar;import java.awt.Color;import java.awt.Font;diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java b/core/src/main/java/io/onedev/server/web/avatar/AvatarManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.javarename to core/src/main/java/io/onedev/server/web/avatar/AvatarManager.javaindex cf15f6f10c..01f512568d 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java+++ b/core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.avatar;+package io.onedev.server.web.avatar;import java.io.File;diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.javarename to core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javaindex e6cadbff2d..1bd09f4961 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java+++ b/core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.avatar;+package io.onedev.server.web.avatar;import java.awt.image.BufferedImage;import java.io.File;diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/Gravatar.java b/core/src/main/java/io/onedev/server/web/avatar/Gravatar.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/web/util/avatar/Gravatar.javarename to core/src/main/java/io/onedev/server/web/avatar/Gravatar.javaindex c55129e30c..dd85b78cfa 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/Gravatar.java+++ b/core/src/main/java/io/onedev/server/web/avatar/Gravatar.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.avatar;+package io.onedev.server.web.avatar;import java.io.UnsupportedEncodingException;import java.math.BigInteger;diff --git a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.javaindex 28bf61b0f2..2198393254 100644--- a/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java@@ -19,8 +19,8 @@ import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;import org.unbescape.javascript.JavaScriptEscape;+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;-import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior {diff --git a/core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex 8728a3a1fe..51186d2ce6 100644--- a/core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -12,7 +12,7 @@ import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.web.component.project.ProjectPicker;-import io.onedev.server.web.util.model.AffinalProjectsModel;+import io.onedev.server.web.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalBranchPicker extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java b/core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.javaindex 2d554358be..5b4c9cfe98 100644--- a/core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java+++ b/core/src/main/java/io/onedev/server/web/component/branch/picker/BranchSelector.java@@ -27,9 +27,9 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.InputChangeBehavior;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class BranchSelector extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 4941f243b3..af030c195f 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -61,7 +61,6 @@ import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.build.BuildTitleLabel;import io.onedev.server.web.component.build.status.BuildStatusIcon;-import io.onedev.server.web.component.build.status.BuildStatusLabel;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.job.JobLink;@@ -324,7 +323,14 @@ public abstract class BuildListPanel extends Panel {fragment.add(new BuildStatusIcon("icon", rowModel));Long buildId = rowModel.getObject().getId();- fragment.add(new BuildStatusLabel("label", rowModel) {+ fragment.add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return rowModel.getObject().getStatus().getTitle();+ }++ }) {@Overrideprotected void onInitialize() {diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildCssResourceReference.javadeleted file mode 100644index 747ee87a06..0000000000--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.build.status;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class BuildCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public BuildCssResourceReference() {- super(BuildCssResourceReference.class, "build.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusCssResourceReference.javanew file mode 100644index 0000000000..9873b65c72--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.build.status;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class BuildStatusCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BuildStatusCssResourceReference() {+ super(BuildStatusCssResourceReference.class, "build-status.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.javaindex 8e338d57aa..d918e0d2af 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java@@ -12,7 +12,6 @@ import org.apache.wicket.model.IModel;import com.google.common.collect.Sets;-import io.onedev.server.OneException;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.web.behavior.WebSocketObserver;@@ -36,36 +35,18 @@ public class BuildStatusIcon extends GenericPanel<Build> {Build build = getModelObject();- String cssClass = "build-status fa fa-fw " + build.getStatus().name().toLowerCase() + " ";+ String cssClass = "fa fa-fw build-status build-status-" + build.getStatus().name().toLowerCase();+ if (build.getStatus() == Status.RUNNING)+ cssClass += " fa-spin";+String title;- if (build.getStatus() == Status.WAITING) {- cssClass += "fa-pause";+ if (build.getStatus() == Status.WAITING)title = "Waiting for completion of dependency builds";- } else if (build.getStatus() == Status.QUEUEING) {- cssClass += "fa-hourglass-1";+ else if (build.getStatus() == Status.QUEUEING)title = "Build is being queued due to limited capacity";- } else if (build.getStatus() == Status.IN_ERROR) {- cssClass += "fa-warning";- title = "Build is in error";- } else if (build.getStatus() == Status.FAILED) {- cssClass += "fa-times";- title = "Build is failed";- } else if (build.getStatus() == Status.RUNNING) {- cssClass += "fa-circle-o-notch fa-spin";- title = "Build is running";- } else if (build.getStatus() == Status.SUCCESSFUL) {- cssClass += "fa-check-circle";- title = "Build is successful";- } else if (build.getStatus() == Status.CANCELLED) {- cssClass += "fa-ban";- title = "Build is cancelled";- } else if (build.getStatus() == Status.TIMED_OUT) {- cssClass += "fa-clock-o";- title = "Build timed out";- } else {- throw new OneException("Unexpected build status: " + build.getStatus());- }+ else+ title = "Build is " + build.getStatus().getTitle().toLowerCase();tag.put("class", cssClass);tag.put("title", title);@@ -100,7 +81,7 @@ public class BuildStatusIcon extends GenericPanel<Build> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BuildCssResourceReference()));+ response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.javadeleted file mode 100644index c5751b3638..0000000000--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusLabel.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.web.component.build.status;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.model.Build;--@SuppressWarnings("serial")-public class BuildStatusLabel extends Label {-- public BuildStatusLabel(String id, IModel<Build> model) {- super(id, new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return StringUtils.capitalize(model.getObject().getStatus().name().replace('_', ' ').toLowerCase());- }-- @Override- public void detach() {- model.detach();- super.detach();- }-- });- }--}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.htmldeleted file mode 100644index 6de2ef3a2e..0000000000--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <a wicket:id="status" class="build-status"></a>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.htmlnew file mode 100644index 0000000000..e0173b211c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.html@@ -0,0 +1,3 @@+<wicket:panel>+ <a wicket:id="status"></a>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.javasimilarity index 50%rename from core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.javarename to core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.javaindex 4dbd75045c..ddf22ba668 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildsStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/OverallStatusPanel.java@@ -18,9 +18,9 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")-public class BuildsStatusPanel extends GenericPanel<List<Build>> {+public class OverallStatusPanel extends GenericPanel<List<Build>> {- public BuildsStatusPanel(String id, IModel<List<Build>> model) {+ public OverallStatusPanel(String id, IModel<List<Build>> model) {super(id, model);}@@ -50,40 +50,27 @@ public class BuildsStatusPanel extends GenericPanel<List<Build>> {@Overrideprotected Component newContent(String id, FloatingPanel floating) {- return new BuildDetailPanel(id, BuildsStatusPanel.this.getModel());+ return new StatusListPanel(id, OverallStatusPanel.this.getModel());}@Overrideprotected void onComponentTag(ComponentTag tag) {super.onComponentTag(tag);- Collection<Build> builds = BuildsStatusPanel.this.getModelObject();- String cssClass = "build-status fa fa-fw ";+ Collection<Build> builds = OverallStatusPanel.this.getModelObject();+ String cssClass = "fa fa-fw overall-build-status build-status build-status-";String title = "";- if (hasStatus(builds, Status.IN_ERROR)) {- cssClass += "fa-warning " + Status.IN_ERROR.name().toLowerCase();- title = "Some builds are in error, click for details";- } else if (hasStatus(builds, Status.FAILED)) {- cssClass += "fa-times " + Status.FAILED.name().toLowerCase();- title = "Some builds are failed, click for details";- } else if (hasStatus(builds, Status.CANCELLED)) {- cssClass += "fa-ban " + Status.CANCELLED.name().toLowerCase();- title = "Some builds are cancelled, click for details";- } else if (hasStatus(builds, Status.TIMED_OUT)) {- cssClass += "fa-clock-o " + Status.TIMED_OUT.name().toLowerCase();- title = "Some builds timed out, click for details";- } else if (hasStatus(builds, Status.WAITING)) {- cssClass += "fa-wait " + Status.WAITING.name().toLowerCase();- title = "Some builds are waiting, click for details";- } else if (hasStatus(builds, Status.QUEUEING)) {- cssClass += "fa-hourglass-1 " + Status.QUEUEING.name().toLowerCase();- title = "Some builds are queueing, click for details";- } else if (hasStatus(builds, Status.RUNNING)) {- cssClass += "fa-circle-o-notch fa-spin " + Status.RUNNING.name().toLowerCase();- title = "Some builds are running, click for details";- } else {- cssClass += "fa-check-circle " + Status.SUCCESSFUL.name().toLowerCase();- title = "Builds are successful, click for details";++ for (Build.Status status: Build.Status.values()) {+ if (hasStatus(builds, status)) {+ cssClass += status.name().toLowerCase();+ if (status != Status.SUCCESSFUL)+ title = "Some builds are ";+ else+ title = "Builds are ";+ title += status.getTitle().toLowerCase() + ", click for details";+ break;+ }}tag.put("class", cssClass);tag.put("title", title);@@ -103,7 +90,7 @@ public class BuildsStatusPanel extends GenericPanel<List<Build>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BuildCssResourceReference()));+ response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.htmlrename to core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.javarename to core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.javaindex d2ef852312..c25aa30dd3 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.java@@ -27,9 +27,9 @@ import io.onedev.server.web.page.project.builds.detail.BuildLogPage;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")-public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {+public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {- public PullRequestBuildsPanel(String id, IModel<PullRequest> model) {+ public PullRequestBuildStatusListPanel(String id, IModel<PullRequest> model) {super(id, model);}@@ -112,7 +112,7 @@ public class PullRequestBuildsPanel extends GenericPanel<PullRequest> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BuildCssResourceReference()));+ response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.htmlrename to core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.javarename to core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.javaindex 25e91a52a1..dd9e394a87 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/BuildDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/StatusListPanel.java@@ -17,9 +17,9 @@ import io.onedev.server.web.component.build.BuildTitleLabel;import io.onedev.server.web.page.project.builds.detail.BuildLogPage;@SuppressWarnings("serial")-public class BuildDetailPanel extends GenericPanel<List<Build>> {+public class StatusListPanel extends GenericPanel<List<Build>> {- public BuildDetailPanel(String id, IModel<List<Build>> model) {+ public StatusListPanel(String id, IModel<List<Build>> model) {super(id, model);add(new ListView<Build>("builds", getModel()) {@@ -47,7 +47,7 @@ public class BuildDetailPanel extends GenericPanel<List<Build>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new BuildCssResourceReference()));+ response.render(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css b/core/src/main/java/io/onedev/server/web/component/build/status/build-status.cssnew file mode 100644index 0000000000..d804b2d205--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/build/status/build-status.css@@ -0,0 +1,33 @@+.build-status-successful:before {+ content: "\f00c";+}+.build-status-in_error:before {+ content: "\f071";+}+.build-status-failed:before {+ content: "\f00d";+}+.build-status-cancelled:before {+ content: "\f05e";+}+.build-status-timed_out:before {+ content: "\f017";+}+.build-status-running:before {+ content: "\f1ce";+}+.build-status-waiting:before {+ content: "\f04c";+}+.build-status-queueing:before {+ content: "\f254";+}+.build-status-successful {+ color: #06BC06 !important;+}+.build-status-failed, .build-status-in_error, .build-status-cancelled, .build-status-timed_out {+ color: red !important;+}+.build-status-running, .build-status-waiting, .build-status-queueing {+ color: #D2A906 !important;+}diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/build.css b/core/src/main/java/io/onedev/server/web/component/build/status/build.cssdeleted file mode 100644index d662c5587a..0000000000--- a/core/src/main/java/io/onedev/server/web/component/build/status/build.css+++ /dev/null@@ -1,49 +0,0 @@-a.build {- text-decoration: none;-}-.build-detail {- margin-bottom: 0;- padding: 8px;-}--.build-detail table td {- padding: 4px 12px;-}-.build-detail table td.status {- padding-right: 4px;-}-.build-detail table td.job {- padding-left: 0;-}--.build-status.successful {- color: #06BC06 !important;-}-.build-status.failed, .build-status.in_error, .build-status.cancelled, .build-status.timed_out {- color: red !important;-}-.build-status.running, .build-status.waiting, .build-status.queueing {- color: #D2A906 !important;-}-.pullrequest-builds .build-status.failed, .pullrequest-builds .build-status.running {- padding-top: 2px;- vertical-align: text-top;-}--.pullrequest-builds tr td {- padding: 2px 12px;-}--.pullrequest-builds td.status {- padding-left: 0;- padding-right: 8px;- font-size: 16px;- width: 12px;-}-.pullrequest-builds td.job {- padding-left: 0;-}--span.build-status {- cursor: default;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex f0852f2b89..fcb9197ed0 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -50,6 +50,8 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.asset.caret.CaretResourceReference;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;@@ -61,8 +63,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.QueryPosition;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 126d1c5c21..6e3a3152e7 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -2,7 +2,9 @@ package io.onedev.server.web.component.commit.list;import java.io.IOException;import java.util.ArrayList;+import java.util.HashMap;import java.util.List;+import java.util.Map;import java.util.regex.Pattern;import javax.annotation.Nullable;@@ -36,6 +38,7 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;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.joda.time.DateTime;@@ -51,6 +54,7 @@ import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Build;import io.onedev.server.model.Project;@@ -64,7 +68,7 @@ import io.onedev.server.util.Constants;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.behavior.CommitQueryBehavior;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.commit.graph.CommitGraphResourceReference;import io.onedev.server.web.component.commit.graph.CommitGraphUtils;import io.onedev.server.web.component.commit.message.CommitMessagePanel;@@ -78,7 +82,6 @@ import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.QuerySaveSupport;import io.onedev.server.web.util.VisibleVisitor;-import io.onedev.server.web.util.model.CommitRefsModel;@SuppressWarnings("serial")public abstract class CommitListPanel extends Panel {@@ -196,14 +199,27 @@ public abstract class CommitListPanel extends Panel {};- private final CommitRefsModel labelsModel = new CommitRefsModel(new AbstractReadOnlyModel<Project>() {-+ private final IModel<Map<String, List<String>>> labelsModel = new LoadableDetachableModel<Map<String, List<String>>>() {+@Override- public Project getObject() {- return getProject();+ protected Map<String, List<String>> load() {+ Map<String, List<String>> labels = new HashMap<>();+ List<RefInfo> refInfos = getProject().getBranches();+ refInfos.addAll(getProject().getTags());+ for (RefInfo refInfo: refInfos) {+ if (refInfo.getPeeledObj() instanceof RevCommit) {+ RevCommit commit = (RevCommit) refInfo.getPeeledObj();+ List<String> commitLabels = labels.get(commit.name());+ if (commitLabels == null) {+ commitLabels = new ArrayList<>();+ labels.put(commit.name(), commitLabels);+ }+ commitLabels.add(Repository.shortenRefName(refInfo.getRef().getName()));+ }+ }+ return labels;}-- });+ };private WebMarkupContainer body;@@ -570,7 +586,7 @@ public abstract class CommitListPanel extends Panel {hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex b581ce3bdc..16baddaa02 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -85,6 +85,7 @@ import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.WebConstants;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.PatternSetAssistBehavior;import io.onedev.server.web.component.codecomment.CodeCommentPanel;import io.onedev.server.web.component.diff.blob.BlobDiffPanel;@@ -99,7 +100,6 @@ import io.onedev.server.web.component.revisionpicker.RevisionSelector;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.SuggestionUtils;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.websocket.PageDataChanged;/**diff --git a/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex f6d6d02e71..967ad7b9ba 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -13,10 +13,10 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class BoardEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 0d376673e1..e7ca123522 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -44,13 +44,13 @@ import io.onedev.server.util.IssueUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.usermatcher.UserMatcher;+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;@SuppressWarnings("serial")abstract class BatchEditPanel extends Panel implements InputContext {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 1efca069b2..24758019d8 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -57,6 +57,7 @@ import io.onedev.server.util.IssueField;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.ajaxlistener.AppendLoadingIndicatorListener;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;@@ -70,7 +71,6 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.QueryPositionSupport;-import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;@SuppressWarnings("serial")public abstract class IssueSidePanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.javaindex 235574ace8..9480da66d3 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java@@ -33,6 +33,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;@@ -41,7 +42,6 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.util.ConfirmOnClick;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex 2487314fff..b8050a0997 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -17,9 +17,9 @@ import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class TransitionEditPanel extends Panel implements InputContext {diff --git a/core/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java b/core/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.javaindex 7546c0d6fe..487fffc74d 100644--- a/core/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java+++ b/core/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java@@ -3,7 +3,7 @@ package io.onedev.server.web.component.link;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.model.IModel;-import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener;+import io.onedev.server.web.ajaxlistener.TrackViewStateListener;@SuppressWarnings("serial")public abstract class ViewStateAwareAjaxLink<T> extends PreventDefaultAjaxLink<T> {diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.java b/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.javaindex 0530dcf3ef..850a316c8f 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.java@@ -4,6 +4,7 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -14,4 +15,6 @@ public interface AtWhoReferenceSupport {List<Issue> findIssues(@Nullable Project project, String query, int count);+ List<Build> findBuilds(@Nullable Project project, String query, int count);+}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 6ecc7003fc..085fe681a9 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -49,18 +49,19 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.markdown.MarkdownManager;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.markdown.emoji.EmojiOnes;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.util.userident.UserIdent;-import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class MarkdownEditor extends FormComponentPanel<String> {@@ -324,6 +325,20 @@ public class MarkdownEditor extends FormComponentPanel<String> {referenceList.add(referenceMap);}}+ if (StringUtils.isBlank(referenceQueryType) || "build".equals(referenceQueryType)) {+ for (Build build: getReferenceSupport().findBuilds(referenceProject, referenceQuery, ATWHO_LIMIT)) {+ Map<String, String> referenceMap = new HashMap<>();+ referenceMap.put("referenceType", "build");+ referenceMap.put("referenceNumber", String.valueOf(build.getNumber()));++ String title = build.getJobName();+ if (build.getVersion() != null)+ title += " : " + build.getVersion();+ referenceMap.put("referenceTitle", title);+ referenceMap.put("searchKey", build.getNumber() + " " + StringUtils.deleteWhitespace(title));+ referenceList.add(referenceMap);+ }+ }}try {diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.javaindex ea5e20b25f..2164b23274 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java@@ -15,6 +15,7 @@ import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;import io.onedev.server.web.asset.hover.HoverResourceReference;import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference;import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;+import io.onedev.server.web.component.build.status.BuildStatusCssResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -37,6 +38,7 @@ public class MarkdownResourceReference extends BaseDependentResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new HotkeysResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new JQueryUIResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new HoverResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BuildStatusCssResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(MarkdownResourceReference.class, "markdown.css")));diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex eee0007ab0..17ce8191c6 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -24,10 +24,12 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ColorUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -36,9 +38,9 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class MarkdownViewer extends GenericPanel<String> {@@ -162,6 +164,20 @@ public class MarkdownViewer extends GenericPanel<String> {target.appendJavaScript(script);}break;+ case "build":+ Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(referenceId));+ if (build != null) {+ String statusCss = "fa build-status build-status-" + build.getStatus().name().toLowerCase();+ String statusTitle = build.getStatus().getTitle();++ String title = build.getJobName();+ if (build.getVersion() != null)+ title += " : " + build.getVersion();+ String script = String.format("onedev.server.markdown.renderBuildTooltip('%s', '%s', '%s')",+ JavaScriptEscape.escapeJavaScript(title), statusTitle, statusCss);+ target.appendJavaScript(script);+ }+ break;case "user":User user = OneDev.getInstance(UserManager.class).get(Long.valueOf(referenceId));if (user != null) {diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 6d56c36a4a..1ca2964fa3 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -365,6 +365,12 @@ body.fullscreen {padding: 0;margin: 0;}+#reference-tooltip .content.build .status:before {+ margin-right: 4px;+}+#reference-tooltip .content.build .title {+ margin-left: 10px;+}.markdown-image-loading {position: absolute;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex d2362b9f46..79a47bff5a 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -570,17 +570,26 @@ onedev.server.markdown = {if (canReferenceEntity) {function getReferencePullRequestProject() {- var input = $input.val().substring(0, $input.caret());- var match = /.*pull\s*request\s+([\w\.-]*)#/gi.exec(input);+ var input = $input.val().substring(0, $input.caret()).trim();+ var match = /.*pull\s*request\s+([\w\.-]*)#$/gi.exec(input);if (match)return match[1];elsereturn undefined;}+ function getReferenceBuildProject() {+ var input = $input.val().substring(0, $input.caret()).trim();+ var match = /.*build\s+([\w\.-]*)#$/gi.exec(input);+ if (match)+ return match[1];+ else+ return undefined;+ }+function getReferenceIssueProject() {- var input = $input.val().substring(0, $input.caret())- var match = /.*issue\s+([\w\.-]*)#/gi.exec(input);+ var input = $input.val().substring(0, $input.caret()).trim();+ var match = /.*issue\s+([\w\.-]*)#$/gi.exec(input);if (match)return match[1];else@@ -597,27 +606,38 @@ onedev.server.markdown = {var queryType;var project = getReferencePullRequestProject();if (project != undefined) {- callback("referenceQuery", query, "pull request", project);- } else {- project = getReferenceIssueProject();- if (project != undefined)- callback("referenceQuery", query, "issue", project);- else if ($input.val().substring(0, $input.caret()).match(/(.*\s+|^)#/gi))- callback("referenceQuery", query, undefined, undefined);- }+ callback("referenceQuery", query, "pull request", project);+ } else {+ project = getReferenceBuildProject();+ if (project != undefined) {+ callback("referenceQuery", query, "build", project);+ } else {+ project = getReferenceIssueProject();+ if (project != undefined)+ callback("referenceQuery", query, "issue", project);+ else if ($input.val().substring(0, $input.caret()).match(/(.*\s+|^)#/gi))+ callback("referenceQuery", query, undefined, undefined);+ }+ }}},displayTpl: function() {- if (getReferencePullRequestProject() != undefined || getReferenceIssueProject() != undefined)+ if (getReferencePullRequestProject() != undefined+ || getReferenceBuildProject() != undefined+ || getReferenceIssueProject() != undefined) {return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";- else- return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";+ } else {+ return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";+ }},insertTpl: function() {- if (getReferencePullRequestProject() != undefined || getReferenceIssueProject() != undefined)+ if (getReferencePullRequestProject() != undefined+ || getReferenceBuildProject() != undefined+ || getReferenceIssueProject() != undefined) {return "#${referenceNumber}";- else- return '${referenceType} #${referenceNumber}';+ } else {+ return '${referenceType} #${referenceNumber}';+ }},limit: atWhoLimit});@@ -945,6 +965,8 @@ onedev.server.markdown = {referenceType = "issue";} else if ($reference.hasClass("pull-request")) {referenceType = "pull request";+ } else if ($reference.hasClass("build")) {+ referenceType = "build";} else if ($reference.hasClass("mention")) {referenceType = "user";} else if ($reference.hasClass("commit")) {@@ -985,6 +1007,16 @@ onedev.server.markdown = {$tooltip.find(".title").text(title);$tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});},+ renderBuildTooltip: function(title, status, statusCss) {+ var $tooltip = $("#reference-tooltip");+ $tooltip.append("" ++ "<div class='content build'>" ++ " <span class='status'></span> <span class='title'></span>" ++ "</div>");+ $tooltip.find(".status").addClass(statusCss).text(status);+ $tooltip.find(".title").text(title);+ $tooltip.align({placement: $tooltip.data("alignment"), target: {element: $tooltip.data("trigger")}});+ },renderUserTooltip: function(avatarUrl, name, email) {var $tooltip = $("#reference-tooltip");$tooltip.append("" +diff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.javaindex a895367221..0235722272 100644--- a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.WebComponent;import io.onedev.server.OneDev;import io.onedev.server.model.Project;-import io.onedev.server.web.util.avatar.AvatarManager;+import io.onedev.server.web.avatar.AvatarManager;@SuppressWarnings("serial")public class ProjectAvatar extends WebComponent {diff --git a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.javaindex d9890d9f9f..9d31ac0a54 100644--- a/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java+++ b/core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java@@ -9,10 +9,10 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.model.Project;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {diff --git a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex 1370e9b781..c8e64544fb 100644--- a/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -5,24 +5,22 @@ import java.util.Comparator;import java.util.List;import org.apache.wicket.model.IModel;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;+import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.component.markdown.UserMentionSupport;@SuppressWarnings("serial")@@ -66,46 +64,23 @@ public abstract class CommentInput extends MarkdownEditor {@Overridepublic List<PullRequest> findPullRequests(Project project, String query, int count) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- if (project != null)- criteria.add(Restrictions.eq("targetProject", project));- else- criteria.add(Restrictions.eq("targetProject", getProject()));- if (StringUtils.isNotBlank(query)) {- query = StringUtils.deleteWhitespace(query);- try {- long requestNumber = Long.parseLong(query);- criteria.add(Restrictions.or(- Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),- Restrictions.eq("number", requestNumber)));- } catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE));- }- }- criteria.addOrder(Order.desc("number"));- return OneDev.getInstance(Dao.class).query(criteria, 0, count);+ if (project == null)+ project = getProject();+ return OneDev.getInstance(PullRequestManager.class).query(project, query, count);}@Overridepublic List<Issue> findIssues(Project project, String query, int count) {- EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);- if (project != null)- criteria.add(Restrictions.eq("project", project));- else- criteria.add(Restrictions.eq("project", getProject()));- if (StringUtils.isNotBlank(query)) {- query = StringUtils.deleteWhitespace(query);- try {- long issueNumber = Long.parseLong(query);- criteria.add(Restrictions.or(- Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),- Restrictions.eq("number", issueNumber)));- } catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE));- }- }- criteria.addOrder(Order.desc("number"));- return OneDev.getInstance(Dao.class).query(criteria, 0, count);+ if (project == null)+ project = getProject();+ return OneDev.getInstance(IssueManager.class).query(project, query, count);+ }++ @Override+ public List<Build> findBuilds(Project project, String query, int count) {+ if (project == null)+ project = getProject();+ return OneDev.getInstance(BuildManager.class).query(project, query, count);}};diff --git a/core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.javaindex a3e61642f7..8801610456 100644--- a/core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/project/comment/ProjectCommentPanel.java@@ -22,12 +22,12 @@ import org.hibernate.StaleStateException;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.model.Project;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.util.DeleteCallback;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")public abstract class ProjectCommentPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex 0d666b366d..7f1df29331 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -34,10 +34,10 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 20a8c7982e..e4a7095664 100644--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -12,7 +12,7 @@ import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.web.component.project.ProjectPicker;-import io.onedev.server.web.util.model.AffinalProjectsModel;+import io.onedev.server.web.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalRevisionPicker extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.javaindex ceea667e64..b5749ac6b1 100644--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java+++ b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java@@ -45,6 +45,7 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.InputChangeBehavior;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;@@ -54,7 +55,6 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class RevisionSelector extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.javaindex c79a99c010..75af6b2518 100644--- a/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avatar/UserAvatar.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.WebComponent;import io.onedev.server.OneDev;import io.onedev.server.util.userident.UserIdent;-import io.onedev.server.web.util.avatar.AvatarManager;+import io.onedev.server.web.avatar.AvatarManager;@SuppressWarnings("serial")public class UserAvatar extends WebComponent {diff --git a/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.javaindex 2a60c913ba..16637ce5f5 100644--- a/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/avataredit/AvatarEditPanel.java@@ -14,10 +14,10 @@ import io.onedev.server.OneDev;import io.onedev.server.model.User;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.avatarupload.AvatarFileSelected;import io.onedev.server.web.component.avatarupload.AvatarUploadField;import io.onedev.server.web.component.user.avatar.UserAvatar;-import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class AvatarEditPanel extends GenericPanel<User> {diff --git a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.javaindex 7443e31356..6bcefaef9a 100644--- a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java@@ -13,8 +13,8 @@ import io.onedev.server.OneDev;import io.onedev.server.cache.CacheManager;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.select2.ChoiceProvider;-import io.onedev.server.web.util.avatar.AvatarManager;public abstract class AbstractUserChoiceProvider extends ChoiceProvider<UserFacade> {diff --git a/core/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.java b/core/src/main/java/io/onedev/server/web/mapper/OnePageMapper.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.javarename to core/src/main/java/io/onedev/server/web/mapper/OnePageMapper.javaindex d60efedc3a..82799fa3b6 100644--- a/core/src/main/java/io/onedev/server/web/util/mapper/OnePageMapper.java+++ b/core/src/main/java/io/onedev/server/web/mapper/OnePageMapper.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.mapper;+package io.onedev.server.web.mapper;import org.apache.wicket.core.request.mapper.MountedMapper;import org.apache.wicket.request.Url;diff --git a/core/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.java b/core/src/main/java/io/onedev/server/web/mapper/OneResourceMapper.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.javarename to core/src/main/java/io/onedev/server/web/mapper/OneResourceMapper.javaindex 85b06f558f..1809894f0a 100644--- a/core/src/main/java/io/onedev/server/web/util/mapper/OneResourceMapper.java+++ b/core/src/main/java/io/onedev/server/web/mapper/OneResourceMapper.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.mapper;+package io.onedev.server.web.mapper;import org.apache.wicket.core.request.mapper.ResourceMapper;import org.apache.wicket.request.Url;diff --git a/core/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.java b/core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.javarename to core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.javaindex dea0b87794..a6275088f7 100644--- a/core/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.java+++ b/core/src/main/java/io/onedev/server/web/mapper/PathAwareUrl.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.mapper;+package io.onedev.server.web.mapper;import java.nio.charset.Charset;diff --git a/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java b/core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.javarename to core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.javaindex c6ca277bf0..2236ffa4ac 100644--- a/core/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java+++ b/core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.model;+package io.onedev.server.web.model;import java.util.Collection;import java.util.Iterator;diff --git a/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java b/core/src/main/java/io/onedev/server/web/model/EntityModel.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/util/model/EntityModel.javarename to core/src/main/java/io/onedev/server/web/model/EntityModel.javaindex b0b1b74aa3..0a456db37f 100644--- a/core/src/main/java/io/onedev/server/web/util/model/EntityModel.java+++ b/core/src/main/java/io/onedev/server/web/model/EntityModel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.model;+package io.onedev.server.web.model;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex b0068593a7..d10d312810 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -24,8 +24,8 @@ import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.util.model.EntityModel;@SuppressWarnings("serial")public abstract class GroupPage extends AdministrationPage {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex 0d598d9847..e78ab2266e 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -33,6 +33,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.issue.board.BoardEditPanel;@@ -40,7 +41,6 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 6970f4ee9e..e038aa6e75 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -26,10 +26,10 @@ import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class FieldEditPanel extends Panel implements InputContext {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex a2807007b9..d13717f8ea 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -31,6 +31,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;@@ -38,7 +39,6 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex c13f14b539..c3a0663a1d 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -33,13 +33,13 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 357f59e4cc..783b92e55e 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -13,10 +13,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class StateEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.javaindex 36516d821a..be5031be1c 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java@@ -15,8 +15,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.server.model.support.jobexecutor.JobExecutor;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")abstract class JobExecutorPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 42f7a7989c..5df8d38d70 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -25,8 +25,8 @@ import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.avatar.UserAvatar;+import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.admin.AdministrationPage;-import io.onedev.server.web.util.model.EntityModel;@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.javaindex 35af6b7b1f..31872f8bc0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java@@ -42,6 +42,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitUtils;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.blob.BlobIcon;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;@@ -50,7 +51,6 @@ import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public class BlobNavigator extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 65b576334f..c8b4602519 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -61,6 +61,8 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.TrackViewStateListener;import io.onedev.server.web.component.diff.blob.BlobDiffPanel;import io.onedev.server.web.component.diff.revision.DiffViewMode;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;@@ -68,8 +70,6 @@ import io.onedev.server.web.page.project.blob.RevisionResolved;import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener;@SuppressWarnings("serial")public class CommitOptionPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex 0d37c97293..35cc73468e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -18,6 +18,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.commons.utils.Provider;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;@@ -25,7 +26,6 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class BlobEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.javaindex 8c9738dfb7..f05a2295b3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependency/DependencyEditPanel.java@@ -13,10 +13,10 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Dependency;import io.onedev.server.ci.job.Job;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class DependencyEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.javaindex 3bc94f476d..8a2a17192d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/joboutcome/OutcomeEditPanel.java@@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.ci.job.JobOutcome;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class OutcomeEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.javaindex 6090f22a9e..3d89e3c877 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparam/ParamEditPanel.java@@ -17,10 +17,10 @@ import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.util.BuildConstants;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class ParamEditPanel extends Panel implements InputContext {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.javaindex 58e8b2f9a0..c2c150afc1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtrigger/TriggerEditPanel.java@@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.ci.job.trigger.JobTrigger;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class TriggerEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.javaindex d4b2a700d1..39ecd1eb51 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java@@ -22,8 +22,8 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.util.avatar.AvatarManager;/*** Loading commits of children may take some time, and we do this via resource loading to avoid blockingdiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 13e8ef7974..baafe4bc4c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -83,6 +83,7 @@ import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;import io.onedev.server.web.component.codecomment.CodeCommentPanel;@@ -106,7 +107,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.WicketUtils;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.websocket.PageDataChanged;/**diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex 13d877f372..009f83b602 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -31,13 +31,13 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.TrackViewStateListener;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.stream.RawBlobStreamResource;import io.onedev.server.web.stream.RawBlobStreamResourceReference;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener;@SuppressWarnings("serial")public abstract class BlobViewPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex 0bafd3ee86..703580df7a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -42,13 +42,13 @@ import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.FileQuery;import io.onedev.server.search.code.query.SymbolQuery;import io.onedev.server.search.code.query.TooGeneralQueryException;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class QuickSearchPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex f625af2438..e7c3ba9f8d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -72,7 +72,7 @@ import io.onedev.server.util.PullRequestConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -456,7 +456,7 @@ public class ProjectBranchesPage extends ProjectPage {RevCommit lastCommit = getProject().getRevCommit(ref.getRef().getObjectId(), true);String lastCommitHash = lastCommit.name();- item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 852b3c89d3..624687f87c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -42,7 +42,6 @@ import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.build.BuildTitleLabel;import io.onedev.server.web.component.build.side.BuildSidePanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;-import io.onedev.server.web.component.build.status.BuildStatusLabel;import io.onedev.server.web.component.commit.message.CommitMessagePanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -98,11 +97,13 @@ public abstract class BuildDetailPage extends ProjectPage {@Overridepublic void onObservableChanged(IPartialPageRequestHandler handler, String observable) {handler.add(component);+ handler.appendJavaScript("$(window).resize();");}@Overridepublic void onConnectionOpened(IPartialPageRequestHandler handler) {handler.add(component);+ handler.appendJavaScript("$(window).resize();");}@Override@@ -125,7 +126,14 @@ public abstract class BuildDetailPage extends ProjectPage {summary.add(new BuildTitleLabel("title", buildModel));summary.add(new BuildStatusIcon("statusIcon", buildModel));- summary.add(new BuildStatusLabel("statusLabel", buildModel));+ summary.add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return buildModel.getObject().getStatus().getTitle();+ }++ }).add(newBuildObserver(getBuild().getId())).setOutputMarkupId(true));summary.add(new Link<Void>("rebuild") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex c509fbcb24..d32de92e19 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -55,7 +55,7 @@ import io.onedev.server.util.CommitMessageTransformer;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.branch.create.CreateBranchLink;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.createtag.CreateTagLink;import io.onedev.server.web.component.diff.revision.CommentSupport;@@ -220,7 +220,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {add(new ContributorAvatars("contributorAvatars", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));add(new ContributorPanel("contribution", getCommit().getAuthorIdent(), getCommit().getCommitterIdent()));- add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex e8081edb55..fa875009a7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -32,6 +32,8 @@ import io.onedev.server.search.entity.build.FixedIssueCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;@@ -44,8 +46,6 @@ import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.util.QueryPositionSupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContext {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 769819bfa6..eb6055a4a4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -58,9 +58,9 @@ import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLink;import io.onedev.server.web.component.milestone.deletelink.MilestoneDeleteLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.util.ConfirmOnClick;-import io.onedev.server.web.util.model.EntityModel;@SuppressWarnings("serial")public class IssueBoardsPage extends ProjectIssuesPage {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.javaindex 58b1f9ee62..96aaffec27 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java@@ -11,10 +11,10 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class MilestoneEditPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex 4d3243ee20..933162fd4f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -14,10 +14,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class NewBoardPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.javaindex f655b93d95..e1f7cd76d7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java@@ -12,8 +12,8 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueCriteria;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.issue.create.NewIssueEditor;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class NewCardPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.javaindex 44cbb68efd..8d29c7f920 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java@@ -12,10 +12,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")abstract class NewMilestonePanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.javaindex 7b99b06288..1a3752bfaa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java@@ -27,11 +27,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.ajaxlistener.ChangeTextListener;+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;+import io.onedev.server.web.ajaxlistener.SelfDisableListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValueResolution.FixType;-import io.onedev.server.web.util.ajaxlistener.ChangeTextListener;-import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;-import io.onedev.server.web.util.ajaxlistener.SelfDisableListener;@SuppressWarnings("serial")public abstract class WorkflowReconcilePanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 1ab2d9b07d..0f2152014f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -62,9 +62,10 @@ import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;-import io.onedev.server.web.component.build.status.PullRequestBuildsPanel;+import io.onedev.server.web.component.build.status.PullRequestBuildStatusListPanel;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;@@ -82,7 +83,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ProjectAttachmentSupport;-import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;@SuppressWarnings("serial")public class NewPullRequestPage extends ProjectPage implements CommentSupport {@@ -634,7 +634,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {form.add(new ReviewListPanel("reviewers", requestModel));- form.add(new PullRequestBuildsPanel("builds", requestModel));+ form.add(new PullRequestBuildStatusListPanel("builds", requestModel));return fragment;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex aa6c8db455..c0f6b56838 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -86,8 +86,9 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.build.status.PullRequestBuildsPanel;+import io.onedev.server.web.component.build.status.PullRequestBuildStatusListPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -105,6 +106,7 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;+import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;@@ -117,8 +119,6 @@ import io.onedev.server.web.util.ProjectAttachmentSupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;import io.onedev.server.web.util.WicketUtils;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.model.EntityModel;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")@@ -458,7 +458,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {} else {fragment.add(new Label("buildsTitle", "Builds"));}- fragment.add(new PullRequestBuildsPanel("builds", requestModel));+ fragment.add(new PullRequestBuildStatusListPanel("builds", requestModel));fragment.add(new EntityWatchesPanel("watches") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 2b525e738c..f2779560dc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -27,7 +27,7 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.commit.message.CommitMessagePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.ident.UserIdentPanel;@@ -87,7 +87,7 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {};item.add(new CommitMessagePanel("message", projectModel, item.getModel()));- item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex 9510b21c84..f4a56ace37 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -32,7 +32,7 @@ import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.commits.CommitDetailPage;@@ -115,7 +115,7 @@ public class MergePreviewPage extends PullRequestDetailPage {fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));fragment.add(new WebMarkupContainer("copyMergedCommit").add(new CopyClipboardBehavior(Model.of(preview.getMerged()))));- fragment.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ fragment.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex e50c2500c7..07c7864bc0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -39,6 +39,8 @@ import io.onedev.server.model.support.QuerySetting;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.watch.WatchStatus;import io.onedev.server.web.WebConstants;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.subscriptionstatus.SubscriptionStatusLink;@@ -49,8 +51,6 @@ import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex d006959dd2..1521f0253a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -8,11 +8,11 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.avatarupload.AvatarFileSelected;import io.onedev.server.web.component.avatarupload.AvatarUploadField;import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.util.avatar.AvatarManager;@SuppressWarnings("serial")public class AvatarEditPage extends ProjectSettingPage {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.javaindex 0649cf516e..b24d016355 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java@@ -13,8 +13,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")abstract class BranchProtectionPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.javaindex 84337461ac..e650247d51 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java@@ -13,8 +13,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")abstract class TagProtectionPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javaindex 50d52be96d..c4f74d82ff 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java@@ -22,7 +22,7 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Day;import io.onedev.server.util.userident.UserIdent;-import io.onedev.server.web.util.avatar.AvatarManager;+import io.onedev.server.web.avatar.AvatarManager;class TopContributorsResource extends AbstractResource {diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 2beb2b6762..8efb84a9c6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -45,8 +45,9 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.TagProtection;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.build.status.OverallStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.link.ArchiveMenuLink;@@ -60,7 +61,6 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")public class ProjectTagsPage extends ProjectPage {@@ -289,7 +289,7 @@ public class ProjectTagsPage extends ProjectPage {item.add(link);String tagCommitHash = ref.getPeeledObj().name();- item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {+ item.add(new OverallStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java b/core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.javarename to core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.javaindex 90c6cd6311..a68811c361 100644--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java+++ b/core/src/main/java/io/onedev/server/web/resourcebundle/BundleAwareResourceReferenceFactory.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.resourcebundle;+package io.onedev.server.web.resourcebundle;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java b/core/src/main/java/io/onedev/server/web/resourcebundle/CachedDependenciesConcatResourceBundleReference.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.javarename to core/src/main/java/io/onedev/server/web/resourcebundle/CachedDependenciesConcatResourceBundleReference.javaindex 6e8c89dc8b..0e9c8fd31f 100644--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java+++ b/core/src/main/java/io/onedev/server/web/resourcebundle/CachedDependenciesConcatResourceBundleReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.resourcebundle;+package io.onedev.server.web.resourcebundle;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java b/core/src/main/java/io/onedev/server/web/resourcebundle/JavaScriptConcatResourceBundleReference.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.javarename to core/src/main/java/io/onedev/server/web/resourcebundle/JavaScriptConcatResourceBundleReference.javaindex 3d21f8cd51..51f3e02499 100644--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java+++ b/core/src/main/java/io/onedev/server/web/resourcebundle/JavaScriptConcatResourceBundleReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.resourcebundle;+package io.onedev.server.web.resourcebundle;import java.io.IOException;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.java b/core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundle.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.javarename to core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundle.javaindex 98a90f85bb..31ee34cf56 100644--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.java+++ b/core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundle.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.resourcebundle;+package io.onedev.server.web.resourcebundle;import java.lang.annotation.ElementType;import java.lang.annotation.Retention;diff --git a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java b/core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.javarename to core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.javaindex 8bdae23daa..653e0f9ef1 100644--- a/core/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java+++ b/core/src/main/java/io/onedev/server/web/resourcebundle/ResourceBundleReferences.java@@ -1,4 +1,4 @@-package io.onedev.server.web.util.resourcebundle;+package io.onedev.server.web.resourcebundle;import java.lang.reflect.Constructor;import java.util.ArrayList;diff --git a/core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java b/core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.javaindex de0b035ef4..e20c7d0652 100644--- a/core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java+++ b/core/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java@@ -8,7 +8,7 @@ import org.apache.wicket.util.string.Strings;import com.google.common.collect.Lists;-import io.onedev.server.web.util.mapper.PathAwareUrl;+import io.onedev.server.web.mapper.PathAwareUrl;public class AbsoluteUrlRenderer extends UrlRenderer {diff --git a/core/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.java b/core/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.javadeleted file mode 100644index 24000566e3..0000000000--- a/core/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.web.util.model;--import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevCommit;--import io.onedev.server.git.RefInfo;-import io.onedev.server.model.Project;--public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {-- private static final long serialVersionUID = 1L;-- private final IModel<Project> projectModel;-- public CommitRefsModel(IModel<Project> projectModel) {- this.projectModel = projectModel;- }-- @Override- protected Map<String, List<String>> load() {- Project project = projectModel.getObject();- Map<String, List<String>> labels = new HashMap<>();- List<RefInfo> refInfos = project.getBranches();- refInfos.addAll(project.getTags());- for (RefInfo refInfo: refInfos) {- if (refInfo.getPeeledObj() instanceof RevCommit) {- RevCommit commit = (RevCommit) refInfo.getPeeledObj();- List<String> commitLabels = labels.get(commit.name());- if (commitLabels == null) {- commitLabels = new ArrayList<>();- labels.put(commit.name(), commitLabels);- }- commitLabels.add(Repository.shortenRefName(refInfo.getRef().getName()));- }- }- return labels;- }-- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }--}diff --git a/core/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java b/core/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.javaindex 7712c8b4bf..a68c3ecc90 100644--- a/core/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java+++ b/core/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java@@ -6,7 +6,7 @@ import org.apache.wicket.request.resource.CssResourceReference;import org.junit.Assert;import org.junit.Test;-import io.onedev.server.web.util.resourcebundle.ResourceBundleReferences;+import io.onedev.server.web.resourcebundle.ResourceBundleReferences;import io.onedev.web.util.resourcebundle.testdata.a.Js1ResourceReferenceA;import io.onedev.web.util.resourcebundle.testdata.a.Js2ResourceReferenceA;import io.onedev.web.util.resourcebundle.testdata.a.Js3ResourceReferenceA;diff --git a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.javaindex f37adadc1d..f9979c4949 100644--- a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java+++ b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java@@ -2,7 +2,7 @@ package io.onedev.web.util.resourcebundle.testdata.b;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class Js1ResourceReferenceB extends JavaScriptResourceReference {diff --git a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.javaindex 4bc83f80e4..e5f27bbc83 100644--- a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java+++ b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class Js3ResourceReferenceB extends JavaScriptResourceReference {diff --git a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.javaindex 22cd5f997a..b1ac1f6e20 100644--- a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java+++ b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class Js2ResourceReferenceC extends JavaScriptResourceReference {diff --git a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.javaindex f323d47a0e..bcabfd2e40 100644--- a/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java+++ b/core/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import io.onedev.server.web.util.resourcebundle.ResourceBundle;+import io.onedev.server.web.resourcebundle.ResourceBundle;@ResourceBundlepublic class Js4ResourceReferenceC extends JavaScriptResourceReference {diff --git a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.javaindex 08a42899b3..329ac41a69 100644--- a/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java+++ b/plugin/artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java@@ -17,9 +17,9 @@ import io.onedev.server.ci.job.DependencyPopulator;import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.model.Build;import io.onedev.server.web.WebApplicationConfigurator;+import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;-import io.onedev.server.web.util.mapper.OnePageMapper;public class ArtifactModule extends AbstractPluginModule {