The Unified and Autonomous Development Platform
Add CI spec validation logic
Robin Shen3919c6dd64af
diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.javaindex 4c1053ba04..00fda3d069 100644--- a/core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java@@ -2,12 +2,25 @@ package io.onedev.server.ci;import java.io.Serializable;import java.util.ArrayList;+import java.util.HashMap;import java.util.List;+import java.util.Map;+import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;++import com.google.common.base.Charsets;+import com.google.common.collect.Lists;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.migration.VersionedDocument;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class CISpec implements Serializable {+@ClassValidating+public class CISpec implements Serializable, Validatable {private static final long serialVersionUID = 1L;@@ -23,5 +36,83 @@ public class CISpec implements Serializable {public void setJobs(List<Job> jobs) {this.jobs = jobs;}++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ Map<String, Job> jobMap = new HashMap<>();++ boolean valid = true;++ for (Job job: jobs) {+ if (jobMap.containsKey(job.getName())) {+ context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())+ .addPropertyNode("jobs").addConstraintViolation();+ valid = false;+ } else {+ jobMap.put(job.getName(), job);+ }+ }++ for (int i=0; i<jobs.size(); i++) {+ Job job = jobs.get(i);+ for (Dependency dependency: job.getDependencies()) {+ if (!jobMap.containsKey(dependency.getJob())) {+ context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJob())+ .addPropertyNode("jobs").addPropertyNode("dependencies")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ }+ }++ for (int i=0; i<jobs.size(); i++) {+ Job job = jobs.get(i);+ for (Dependency dependency: job.getDependencies()) {+ List<String> dependencyChain = Lists.newArrayList(job.getName());+ if (hasCircularDependencies(jobMap, dependencyChain, dependency.getJob())) {+ context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)+ .addPropertyNode("jobs").addPropertyNode("dependencies")+ .inIterable().atIndex(i)+ .addConstraintViolation();+ valid = false;+ }+ }+ }++ if (!valid)+ context.disableDefaultConstraintViolation();+ return valid;+ }++ private boolean hasCircularDependencies(Map<String, Job> jobMap, List<String> dependencyChain, String jobName) {+ if (dependencyChain.iterator().next().equals(jobName)) {+ dependencyChain.add(jobName);+ return true;+ } else if (dependencyChain.contains(jobName)) {+ // loop not at start of chain will be detected as a separate violation+ return false;+ } else {+ dependencyChain.add(jobName);+ Job job = jobMap.get(jobName);+ if (job != null) {+ for (Dependency dependency: job.getDependencies()) {+ if (hasCircularDependencies(jobMap, new ArrayList<>(dependencyChain), dependency.getJob()))+ return true;+ }+ }+ return false;+ }+ }++ @Nullable+ public static CISpec parse(byte[] bytes) {+ String ciSpecString = new String(bytes, Charsets.UTF_8);+ if (StringUtils.isNotBlank(ciSpecString)) {+ return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();+ } else {+ return null;+ }+ }}diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.javaindex 8d6cc21657..fd96371e32 100644--- a/core/src/main/java/io/onedev/server/ci/Job.java+++ b/core/src/main/java/io/onedev/server/ci/Job.java@@ -32,7 +32,7 @@ public class Job implements Serializable {private long timeout = 3600;- @Editable(order=100)+ @Editable(order=100, description="Specify name of the job")@NotEmptypublic String getName() {return name;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 73915ab268..f6d6d02e71 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@@ -15,7 +15,7 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -68,11 +68,11 @@ public abstract class BoardEditPanel extends Panel {if (boardIndex != -1) {BoardSpec oldBoard = boards.get(boardIndex);if (!board.getName().equals(oldBoard.getName()) && getBoard(board.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another board");}} else if (getBoard(board.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another board");}if (!editor.hasErrors(true)) {diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex c6a1b71207..575156915c 100644--- a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -16,7 +16,7 @@ import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.util.ConfirmOnClick;@@ -69,12 +69,12 @@ public class ProfileEditPanel extends GenericPanel<User> {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null && !userWithSameName.equals(user)) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {- editor.getErrorContext(new PathSegment.Property("email"))+ editor.getErrorContext(new PathElement.Named("email")).addError("This email has already been used by another user.");}if (!editor.hasErrors(true)) {diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex bb5a018736..629b192b83 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -34,7 +34,7 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;-import io.onedev.server.web.editable.PathSegment.Property;+import io.onedev.server.web.editable.PathElement.Named;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Vertical;@@ -273,25 +273,9 @@ public class BeanEditor extends ValueEditor<Serializable> {try {Validator validator = AppLoader.getInstance(Validator.class);for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {- ValuePath valuePath = new ValuePath(violation.getPropertyPath());- if (!valuePath.getElements().isEmpty()) {- PathSegment.Property property = (Property) valuePath.getElements().iterator().next();- boolean found = false;- for (Component item: propertiesView) {- int propertyIndex = (int) item.getDefaultModelObject();- PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);- if (propertyContext.getPropertyName().equals(property.getName())- && propertyContext.getDescriptor().isPropertyVisible(new OneContext(item), beanDescriptor)- && !propertyContext.getDescriptor().isPropertyExcluded()) {- found = true;- break;- }- }- if (!found)- continue;- }- ErrorContext errorContext = getErrorContext(valuePath);- errorContext.addError(violation.getMessage());+ ErrorContext errorContext = getErrorContext(new ValuePath(violation.getPropertyPath()));+ if (errorContext != null)+ errorContext.addError(violation.getMessage());}} finally {OneContext.pop();@@ -314,13 +298,13 @@ public class BeanEditor extends ValueEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- final PathSegment.Property property = (Property) pathSegment;+ public ErrorContext getErrorContext(PathElement element) {+ PathElement.Named namedElement = (Named) element;return visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<Serializable>, PropertyEditor<Serializable>>() {@Overridepublic void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (object.getDescriptor().getPropertyName().equals(property.getName()))+ if (object.getDescriptor().getPropertyName().equals(namedElement.getName()) && object.isVisibleInHierarchy())visit.stop(object);elsevisit.dontGoDeeper();diff --git a/core/src/main/java/io/onedev/server/web/editable/ErrorContext.java b/core/src/main/java/io/onedev/server/web/editable/ErrorContext.javaindex b2f0141e18..f5f531399c 100644--- a/core/src/main/java/io/onedev/server/web/editable/ErrorContext.java+++ b/core/src/main/java/io/onedev/server/web/editable/ErrorContext.java@@ -6,5 +6,12 @@ public interface ErrorContext {boolean hasErrors(boolean recursive);- ErrorContext getErrorContext(PathSegment pathSegment);+ /**+ * Get error context of specified element+ * @param element+ * @return+ * error context of specified path, <tt>null</tt> if error of the element should be ignored+ * (for instance when visibility of the property depends on another property, or is excluded etc.)+ */+ ErrorContext getErrorContext(PathElement element);}diff --git a/core/src/main/java/io/onedev/server/web/editable/PathSegment.java b/core/src/main/java/io/onedev/server/web/editable/PathElement.javasimilarity index 72%rename from core/src/main/java/io/onedev/server/web/editable/PathSegment.javarename to core/src/main/java/io/onedev/server/web/editable/PathElement.javaindex e14915b4ea..78c97873c4 100644--- a/core/src/main/java/io/onedev/server/web/editable/PathSegment.java+++ b/core/src/main/java/io/onedev/server/web/editable/PathElement.java@@ -4,14 +4,14 @@ import java.io.Serializable;import com.google.common.base.Preconditions;-public interface PathSegment extends Serializable {+public interface PathElement extends Serializable {@SuppressWarnings("serial")- public static class Property implements PathSegment {+ public static class Named implements PathElement {private final String name;- public Property(String name) {+ public Named(String name) {this.name = Preconditions.checkNotNull(name);}@@ -27,11 +27,11 @@ public interface PathSegment extends Serializable {}@SuppressWarnings("serial")- public static class Element implements PathSegment {+ public static class Indexed implements PathElement {private final int index;- public Element(int index) {+ public Indexed(int index) {this.index = index;}diff --git a/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java b/core/src/main/java/io/onedev/server/web/editable/ValueEditor.javaindex 46eb67749e..3805db371b 100644--- a/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/ValueEditor.java@@ -17,14 +17,21 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> implements ErsetConvertedInput(model.getObject());}- public @Nullable ErrorContext getErrorContext(ValuePath partPath) {+ /**+ * Get error context of specified path+ * @param path+ * @return+ * error context of specified path, <tt>null</tt> if error on the path should be ignored (for instance+ * when visibility of the property depends on another property, or is excluded etc.)+ */+ public @Nullable ErrorContext getErrorContext(ValuePath path) {ErrorContext context = this;- for (PathSegment segment: partPath.getElements()) {- ErrorContext segmentContext = context.getErrorContext(segment);- if (segmentContext != null)- context = segmentContext;+ for (PathElement element: path.getElements()) {+ ErrorContext elementContext = context.getErrorContext(element);+ if (elementContext != null)+ context = elementContext;else- break;+ return null;}return context;}@@ -45,13 +52,13 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> implements Er}/**- * Get error context for specified path segment.+ * Get error context for specified path element.** @return- * error context of specified path segment, or <tt>null</tt> if error context+ * error context of specified path element, or <tt>null</tt> if error context* for specified path segment can not be found*/- public abstract @Nullable ErrorContext getErrorContext(PathSegment pathSegment);+ public abstract @Nullable ErrorContext getErrorContext(PathElement element);protected abstract T convertInputToValue() throws ConversionException;diff --git a/core/src/main/java/io/onedev/server/web/editable/ValuePath.java b/core/src/main/java/io/onedev/server/web/editable/ValuePath.javaindex 009de99471..1e3946e8bd 100644--- a/core/src/main/java/io/onedev/server/web/editable/ValuePath.java+++ b/core/src/main/java/io/onedev/server/web/editable/ValuePath.java@@ -10,12 +10,16 @@ import javax.validation.Path;@SuppressWarnings("serial")public class ValuePath implements Serializable {- private List<PathSegment> elements = new ArrayList<>();+ private List<PathElement> elements = new ArrayList<>();- public ValuePath(PathSegment...elements) {+ public ValuePath(PathElement...elements) {this.elements = Arrays.asList(elements);}+ public ValuePath(List<PathElement> elements) {+ this.elements = elements;+ }+public ValuePath(ValuePath valuePath) {this.elements = new ArrayList<>(valuePath.getElements());}@@ -23,13 +27,13 @@ public class ValuePath implements Serializable {public ValuePath(Path validationPath) {for (Path.Node node: validationPath) {if (node.getIndex() != null)- elements.add(new PathSegment.Element(node.getIndex()));+ elements.add(new PathElement.Indexed(node.getIndex()));if (node.getName() != null)- elements.add(new PathSegment.Property(node.getName()));+ elements.add(new PathElement.Named(node.getName()));}}- public List<PathSegment> getElements() {+ public List<PathElement> getElements() {return elements;}diff --git a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex 10c818b85a..2ce237129f 100644--- a/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -15,7 +15,7 @@ import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -109,8 +109,8 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);+ public ErrorContext getErrorContext(PathElement element) {+ return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(element);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 50740f1ebb..1f36f30f75 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -31,8 +31,8 @@ import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;-import io.onedev.server.web.editable.PathSegment.Property;+import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathElement.Named;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -279,8 +279,8 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- final int index = ((PathSegment.Element) pathSegment).getIndex();+ public ErrorContext getErrorContext(PathElement element) {+ final int index = ((PathElement.Indexed) element).getIndex();final String messagePrefix = "Item " + (index+1) + ": ";return new ErrorContext() {@@ -308,11 +308,11 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- PathSegment.Property property = (Property) pathSegment;+ public ErrorContext getErrorContext(PathElement element) {+ PathElement.Named namedElement = (Named) element;for (PropertyEditor<Serializable> propertyEditor: getPropertyEditorsAtRow(index)) {- if (propertyEditor.getDescriptor().getPropertyName().equals(property.getName()))+ if (propertyEditor.getDescriptor().getPropertyName().equals(namedElement.getName()))return propertyEditor;}return null;diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.javaindex fff1103258..5176116a6f 100644--- a/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -39,7 +39,7 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.javaindex 792c74a898..a1b3623767 100644--- a/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import com.google.common.collect.Lists;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -54,7 +54,7 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.javaindex 87d43efd0c..b94a704f3a 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java@@ -15,7 +15,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -75,7 +75,7 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.javaindex caf1581380..bbd744d2c9 100644--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -67,7 +67,7 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.javaindex 50dc20af59..85f0fa78b5 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.build.choice.BuildChoiceProvider;import io.onedev.server.web.component.build.choice.BuildSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -78,7 +78,7 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.javaindex f398f0b226..bf09246dfb 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -53,7 +53,7 @@ public class BuildQueryEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex ee11e5fb52..610826fcf2 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -19,7 +19,7 @@ import io.onedev.server.util.OneContext;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -91,7 +91,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex 7af07d8530..71ff12d286 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -17,7 +17,7 @@ import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.util.OneContext;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -84,7 +84,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.javaindex 01c61e9011..9683a31166 100644--- a/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/codecommentquery/CodeCommentQueryEditor.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.behavior.CodeCommentQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -53,7 +53,7 @@ public class CodeCommentQueryEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.javaindex eeb00543b3..4ef434c081 100644--- a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.colorpicker.ColorPicker;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -42,7 +42,7 @@ public class ColorPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.javaindex 3f841196ce..1765f94c9a 100644--- a/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/commitquery/CommitQueryEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -53,7 +53,7 @@ public class CommitQueryEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.javaindex c311ddaf41..9df166c18e 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.configuration.ConfigurationMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -42,7 +42,7 @@ public class ConfigurationMultiChoiceEditor extends PropertyEditor<List<String>>}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.javaindex 07c2945d4d..265f5a4bfe 100644--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationSingleChoiceEditor.java@@ -6,7 +6,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.configuration.ConfigurationSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -32,7 +32,7 @@ public class ConfigurationSingleChoiceEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.javaindex e1559f9c06..a492227cc7 100644--- a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java@@ -15,7 +15,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextFieldimport io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.OmitName;@@ -57,7 +57,7 @@ public class DatePropertyEditor extends PropertyEditor<Date> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.javaindex 27d387610f..8d845bb0c3 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java@@ -14,7 +14,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -77,7 +77,7 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.javaindex 5391d567e8..0b84fc0f77 100644--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java@@ -18,7 +18,7 @@ import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.web.component.select2.Select2MultiChoice;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -78,7 +78,7 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex 88cec828d8..f284428584 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -22,7 +22,7 @@ import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.GroupChoice;@@ -89,7 +89,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex 15a4e7b16d..b9801b0e22 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -20,7 +20,7 @@ import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;import io.onedev.server.web.component.groupchoice.GroupSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.GroupChoice;@@ -90,7 +90,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javaindex 410a6e13bb..2908020dd4 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;import io.onedev.server.web.component.issue.choice.IssueSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -78,7 +78,7 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.javaindex b8b5548b59..05c9599ff3 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -56,7 +56,7 @@ public class IssueQueryEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.javaindex d96f82e194..a2c7d4b340 100644--- a/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/markdown/MarkdownPropertyEditor.java@@ -9,7 +9,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -40,7 +40,7 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.javaindex 25336f4291..073abec034 100644--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -41,7 +41,7 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.javaindex abfe26db98..aabaa7b132 100644--- a/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.Password;@@ -67,7 +67,7 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.javaindex cd94728044..520ddd4f5c 100644--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java@@ -10,7 +10,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.Password;@@ -49,7 +49,7 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex c1993aedd4..03fa0a43fd 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -26,7 +26,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -172,8 +172,8 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(pathSegment);+ public ErrorContext getErrorContext(PathElement element) {+ return ((ErrorContext) get(BEAN_EDITOR_ID)).getErrorContext(element);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex ff01e47773..da05bfd320 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -34,7 +34,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -288,8 +288,8 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {- int index = ((PathSegment.Element) pathSegment).getIndex();+ public ErrorContext getErrorContext(PathElement element) {+ int index = ((PathElement.Indexed) element).getIndex();int currentIndex = 0;Iterator<Component> it = rows.iterator();diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.javaindex 2c54c59687..cc4ec7b9f7 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java@@ -14,7 +14,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.pullrequest.choice.PullRequestChoiceProvider;import io.onedev.server.web.component.pullrequest.choice.PullRequestSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -78,7 +78,7 @@ public class PullRequestChoiceEditor extends PropertyEditor<Long> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.javaindex 2a7243a78c..db244c7981 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.PullRequestQueryBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -53,7 +53,7 @@ public class PullRequestQueryEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.javaindex be1e13fce6..2bc652c417 100644--- a/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java@@ -12,7 +12,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -47,7 +47,7 @@ public class ScriptPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex f5a4f869c9..660efbff14 100644--- a/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -19,7 +19,7 @@ import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.Multiline;@@ -73,7 +73,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.javaindex c0c86ac185..8f13ecfe14 100644--- a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java@@ -20,7 +20,7 @@ import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.OmitName;@@ -67,7 +67,7 @@ public class StringListPropertyEditor extends PropertyEditor<List<String>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex 0e051edd8c..d6a71b12fa 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -23,7 +23,7 @@ import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserMultiChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.UserChoice;@@ -97,7 +97,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex 1cb0fa1785..a7dbd240d3 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -21,7 +21,7 @@ import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.user.choice.UserChoiceProvider;import io.onedev.server.web.component.user.choice.UserSingleChoice;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.UserChoice;@@ -98,7 +98,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.javaindex d574a9399e..cd035926c8 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java@@ -22,7 +22,7 @@ import io.onedev.server.security.SecurityUtils;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.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")@@ -81,7 +81,7 @@ public class GroupProfilePage extends GroupPage {GroupManager groupManager = OneDev.getInstance(GroupManager.class);Group groupWithSameName = groupManager.find(group.getName());if (groupWithSameName != null && !groupWithSameName.equals(group)) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another group.");}if (!editor.hasErrors(true)) {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.javaindex ae8b99d3e8..5042c520ea 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java@@ -18,7 +18,7 @@ import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -50,7 +50,7 @@ public class NewGroupPage extends AdministrationPage {GroupManager groupManager = OneDev.getInstance(GroupManager.class);Group groupWithSameName = groupManager.find(group.getName());if (groupWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another group");}if (!editor.hasErrors(true)) {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 c09a5503ab..62234bfffb 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@@ -28,7 +28,7 @@ import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -90,13 +90,13 @@ abstract class FieldEditPanel extends Panel implements InputContext {if (fieldIndex != -1) {InputSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);if (!field.getName().equals(oldField.getName()) && getSetting().getFieldSpec(field.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("field"))- .getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("field"))+ .getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another field");}} else if (getSetting().getFieldSpec(field.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("field"))- .getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("field"))+ .getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another field");}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 fc0ccdf077..b2cb24d685 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@@ -15,7 +15,7 @@ import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -75,11 +75,11 @@ abstract class StateEditPanel extends Panel {if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);if (!state.getName().equals(oldState.getName()) && getSetting().getStateSpec(state.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another state");}} else if (getSetting().getStateSpec(state.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another state");}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.javaindex cba2f05ad1..3ab0ddbf91 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java@@ -15,7 +15,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -44,12 +44,12 @@ public class NewUserPage extends AdministrationPage {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null) {- editor.getErrorContext(new PathSegment.Property("email"))+ editor.getErrorContext(new PathElement.Named("email")).addError("This email has already been used by another user.");}if (!editor.hasErrors(true)){diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 3d168b160e..2a64ccdbe2 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -49,10 +49,67 @@ body {border-color: #145562;}#session-feedback ul {- padding: 0; margin: 0;+ padding: 0;+ margin: 0;}#session-feedback li {- list-style: none;+ list-style: none;+ border: none;+ padding: 0;+ margin: 0;+ background: none;+}++ul.feedbackPanel {+ margin: 0 0 20px 0;+ padding: 0;+ list-style: none;+}+ul.feedbackPanel>li {+ margin: 0;+ padding: 8px 0 8px 12px;+ border-left: 6px solid;+}+li.feedbackPanelERROR, li.feedbackPanelFATAL {+ color: #DD4B4B;+ background: #FEDADA;+ border-left-color: #BF1111;+}+li.feedbackPanelSUCCESS {+ color: #399529;+ background: #E5FBE5;+ border-left-color: #19A519;+}+li.feedbackPanelINFO {+ color: #31708f;+ background: #d9edf7;+ border-left-color: #46A7D8;+}+li.feedbackPanelWARNING {+ background: #FDF3C9;+ color: #836A05;+ border-left-color: #AD8C07;+}++ul.feedbackPanel>li:first-child {+ border-radius: 4px 4px 0 0;+}+ul.feedbackPanel>li:last-child {+ border-radius: 0 0 4px 4px;+}+ul.feedbackPanel>li:first-child:last-child {+ border-radius: 4px;+}+form .required {+ font-size: 16px;+ color: #B94A48;+}+.bean-editor ul.feedbackPanel {+ margin: 10px 0;+}++form>.test-feedback {+ margin-top: 16px;}.noselect {@@ -117,23 +174,6 @@ a.tree-junction {padding-top: 16px;}-/* Forms */-form .required {- font-size: 16px;- color: #B94A48;-}-form .form-group ul.feedbackPanel, form td.value ul.feedbackPanel {- margin: 4px 0 0 -8px;- padding-bottom: 0;-}-form li.feedbackPanelERROR {- color: #AA0000;- list-style: disc;-}-form>.test-feedback {- margin-top: 16px;-}-.help-block {font-size: 13px;}@@ -562,29 +602,30 @@ a.input-clear.input-group-clear {}.alert {- font-size: 16px;+ font-size: 16px;+ border: none;+ border-left: 6px solid;}.alert a {font-weight: bold;}.alert-info {- border: 1px solid #46A7D8;- font-size: 16px;+ border-color: #46A7D8;}.alert-success {- border: 1px solid #19A519;+ border-color: #19A519;background: #E5FBE5;color: #399529;}.alert-danger {color: #DD4B4B;background: #FEDADA;- border: 1px solid #BF1111;+ border-color: #BF1111;}.alert-warning {background: #FDF3C9;color: #836A05;- border: 1px solid #AD8C07;+ border-color: #AD8C07;}a.disabled, a[disabled="disabled"] {diff --git a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex bbac24310c..c71a0d8495 100644--- a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -43,7 +43,7 @@ public class NewProjectPage extends LayoutPage {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another project");} else {projectManager.save(project, null);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.htmlindex e494ae00bf..643f43acd2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html@@ -8,11 +8,12 @@<div wicket:id="editOptions" class="options pull-right expanded"></div></div><div class="body">- <form wicket:id="content" class="content leave-confirm" onsubmit="return false;">+ <form wicket:id="content" class="content leave-confirm" onsubmit="return false;">+ <div wicket:id="feedback" class="feedback"></div><div wicket:id="editor" class="editor"></div>- <div wicket:id="plainEditor" class="plain-editor"></div>- <input wicket:id="tabSelectionInfo" type="hidden" class="tab-selection-info">- <a wicket:id="submit" class="submit">submit</a>+ <a wicket:id="edit" class="edit submit">submit</a>+ <a wicket:id="editPlain" class="edit-plain submit">submit</a>+ <a wicket:id="save" class="save submit">submit</a></form><div wicket:id="commitOptions" class="commit-options"></div></div>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 98ece91e30..a9f7aabe0b 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@@ -1,33 +1,25 @@package io.onedev.server.web.page.project.blob.render.edit;-import java.nio.charset.Charset;-import javax.annotation.Nullable;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.attributes.IAjaxCallListener;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponentPanel;-import org.apache.wicket.markup.html.form.HiddenField;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.cycle.RequestCycle;--import com.google.common.base.Charsets;-import com.google.common.base.Preconditions;import io.onedev.commons.utils.Provider;-import io.onedev.server.util.ContentDetector;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;@@ -40,17 +32,17 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class BlobEditPanel extends Panel {+ public static enum Tab {EDIT, EDIT_PLAIN, SAVE};+protected final BlobRenderContext context;private FormComponentPanel<byte[]> editor;- private FormComponentPanel<String> plainEditor;-private CommitOptionPanel commitOption;private AbstractDefaultAjaxBehavior recreateBehavior;- private String tabSelectionInfo;+ private Tab currentTab = Tab.EDIT;private byte[] editingContent;@@ -86,10 +78,105 @@ public abstract class BlobEditPanel extends Panel {add(new Form<Void>("content") {+ private AjaxSubmitLink newSubmitLink(String componentId, Tab tab) {+ return new AjaxSubmitLink(componentId) {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ if (currentTab == Tab.EDIT && tab == Tab.EDIT_PLAIN+ || currentTab == Tab.EDIT_PLAIN && tab == Tab.EDIT+ || tab == Tab.SAVE)+ editingContent = editor.getModelObject();+ if (tab != Tab.SAVE) {+ if (tab == Tab.EDIT)+ editor = newEditor("editor", editingContent);+ else+ editor = getPlainEditSupport().newEditor("editor", editingContent);+ getParent().replace(editor);+ } else {+ commitOption.onContentChange(target);+ }++ String script = String.format(+ "onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.%s'));",+ BlobEditPanel.this.getMarkupId(true), tab.name().toLowerCase().replace("_", "-"));+ target.appendJavaScript(script);++ currentTab = tab;++ target.add(form);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);++ attributes.getAjaxCallListeners().add(new IAjaxCallListener() {++ @Override+ public CharSequence getSuccessHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getPrecondition(Component component) {+ return null;+ }++ @Override+ public CharSequence getInitHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getFailureHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getDoneHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getCompleteHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeSendHandler(Component component) {+ return null;+ }++ @Override+ public CharSequence getBeforeHandler(Component component) {+ return "$('.blob-submit-aware').trigger('beforeSubmit');";+ }++ @Override+ public CharSequence getAfterHandler(Component component) {+ return null;+ }++ });+ }++ };+ }+@Overrideprotected void onInitialize() {super.onInitialize();+ add(new FencedFeedbackPanel("feedback", this));+byte[] content;if (context.getMode() == Mode.EDIT)content = context.getProject().getBlob(context.getBlobIdent()).getBytes();@@ -98,71 +185,13 @@ public abstract class BlobEditPanel extends Panel {add(editor = newEditor("editor", content));editor.setOutputMarkupId(true);- PlainEditSupport plainEditSupport = getPlainEditSupport();-- if (plainEditSupport != null) {- Charset detectedCharset = ContentDetector.detectCharset(content);- Charset charset = detectedCharset!=null?detectedCharset:Charset.defaultCharset();- add(plainEditor = plainEditSupport.newEditor("plainEditor", new String(content, charset)));- plainEditor.setOutputMarkupId(true);- } else {- add(new WebMarkupContainer("plainEditor").setVisible(false));- }-- add(new HiddenField<String>("tabSelectionInfo", new PropertyModel<String>(BlobEditPanel.this, "tabSelectionInfo")));-- add(newContentSubmitLink("submit"));+ add(newSubmitLink("edit", Tab.EDIT));+ add(newSubmitLink("editPlain", Tab.EDIT_PLAIN));+ add(newSubmitLink("save", Tab.SAVE));setOutputMarkupId(true);}- @Override- protected void onSubmit() {- super.onSubmit();-- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- Preconditions.checkNotNull(target);-- String fromTab = StringUtils.substringBefore(tabSelectionInfo, " ");- String toTab = StringUtils.substringAfter(tabSelectionInfo, " ");- switch (toTab) {- case "edit":- if (fromTab.equals("edit-plain"))- editingContent = plainEditor.getModelObject().getBytes(Charsets.UTF_8);- replace(editor = newEditor("editor", editingContent));- editor.setOutputMarkupId(true);- target.add(editor);- break;- case "edit-plain":- if (fromTab.equals("edit"))- editingContent = editor.getModelObject();- replace(plainEditor = getPlainEditSupport().newEditor("plainEditor",- new String(editingContent, Charsets.UTF_8)));- plainEditor.setOutputMarkupId(true);- target.add(plainEditor);- break;- case "save":- if (fromTab.equals("edit"))- editingContent = editor.getModelObject();- else- editingContent = plainEditor.getModelObject().getBytes(Charsets.UTF_8);- commitOption.onContentChange(target);- break;- }-- String script = String.format(- "onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.%s'));",- BlobEditPanel.this.getMarkupId(true), toTab);-- target.appendJavaScript(script);- }-- @Override- protected void onError() {- super.onError();- BlobEditPanel.this.onFormError(RequestCycle.get().find(AjaxRequestTarget.class), this);- }-});add(commitOption = new CommitOptionPanel("commitOptions", context, new Provider<byte[]>() {@@ -189,12 +218,8 @@ public abstract class BlobEditPanel extends Panel {setOutputMarkupId(true);}-- protected Component newContentSubmitLink(String componentId) {- return new AjaxSubmitLink(componentId) {- };- }+@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);@@ -222,10 +247,10 @@ public abstract class BlobEditPanel extends Panel {@Nullableprotected abstract PlainEditSupport getPlainEditSupport();- protected void onFormError(AjaxRequestTarget target, Form<?> form) {- target.add(form);+ public FormComponentPanel<byte[]> getEditor() {+ return editor;}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.cssindex d9d6892871..66ff056042 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css@@ -47,4 +47,8 @@.blob-edit>.body>.commit-options,.blob-edit>.body>.dirty-check {display: none;+}++.blob-edit>.body>form>.feedback>ul {+ margin: 20px 20px 0 20px;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.jsindex 77c7c2a7b1..3c59d43ec5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js@@ -7,33 +7,16 @@ onedev.server.blobEdit = {$head.find(".edit>a").click(function() {if (!$(this).parent().hasClass("active")) {- var $content = $body.children(".content");- if ($head.find(".edit-plain").hasClass("active"))- $content.children(".tab-selection-info").val("edit-plain edit");- else- $content.children(".tab-selection-info").val("save edit");- $content.children(".submit").click();+ $body.find(">.content>.edit.submit").click();}});$head.find(".edit-plain>a").click(function() {if (!$(this).parent().hasClass("active")) {- var $content = $body.children(".content");- if ($head.find(".edit").hasClass("active"))- $content.children(".tab-selection-info").val("edit edit-plain");- else- $content.children(".tab-selection-info").val("save edit-plain");- $content.children(".submit").click();+ $body.find(">.content>.edit-plain.submit").click();}});$head.find(".save>a").click(function() {- if (!$(this).parent().hasClass("active")) {- var $content = $body.children(".content");- if ($head.find(".edit").hasClass("active"))- $content.children(".tab-selection-info").val("edit save");- else- $content.children(".tab-selection-info").val("edit-plain save");- $content.children(".submit").click();- }+ $body.find(">.content>.save.submit").click();});if ($body.find(".autofit:visible").length != 0)@@ -81,14 +64,8 @@ onedev.server.blobEdit = {$body.css("overflow", "auto");var $content = $body.children(".content");- if ($tab.hasClass("edit")) {- $content.show();- $content.children(".editor").show();- $content.children(".plain-editor").hide();- } else if ($tab.hasClass("edit-plain")) {+ if ($tab.hasClass("edit") || $tab.hasClass("edit-plain")) {$content.show();- $content.children(".editor").hide();- $content.children(".plain-editor").show();} else {$body.children(".commit-options").show();}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.htmlindex 4010d7b670..a6c36e86c8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="plain-edit autofit">+ <div class="plain-edit autofit blob-submit-aware"><div class="source"></div><textarea wicket:id="input" class="input"></textarea></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.javaindex ffb889e7b7..8f7f5ddb59 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java@@ -7,14 +7,16 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.Model;+import com.google.common.base.Charsets;+@SuppressWarnings("serial")-public class PlainEditPanel extends FormComponentPanel<String> {+public class PlainEditPanel extends FormComponentPanel<byte[]> {private final String fileName;private TextArea<String> input;- public PlainEditPanel(String id, String fileName, String initialContent) {+ public PlainEditPanel(String id, String fileName, byte[] initialContent) {super(id, Model.of(initialContent));this.fileName = fileName;}@@ -23,7 +25,7 @@ public class PlainEditPanel extends FormComponentPanel<String> {protected void onInitialize() {super.onInitialize();- add(input = new TextArea<String>("input", Model.of(getModelObject())) {+ add(input = new TextArea<String>("input", Model.of(new String(getModelObject(), Charsets.UTF_8))) {@Overrideprotected boolean shouldTrimInput() {@@ -36,9 +38,9 @@ public class PlainEditPanel extends FormComponentPanel<String> {@Overridepublic void convertInput() {if (input.getConvertedInput() != null)- setConvertedInput(input.getConvertedInput());+ setConvertedInput(input.getConvertedInput().getBytes(Charsets.UTF_8));else- setConvertedInput("");+ setConvertedInput(new byte[0]);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.javaindex bcc6676b5e..8b463a575c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java@@ -6,6 +6,6 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;public interface PlainEditSupport extends Serializable {- FormComponentPanel<String> newEditor(String componentId, String initialContent);+ FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.jsindex f5bd400a49..b1e2f35c45 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/plain-edit.js@@ -45,9 +45,9 @@ onedev.server.plainEdit = {cm.setSize($plainEdit.width(), $plainEdit.height());cm.refresh();});- },- onSubmit: function(containerId) {- var cm = $("#" + containerId + ">.plain-edit>.source>.CodeMirror")[0].CodeMirror;- $("#" + containerId + ">.plain-edit>textarea").val(cm.getValue());++ $plainEdit.on("beforeSubmit", function() {+ $plainEdit.children("textarea").val($plainEdit.find(">.source>.CodeMirror")[0].CodeMirror.getValue());+ });}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.javaindex a582eeb5b4..aee1dfbea5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java@@ -1,13 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.IAjaxCallListener;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponentPanel;import io.onedev.server.ci.CISpec;@@ -19,10 +13,6 @@ import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport@SuppressWarnings("serial")public class CISpecBlobEditPanel extends BlobEditPanel {- private CISpecEditPanel editor;-- private PlainEditPanel plainEditor;-public CISpecBlobEditPanel(String id, BlobRenderContext context) {super(id, context);}@@ -35,84 +25,19 @@ public class CISpecBlobEditPanel extends BlobEditPanel {@Overrideprotected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {- return editor = new CISpecEditPanel(componentId, context, initialContent);+ return new CISpecEditPanel(componentId, context, initialContent);}- @Override- protected Component newContentSubmitLink(String componentId) {- return new AjaxSubmitLink(componentId) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new IAjaxCallListener() {-- @Override- public CharSequence getSuccessHandler(Component component) {- return null;- }-- @Override- public CharSequence getPrecondition(Component component) {- return null;- }-- @Override- public CharSequence getInitHandler(Component component) {- return null;- }-- @Override- public CharSequence getFailureHandler(Component component) {- return null;- }-- @Override- public CharSequence getDoneHandler(Component component) {- return null;- }-- @Override- public CharSequence getCompleteHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeSendHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeHandler(Component component) {- return String.format("onedev.server.plainEdit.onSubmit('%s');",- plainEditor.getMarkupId());- }-- @Override- public CharSequence getAfterHandler(Component component) {- return null;- }- });- }-- };- }-@Overrideprotected PlainEditSupport getPlainEditSupport() {return new PlainEditSupport() {@Override- public FormComponentPanel<String> newEditor(String componentId, String initialContent) {- return plainEditor = new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent);+ public FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {+ return new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent);}};}- @Override- protected void onFormError(AjaxRequestTarget target, Form<?> form) {- editor.onFormError(target, form);- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 5bde9a988e..8319794ffb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.blob.render.renderers.cispec;import java.util.ArrayList;import java.util.List;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;@@ -17,7 +16,6 @@ import com.google.common.base.Throwables;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.git.Blob;-import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.tabbable.AjaxActionTab;import io.onedev.server.web.component.tabbable.Tab;@@ -38,10 +36,9 @@ public class CISpecBlobViewPanel extends BlobViewPanel {super.onInitialize();Blob blob = context.getProject().getBlob(context.getBlobIdent());- String ciSpecString = blob.getText().getContent();- if (StringUtils.isNotBlank(ciSpecString)) {- try {- CISpec ciSpec = (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();+ try {+ CISpec ciSpec = CISpec.parse(blob.getBytes());+ if (ciSpec != null) {Fragment validFrag = new Fragment("content", "validFrag", this);if (!ciSpec.getJobs().isEmpty()) {Fragment hasJobsFrag = new Fragment("body", "hasJobsFrag", this);@@ -69,13 +66,13 @@ public class CISpecBlobViewPanel extends BlobViewPanel {validFrag.add(new Label("body", "No jobs defined"));}add(validFrag);- } catch (Exception e) {- Fragment invalidFrag = new Fragment("content", "invalidFrag", this);- invalidFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));- add(invalidFrag);+ } else {+ add(new Label("content", "CI spec not defined"));}- } else {- add(new Label("content", "Build spec not defined"));+ } catch (Exception e) {+ Fragment invalidFrag = new Fragment("content", "invalidFrag", this);+ invalidFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));+ add(invalidFrag);}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 68c54bb7ea..d1df45fe87 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -12,7 +12,7 @@<div wicket:id="navs" class="nav"><a wicket:id="select" class="select"><span class="drag-indicator"><i class="fa fa-reorder"></i></span>- <span wicket:id="label" class="name"></span>+ <span class="name"></span></a><a wicket:id="delete" title="Delete job" class="delete"><i class="fa fa-trash"></i></a></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 5ae4859a53..a35c603fc9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -1,9 +1,10 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;import java.io.Serializable;-import java.nio.charset.Charset;import javax.annotation.Nullable;+import javax.validation.ConstraintViolation;+import javax.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -12,26 +13,30 @@ import org.apache.wicket.behavior.Behavior;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.Model;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.validation.IValidator;import com.google.common.base.Charsets;import com.google.common.base.Throwables;-import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.migration.VersionedDocument;-import io.onedev.server.util.ContentDetector;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathElement;+import io.onedev.server.web.editable.PathElement.Indexed;+import io.onedev.server.web.editable.PathElement.Named;+import io.onedev.server.web.editable.ValuePath;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.util.WicketUtils;@@ -46,38 +51,38 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {public CISpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {super(id, Model.of(initialContent));-- Charset detectedCharset = ContentDetector.detectCharset(getModelObject());- Charset charset = detectedCharset!=null?detectedCharset:Charset.defaultCharset();- String ciSpecString = new String(getModelObject(), charset);- if (StringUtils.isNotBlank(ciSpecString)) {- try {- parseResult = (Serializable) VersionedDocument.fromXML(ciSpecString).toBean();- } catch (Exception e) {- parseResult = e;- }- } else {- parseResult = new CISpec();+ parseResult = parseCISpec(getModelObject());+ }++ private Serializable parseCISpec(byte[] bytes) {+ try {+ CISpec ciSpec = CISpec.parse(bytes);+ if (ciSpec == null)+ ciSpec = new CISpec();+ return ciSpec;+ } catch (Exception e) {+ return e;}}private Component newJobNav(Job job) {WebMarkupContainer nav = new WebMarkupContainer(jobNavs.newChildId());- AjaxLink<Void> selectLink = new AjaxLink<Void>("select") {+ nav.add(new AjaxLink<Void>("select") {@Overridepublic void onClick(AjaxRequestTarget target) {- int index = WicketUtils.getChildIndex(jobNavs, nav);- target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);", index));+ String script = String.format("onedev.ciSpec.edit.showJob(%d);",+ WicketUtils.getChildIndex(jobNavs, nav));+ target.appendJavaScript(script);}- };- if (StringUtils.isNotBlank(job.getName()))- selectLink.add(new Label("label", job.getName()));- else- selectLink.add(new Label("label", "<i>Adding new</i>").setEscapeModelStrings(false));- nav.add(selectLink);+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ }++ });nav.add(new AjaxLink<Void>("delete") {@@ -92,6 +97,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {});jobNavs.add(nav.setOutputMarkupId(true));+return nav;}@@ -125,8 +131,17 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- if (!ciSpec.getJobs().isEmpty())- response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.edit.showJob(0);"));++ int index = 0;+ for (Component child: jobContents) {+ if (((BeanEditor) child).hasErrors(true)) {+ index = WicketUtils.getChildIndex(jobContents, child);+ break;+ }+ }++ String script = String.format("onedev.ciSpec.edit.showJob(%d);", index);+ response.render(OnDomReadyHeaderItem.forScript(script));}};@@ -158,7 +173,8 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {target.prependJavaScript(script);target.add(content);- target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);", jobNavs.size()-1));+ script = String.format("onedev.ciSpec.edit.showJob(%d);", jobNavs.size() - 1);+ target.appendJavaScript(script);}});@@ -185,6 +201,49 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}}.sortable(".jobs>.body>.side>.navs"));++ add(new IValidator<byte[]>() {++ @Override+ public void validate(IValidatable<byte[]> validatable) {+ Serializable parseResult = parseCISpec(validatable.getValue());+ if (parseResult instanceof CISpec) {+ CISpec ciSpec = (CISpec) parseResult;+ Validator validator = AppLoader.getInstance(Validator.class);+ for (ConstraintViolation<CISpec> violation: validator.validate(ciSpec)) {+ ValuePath path = new ValuePath(violation.getPropertyPath());+ if (path.getElements().isEmpty()) {+ error(violation.getMessage());+ } else {+ PathElement.Named named = (Named) path.getElements().iterator().next();+ switch (named.getName()) {+ case "jobs":+ path = new ValuePath(path.getElements().subList(1, path.getElements().size()));+ if (path.getElements().isEmpty()) {+ error("Jobs: " + violation.getMessage());+ } else {+ PathElement.Indexed indexed = (Indexed) path.getElements().iterator().next();+ path = new ValuePath(path.getElements().subList(1, path.getElements().size()));+ if (path.getElements().isEmpty()) {+ error("Job '" + ciSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage());+ } else {+ @SuppressWarnings("deprecation")+ BeanEditor editor = (BeanEditor) jobContents.get(indexed.getIndex());+ ErrorContext errorContext = editor.getErrorContext(path);+ if (errorContext != null)+ errorContext.addError(violation.getMessage());+ }+ }+ break;+ default:+ throw new RuntimeException("Unexpected element name: " + named.getName());+ }+ }+ }+ }+ }++ });} else {validFrag = new Fragment("content", "invalidFrag", this);validFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));@@ -216,16 +275,4 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}}- public void onFormError(AjaxRequestTarget target, Form<?> form) {- for (Component child: jobContents) {- BeanEditor editor = (BeanEditor) child;- if (editor.hasErrors(true)) {- target.add(editor);- target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);",- WicketUtils.getChildIndex(jobContents, child)));- break;- }- }- }-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.javaindex 181252353d..fcf7c5fcfb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java@@ -22,9 +22,7 @@ public class CISpecRendererProvider implements BlobRendererContribution {@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.ADD && isCISpec(context.getNewPath())- || context.getMode() == Mode.EDIT- && isCISpec(context.getBlobIdent().path)- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ || context.getMode() == Mode.EDIT && isCISpec(context.getBlobIdent().path)) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;@@ -41,8 +39,7 @@ public class CISpecRendererProvider implements BlobRendererContribution {};} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.VIEW_PLAIN || context.getMode() == Mode.BLAME)&& context.getBlobIdent().isFile()- && isCISpec(context.getBlobIdent().path)- && context.getProject().getBlob(context.getBlobIdent()).getText() != null) {+ && isCISpec(context.getBlobIdent().path)) {return new PrioritizedComponentRenderer() {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex cdad042b41..1d0ab3a747 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -65,15 +65,13 @@.ci-spec-view>.valid>div>.body>.navs>li.last,.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:last-child {border-radius: 0 0 4px 4px;+ margin-bottom: 20px;}.ci-spec-view>.valid>div>.body>.navs>li.first.last,.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:first-child:last-child {border-radius: 4px;}-.ci-spec-edit>.valid>div>.body>.side>.add {- margin-top: 20px;-}.ci-spec-view>.valid>div>.body>.navs>li>a,.ci-spec-edit>.valid>div>.body>.side>.navs>.nav>.select {padding: 8px 28px 8px 8px;@@ -94,7 +92,7 @@.ci-spec-view>.valid>div>.body>.content,.ci-spec-edit>.valid>div>.body>.contents>.content {border-radius: 4px;- border: 2px solid #333;+ border: 2px solid #666;padding: 20px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsindex d927fad847..889d53e2ca 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -13,17 +13,13 @@ onedev.ciSpec = {var $body = $(".ci-spec-edit .jobs>.body");var $navs = $body.find(">.side>.navs");var $contents = $body.children(".contents");+var $nav = $navs.children().eq(index);$nav.remove();$contents.children().eq(index).remove();- if ($nav.hasClass("active")) {- var $nextNav = $navs.children().eq(index);- if ($nextNav.hasClass("nav")) {- $nextNav.addClass("active");- $contents.children().eq(index).show();- }- }+ if ($nav.hasClass("active"))+ onedev.ciSpec.edit.showJob(0);},swapJobs: function(index1, index2) {var $contents = $(".ci-spec-edit .jobs>.body>.contents");@@ -44,14 +40,19 @@ onedev.ciSpec = {var $content = $contents.children().eq(index);var $input = $content.find(">div>table>tbody>tr>td.property-name input");- $input.on("input", function() {++ function syncName() {var name = $input.val().trim();var $name = $nav.find("a.select>.name");if (name.length != 0)$name.text(name);else- $name.html("<i>Adding new</i>");- });+ $name.html("<i>Name not specified</i>");+ }++ $input.on("input", syncName);++ syncName();}}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.javaindex edb1b5b68d..2cc03ed7d1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java@@ -15,7 +15,7 @@ import io.onedev.server.ci.Dependency;import io.onedev.server.ci.Job;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -78,11 +78,11 @@ public abstract class DependencyEditPanel extends Panel {if (dependencyIndex != -1) {Dependency oldDependency = dependencies.get(dependencyIndex);if (!dependency.getJob().equals(oldDependency.getJob()) && getDependency(dependency.getJob()) != null) {- editor.getErrorContext(new PathSegment.Property("job"))+ editor.getErrorContext(new PathElement.Named("job")).addError("Dependency to this job is already defined");}} else if (getDependency(dependency.getJob()) != null) {- editor.getErrorContext(new PathSegment.Property("job"))+ editor.getErrorContext(new PathElement.Named("job")).addError("Dependency to this job is already defined");}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.javaindex 3f582aaac7..d3a91b13e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -35,7 +35,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -230,7 +230,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.javaindex feb6223300..79e5cd0a81 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamEditPanel.java@@ -15,7 +15,7 @@ import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -77,13 +77,13 @@ abstract class ParamEditPanel extends Panel implements InputContext {if (paramIndex != -1) {InputSpec oldParam = params.get(paramIndex);if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("param"))- .getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("param"))+ .getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another parameter");}} else if (getInputSpec(param.getName()) != null) {- editor.getErrorContext(new PathSegment.Property("param"))- .getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("param"))+ .getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another parameter");}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.javaindex c2257cb04f..d8414f891c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditPanel.java@@ -32,7 +32,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -211,7 +211,7 @@ public class ParamListEditPanel extends PropertyEditor<List<Serializable>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.javaindex 4c35f51b0a..c32e0c2aa4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java@@ -30,7 +30,7 @@ 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.ErrorContext;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@@ -192,7 +192,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {}@Override- public ErrorContext getErrorContext(PathSegment pathSegment) {+ public ErrorContext getErrorContext(PathElement element) {return null;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.javaindex 80ea426296..5f2d7212c3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java@@ -1,10 +1,6 @@package io.onedev.server.web.page.project.blob.render.renderers.source;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.attributes.IAjaxCallListener;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -29,8 +25,6 @@ import io.onedev.server.web.page.project.blob.render.view.Markable;@SuppressWarnings("serial")public class SourceEditPanel extends BlobEditPanel implements Markable {- private SourceFormComponent sourceFormComponent;-private SourceFormatPanel sourceFormat;public SourceEditPanel(String id, BlobRenderContext context) {@@ -39,8 +33,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {@Overrideprotected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {- sourceFormComponent = new SourceFormComponent(componentId, initialContent);- return sourceFormComponent;+ return new SourceFormComponent(componentId, initialContent);}@Override@@ -50,7 +43,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s', '%s');",- sourceFormComponent.getMarkupId(), sourceFormat.getIndentType());+ getEditor().getMarkupId(), sourceFormat.getIndentType());target.appendJavaScript(script);}@@ -59,7 +52,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {String script = String.format("onedev.server.sourceEdit.onTabSizeChange('%s', %s);",- sourceFormComponent.getMarkupId(), sourceFormat.getTabSize());+ getEditor().getMarkupId(), sourceFormat.getTabSize());target.appendJavaScript(script);}@@ -68,7 +61,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {@Overridepublic void onOptioneChange(AjaxRequestTarget target) {String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s', '%s');",- sourceFormComponent.getMarkupId(), sourceFormat.getLineWrapMode());+ getEditor().getMarkupId(), sourceFormat.getLineWrapMode());target.appendJavaScript(script);}@@ -76,66 +69,6 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {return sourceFormat;}- @Override- protected Component newContentSubmitLink(String componentId) {- return new AjaxSubmitLink(componentId) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new IAjaxCallListener() {-- @Override- public CharSequence getSuccessHandler(Component component) {- return null;- }-- @Override- public CharSequence getPrecondition(Component component) {- return null;- }-- @Override- public CharSequence getInitHandler(Component component) {- return null;- }-- @Override- public CharSequence getFailureHandler(Component component) {- return null;- }-- @Override- public CharSequence getDoneHandler(Component component) {- return null;- }-- @Override- public CharSequence getCompleteHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeSendHandler(Component component) {- return null;- }-- @Override- public CharSequence getBeforeHandler(Component component) {- return String.format("onedev.server.sourceEdit.onSubmit('%s');",- sourceFormComponent.getMarkupId());- }-- @Override- public CharSequence getAfterHandler(Component component) {- return null;- }- });- }-- };- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -144,7 +77,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",- sourceFormComponent.getMarkupId(),+ getEditor().getMarkupId(),JavaScriptEscape.escapeJavaScript(context.getNewPath()),jsonOfMark,sourceFormat.getIndentType(),@@ -155,7 +88,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {response.render(OnDomReadyHeaderItem.forScript(script));script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",- sourceFormComponent.getMarkupId(), jsonOfMark, autosaveKey);+ getEditor().getMarkupId(), jsonOfMark, autosaveKey);response.render(OnLoadHeaderItem.forScript(script));}@@ -172,10 +105,10 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {String script;if (mark != null) {script = String.format("onedev.server.sourceEdit.mark('%s', %s);",- sourceFormComponent.getMarkupId(), getJson(mark));+ getEditor().getMarkupId(), getJson(mark));} else {script = String.format("onedev.server.sourceEdit.mark('%s', undefined);",- sourceFormComponent.getMarkupId());+ getEditor().getMarkupId());}target.appendJavaScript(script);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.htmlindex ebac92e00c..2b8f253846 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="source-edit autofit">+ <div class="source-edit autofit blob-submit-aware"><div class="warning alert alert-warning"><button class="close" data-dismiss="alert"><span>×</span></button><div class="message"><i class="fa fa-warning"></i> Below content is restored from an unsaved change</div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.jsindex 0c1657ebab..dbe7e03d8d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js@@ -69,7 +69,13 @@ onedev.server.sourceEdit = {cm.setSize($sourceEdit.width(), $sourceEdit.height()-$warning.outerHeight());elsecm.setSize($sourceEdit.width(), $sourceEdit.height());- });+ });++ $sourceEdit.on("beforeSubmit", function() {+ var cm = onedev.server.sourceEdit.getCodeMirror(containerId);+ $sourceEdit.children("textarea").val(cm.getValue());+ });+$warning.on("closed.bs.alert", function () {$(window).resize();})@@ -168,10 +174,6 @@ onedev.server.sourceEdit = {getCodeMirror: function(containerId) {return $("#" + containerId + ">.source-edit>.code>.CodeMirror")[0].CodeMirror;},- onSubmit: function(containerId) {- var cm = onedev.server.sourceEdit.getCodeMirror(containerId);- $("#" + containerId + ">.source-edit>textarea").val(cm.getValue());- },onIndentTypeChange: function(containerId, indentType) {var cm = onedev.server.sourceEdit.getCodeMirror(containerId);cm.setOption("indentWithTabs", indentType == "Tabs");diff --git a/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex c5777d61ef..1935116eac 100644--- a/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")@@ -52,7 +52,7 @@ abstract class ForkOptionPanel extends Panel {ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another project");target.add(form);} else {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 5283c9aaa3..d2181d7c2a 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@@ -13,7 +13,7 @@ import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -44,7 +44,7 @@ abstract class MilestoneEditPanel extends Panel {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(milestone.getProject(), milestone.getName());if (milestoneWithSameName != null && !milestoneWithSameName.equals(milestone)) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another milestone in the project");}if (!editor.hasErrors(true)){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 781c80f3b0..e346b383a4 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@@ -16,7 +16,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -45,7 +45,7 @@ abstract class NewBoardPanel extends Panel {super.onSubmit(target, form);int indexWithSameName = BoardSpec.getBoardIndex(boards, board.getName());if (indexWithSameName != -1) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another issue board in the project");}if (!editor.hasErrors(true)){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 fc33fb9919..e4d25300de 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@@ -14,7 +14,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")@@ -43,7 +43,7 @@ abstract class NewMilestonePanel extends Panel {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another milestone in the project");}if (!editor.hasErrors(true)){diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 7502699bea..88c5f085bc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -14,7 +14,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.issues.IssuesPage;@SuppressWarnings("serial")@@ -53,7 +53,7 @@ public class MilestoneEditPage extends IssuesPage {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null && !milestoneWithSameName.equals(milestone)) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another milestone in the project");}if (!editor.hasErrors(true)){diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 84040800cb..a664262591 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.IssuesPage;@@ -40,7 +40,7 @@ public class NewMilestonePage extends IssuesPage {MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);Milestone milestoneWithSameName = milestoneManager.find(getProject(), milestone.getName());if (milestoneWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another milestone in the project");}if (!editor.hasErrors(true)){diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.javaindex 6ca5f2eae6..73d2a3858a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java@@ -10,7 +10,7 @@ import io.onedev.server.manager.ConfigurationManager;import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.setting.ProjectSettingPage;import io.onedev.server.web.util.ConfirmOnClick;@@ -53,7 +53,7 @@ public class ConfigurationEditPage extends ProjectSettingPage {Configuration configurationWithSameName = getConfigurationManager().find(getProject(), configuration.getName());if (configurationWithSameName != null && !configurationWithSameName.equals(configuration)) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another configuration in the project");}if (!editor.hasErrors(true)) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.javaindex 7d301f0de2..ed7a26a8e5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java@@ -10,7 +10,7 @@ import io.onedev.server.model.Configuration;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")@@ -37,7 +37,7 @@ public class NewConfigurationPage extends ProjectSettingPage {ConfigurationManager configurationManager = OneDev.getInstance(ConfigurationManager.class);Configuration configurationWithSameName = configurationManager.find(getProject(), configuration.getName());if (configurationWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another configuration in the project");}if (!editor.hasErrors(true)) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex bbce4b4881..d4faf387f8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -17,7 +17,7 @@ import io.onedev.server.model.Project;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -72,7 +72,7 @@ public class GeneralSettingPage extends ProjectSettingPage {Project projectWithSameName = projectManager.find(project.getName());if (projectWithSameName != null && !projectWithSameName.equals(project)) {String errorMessage = "This name has already been used by another project";- editor.getErrorContext(new PathSegment.Property("name")).addError(errorMessage);+ editor.getErrorContext(new PathElement.Named("name")).addError(errorMessage);} else {projectManager.save(project, oldName);Session.get().success("General setting has been updated");diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex 8aae69d663..54a10cdcb7 100644--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -16,7 +16,7 @@ import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.project.ProjectListPage;@@ -49,12 +49,12 @@ public class RegisterPage extends BasePage {UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());if (userWithSameName != null) {- editor.getErrorContext(new PathSegment.Property("name"))+ editor.getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another user.");}User userWithSameEmail = userManager.findByEmail(user.getEmail());if (userWithSameEmail != null) {- editor.getErrorContext(new PathSegment.Property("email"))+ editor.getErrorContext(new PathElement.Named("email")).addError("This email has already been used by another user.");}if (!editor.hasErrors(true)) {