Skip to content

The Unified and Autonomous Development Platform

Able to explicitly make bean properties optional in bean editor

robin shen499a07bbc023
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
index 769a291b06..c464a17cc9 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
@@ -341,7 +341,7 @@ public class DefaultNotificationManager implements NotificationManager {
if (event instanceof PullRequestStatusChangeEvent)
eventType = ((PullRequestStatusChangeEvent) event).getStatusChange().getType().getName();
else
- eventType = EditableUtils.getName(event.getClass());
+ eventType = EditableUtils.getDisplayName(event.getClass());
String activity = eventType;
if (activity.contains(" "))
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
index 33c904d02d..9279834643 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
@@ -48,7 +48,7 @@ public class DefaultPullRequestCommentManager extends AbstractEntityManager<Pull
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
lastEvent.setUser(event.getUser());
comment.getRequest().setLastEvent(lastEvent);
pullRequestManager.save(event.getRequest());
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
index 6691ff4fbb..0e1f514999 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
@@ -92,7 +92,7 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
request.setLastEvent(lastEvent);
}
}
diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.java
index 48cb7f1f43..8377d47da6 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -198,7 +198,7 @@ public class CodeComment extends AbstractEntity {
public void setLastEvent(CodeCommentEvent event) {
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
lastEvent.setUser(event.getUser());
setLastEvent(lastEvent);
}
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index c6ef16a897..c07b530dcd 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -750,7 +750,7 @@ public class PullRequest extends AbstractEntity {
public void setLastEvent(PullRequestCodeCommentEvent event) {
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
lastEvent.setUser(event.getUser());
setLastEvent(lastEvent);
setLastCodeCommentEventDate(event.getDate());
@@ -759,7 +759,7 @@ public class PullRequest extends AbstractEntity {
public void setLastEvent(PullRequestVerificationEvent event) {
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
+ lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
lastEvent.setUser(event.getUser());
setLastEvent(lastEvent);
}
diff --git a/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java
index 6100130036..21841144ca 100644
--- a/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java
+++ b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java
@@ -31,7 +31,7 @@ public class EditableUtils {
* @return
* display name of the element
*/
- public static String getName(AnnotatedElement element) {
+ public static String getDisplayName(AnnotatedElement element) {
Editable editable = element.getAnnotation(Editable.class);
if (editable != null && editable.name().trim().length() != 0)
return editable.name();
diff --git a/core/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java b/core/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java
index 1b44f59e96..2c9a2d6d03 100644
--- a/core/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java
+++ b/core/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java
@@ -33,7 +33,7 @@ public class EntityColumn<T extends AbstractEntity> implements IStyledColumn<T,
@Override
public Component getHeader(String componentId) {
return new Label(componentId,
- EditableUtils.getName(new PropertyDescriptor(entityType, propertyName).getPropertyGetter()));
+ EditableUtils.getDisplayName(new PropertyDescriptor(entityType, propertyName).getPropertyGetter()));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
index 60a7cd30af..f3f511159e 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java
@@ -8,18 +8,24 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import com.google.common.collect.Sets;
+
import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.utils.ClassUtils;
@SuppressWarnings("serial")
public class BeanContext extends BeanDescriptor {
- public BeanContext(Class<?> beanClass, Set<String> excludeProperties) {
- super(beanClass, excludeProperties);
+ public BeanContext(Class<?> beanClass, Set<String> excludedProperties, Set<String> optionalProperties) {
+ super(beanClass, excludedProperties, optionalProperties);
+ }
+
+ public BeanContext(Class<?> beanClass, Set<String> excludedProperties) {
+ this(beanClass, excludedProperties, Sets.newHashSet());
}
public BeanContext(Class<?> beanClass) {
- super(beanClass, new HashSet<>());
+ this(beanClass, Sets.newHashSet());
}
public BeanContext(BeanDescriptor beanDescriptor) {
@@ -69,25 +75,32 @@ public class BeanContext extends BeanDescriptor {
};
}
- public static BeanEditor editModel(String componentId,
- IModel<? extends Serializable> beanModel) {
- return editModel(componentId, beanModel, new HashSet<>());
+ public static BeanEditor editModel(String componentId, IModel<? extends Serializable> beanModel) {
+ return editModel(componentId, beanModel, Sets.newHashSet());
+ }
+
+ public static BeanEditor editModel(String componentId, IModel<? extends Serializable> beanModel, Set<String> excludedProperties) {
+ return editModel(componentId, beanModel, excludedProperties, Sets.newHashSet());
}
@SuppressWarnings("unchecked")
public static BeanEditor editModel(String componentId,
- IModel<? extends Serializable> beanModel, Set<String> excludeProperties) {
+ IModel<? extends Serializable> beanModel, Set<String> excludedProperties, Set<String> optionalProperties) {
Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());
- BeanContext editContext = new BeanContext(beanClass, excludeProperties);
+ BeanContext editContext = new BeanContext(beanClass, excludedProperties);
return editContext.renderForEdit(componentId, (IModel<Serializable>)beanModel);
}
public static BeanEditor editBean(String componentId, Serializable bean) {
- return editBean(componentId, bean, new HashSet<>());
+ return editBean(componentId, bean, Sets.newHashSet());
+ }
+
+ public static BeanEditor editBean(String componentId, Serializable bean, Set<String> excludedProperties) {
+ return editBean(componentId, bean, excludedProperties, Sets.newHashSet());
}
public static BeanEditor editBean(String componentId, final Serializable bean,
- Set<String> excludeProperties) {
+ Set<String> excludedProperties, Set<String> optionalProperties) {
IModel<Serializable> beanModel = new IModel<Serializable>() {
@Override
@@ -106,7 +119,7 @@ public class BeanContext extends BeanDescriptor {
};
Class<?> beanClass = ClassUtils.unproxy(beanModel.getObject().getClass());
- BeanContext editContext = new BeanContext(beanClass, excludeProperties);
+ BeanContext editContext = new BeanContext(beanClass, excludedProperties, optionalProperties);
beanModel = editContext.wrapAsSelfUpdating(beanModel);
return editContext.renderForEdit(componentId, beanModel);
}
@@ -116,13 +129,13 @@ public class BeanContext extends BeanDescriptor {
}
public static Component viewModel(String componentId, IModel<Serializable> beanModel,
- Set<String> excludeProperties) {
- BeanContext editContext = new BeanContext(beanModel.getObject().getClass(), excludeProperties);
+ Set<String> excludedProperties) {
+ BeanContext editContext = new BeanContext(beanModel.getObject().getClass(), excludedProperties);
return editContext.renderForView(componentId, beanModel);
}
- public static Component viewBean(String componentId, Serializable bean, Set<String> excludeProperties) {
- return viewModel(componentId, Model.of(bean), excludeProperties);
+ public static Component viewBean(String componentId, Serializable bean, Set<String> excludedProperties) {
+ return viewModel(componentId, Model.of(bean), excludedProperties);
}
public static Component viewBean(String componentId, Serializable bean) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index 3baea48aaf..4fb71dc23b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -23,7 +23,11 @@ public class BeanDescriptor implements Serializable {
this(beanClass, Sets.newHashSet());
}
- public BeanDescriptor(Class<?> beanClass, Set<String> excludeProperties) {
+ public BeanDescriptor(Class<?> beanClass, Set<String> excludedProperties) {
+ this(beanClass, excludedProperties, Sets.newHashSet());
+ }
+
+ public BeanDescriptor(Class<?> beanClass, Set<String> excludedProperties, Set<String> optionalProperties) {
this.beanClass = beanClass;
propertyDescriptors = new ArrayList<>();
@@ -36,7 +40,8 @@ public class BeanDescriptor implements Serializable {
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyGetter);
propertyDescriptors.add(propertyDescriptor);
String propertyName = BeanUtils.getPropertyName(propertyGetter);
- propertyDescriptor.setExcluded(BeanUtils.findSetter(propertyGetter) == null || excludeProperties.contains(propertyName));
+ propertyDescriptor.setExcluded(BeanUtils.findSetter(propertyGetter) == null || excludedProperties.contains(propertyName));
+ propertyDescriptor.setOptional(optionalProperties.contains(propertyName));
}
}
}
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.java
index 99072c82bd..c492e3b072 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
@@ -10,7 +10,6 @@ import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.Broadcast;
@@ -33,8 +32,6 @@ import org.apache.wicket.validation.IValidator;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.GroovyUtils;
-import io.onedev.server.util.JsoupUtils;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.editable.annotation.DefaultValueProvider;
@@ -144,9 +141,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
nameContainer = this;
valueContainer = this;
}
- String name = EditableUtils.getName(propertyContext.getPropertyGetter());
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
- Label nameLabel = new Label("name", name);
+ Label nameLabel = new Label("name", propertyContext.getDisplayName(this));
nameContainer.add(nameLabel);
OmitName omitName = propertyContext.getPropertyGetter().getAnnotation(OmitName.class);
@@ -190,18 +185,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
PropertyEditor<Serializable> propertyEditor = propertyContext.renderForEdit("value", Model.of(propertyValue));
valueContainer.add(propertyEditor);
- String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());
- if (description != null) {
- OneContext.push(new ComponentContext(this));
- try {
- description = Application.get().getResourceSettings().getLocalizer().getString(description, this, description);
- description = GroovyUtils.evalGString(description);
- description = JsoupUtils.clean(description).body().html();
- } finally {
- OneContext.pop();
- }
- }
- descriptionLabel = new Label("description", description) {
+ descriptionLabel = new Label("description", propertyContext.getDescription(this)) {
@Override
protected void onConfigure() {
@@ -344,7 +328,13 @@ public class BeanEditor extends ValueEditor<Serializable> {
continue;
}
ErrorContext errorContext = getErrorContext(valuePath);
- errorContext.addError(violation.getMessage());
+ if (errorContext instanceof PropertyEditor) {
+ PropertyEditor<?> propertyEditor = (PropertyEditor<?>) errorContext;
+ if (!propertyEditor.getPropertyDescriptor().isOptional() || violation.getInvalidValue() != null)
+ errorContext.addError(violation.getMessage());
+ } else {
+ errorContext.addError(violation.getMessage());
+ }
}
}
@@ -395,7 +385,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
public String getPropertyName(String name) {
for (PropertyContext<?> propertyContext: propertyContexts) {
- String displayName = EditableUtils.getName(propertyContext.getPropertyGetter());
+ String displayName = EditableUtils.getDisplayName(propertyContext.getPropertyGetter());
if (propertyContext.getPropertyName().equals(name) || displayName.equals(name))
return propertyContext.getPropertyName();
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
index c0e92e5d21..0670de207b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java
@@ -5,7 +5,6 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -17,7 +16,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.editable.annotation.OmitName;
@SuppressWarnings("serial")
@@ -49,9 +47,8 @@ public class BeanViewer extends Panel implements PropertyContextAware, EditConte
WebMarkupContainer valueTd = new WebMarkupContainer("value");
item.add(valueTd);
- String name = EditableUtils.getName(propertyGetter);
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
- Component content = new Label("content", name);
+ String displayName = propertyContext.getDisplayName(this);
+ Component content = new Label("content", displayName);
nameTd.add(content);
OmitName omitName = propertyGetter.getAnnotation(OmitName.class);
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java b/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
index d86fa9fc08..5fb7ce0bdd 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyContext.java
@@ -101,6 +101,7 @@ public abstract class PropertyContext<T> extends PropertyDescriptor {
public static PropertyContext<Serializable> of(PropertyDescriptor propertyDescriptor) {
PropertyContext<Serializable> propertyContext = of(propertyDescriptor.getBeanClass(), propertyDescriptor.getPropertyName());
propertyContext.setExcluded(propertyDescriptor.isExcluded());
+ propertyContext.setOptional(propertyDescriptor.isOptional());
return propertyContext;
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
index c0cf837076..11f4a81ad8 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java
@@ -9,10 +9,14 @@ import java.util.Set;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.util.GroovyUtils;
+import io.onedev.server.util.JsoupUtils;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.editable.annotation.ShowCondition;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.utils.BeanUtils;
@@ -28,6 +32,8 @@ public class PropertyDescriptor implements Serializable {
private boolean excluded;
+ private boolean optional;
+
private final Set<String> dependencyPropertyNames = new HashSet<>();
private transient Method propertyGetter;
@@ -78,6 +84,14 @@ public class PropertyDescriptor implements Serializable {
this.excluded = excluded;
}
+ public boolean isOptional() {
+ return optional;
+ }
+
+ public void setOptional(boolean optional) {
+ this.optional = optional;
+ }
+
public void copyProperty(Object fromBean, Object toBean) {
setPropertyValue(toBean, getPropertyValue(fromBean));
}
@@ -103,10 +117,15 @@ public class PropertyDescriptor implements Serializable {
}
public boolean isPropertyRequired() {
- return getPropertyGetter().getReturnType().isPrimitive()
- || getPropertyGetter().getAnnotation(NotNull.class) != null
- || getPropertyGetter().getAnnotation(NotEmpty.class) != null
- || getPropertyGetter().getAnnotation(Size.class) != null && getPropertyGetter().getAnnotation(Size.class).min()>=1;
+ if (getPropertyGetter().getReturnType().isPrimitive()) {
+ return true;
+ } else if (isOptional()) {
+ return false;
+ } else {
+ return getPropertyGetter().getAnnotation(NotNull.class) != null
+ || getPropertyGetter().getAnnotation(NotEmpty.class) != null
+ || getPropertyGetter().getAnnotation(Size.class) != null && getPropertyGetter().getAnnotation(Size.class).min()>=1;
+ }
}
public boolean isPropertyVisible(PropertyContextAware propertyContextAware) {
@@ -138,4 +157,24 @@ public class PropertyDescriptor implements Serializable {
return dependencyPropertyNames;
}
+ public String getDisplayName(Component component) {
+ String displayName = EditableUtils.getDisplayName(getPropertyGetter());
+ return Application.get().getResourceSettings().getLocalizer().getString(displayName, component, displayName);
+ }
+
+ public String getDescription(Component component) {
+ String description = EditableUtils.getDescription(getPropertyGetter());
+ if (description != null) {
+ OneContext.push(new ComponentContext(component));
+ try {
+ description = Application.get().getResourceSettings().getLocalizer().getString(description, component, description);
+ description = GroovyUtils.evalGString(description);
+ return JsoupUtils.clean(description).body().html();
+ } finally {
+ OneContext.pop();
+ }
+ } else {
+ return null;
+ }
+ }
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
index bd8336d975..dfbf6b38a5 100644
--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java
@@ -41,7 +41,8 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {
for (Object each: violations) {
ConstraintViolation<?> violation = (ConstraintViolation<?>) each;
- addError(violation.getMessage());
+ if (violation.getInvalidValue() != null || !propertyDescriptor.isOptional())
+ addError(violation.getMessage());
}
}
diff --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.java
index 7ce43bc5ff..7e04543006 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
@@ -143,7 +143,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
- item.add(new Label("header", EditableUtils.getName(item.getModelObject().getPropertyGetter())));
+ item.add(new Label("header", EditableUtils.getDisplayName(item.getModelObject().getPropertyGetter())));
item.add(AttributeAppender.append("class", " " + item.getModelObject().getPropertyName()));
String required;
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
index daa1d49140..b7e3941f67 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
@@ -43,7 +43,7 @@ public class BeanListPropertyViewer extends Panel {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
- item.add(new Label("header", EditableUtils.getName(item.getModelObject().getPropertyGetter())));
+ item.add(new Label("header", EditableUtils.getDisplayName(item.getModelObject().getPropertyGetter())));
}
});
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.java
index 8f7b9b80d1..4d453d250d 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
@@ -37,6 +37,7 @@ public class BooleanPropertyEditor extends PropertyEditor<Boolean> {
}
});
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
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.java
index 427b323fb0..9f027efa4f 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
@@ -39,6 +39,7 @@ public class NullableBooleanPropertyEditor extends PropertyEditor<Boolean> {
stringValue = null;
}
input = new DropDownChoice<String>("input", Model.of(stringValue), Lists.newArrayList("yes", "no"));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.setNullValid(true);
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.java
index 50366ff6e6..01a7a4cbfe 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
@@ -47,7 +47,8 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {
projectAndBranches.addAll(getModelObject());
input = new BranchMultiChoice("input", new Model(projectAndBranches), branchProvider);
-
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
add(input);
}
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.java
index 7be1c0c2c9..fc0033f8d1 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
@@ -42,7 +42,7 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {
// add this to control allowClear flag of select2
input.setRequired(propertyDescriptor.isPropertyRequired());
- input.setLabel(Model.of("Branch selection"));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
index c83149f8f5..7faccb4e15 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java
@@ -5,6 +5,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.Project;
@@ -37,6 +38,7 @@ public class BranchPatternEditor extends PropertyEditor<String> {
}
}));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
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.java
index 1d7c35a198..3c69170789 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
@@ -101,6 +101,8 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
};
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
input.add(new AjaxFormComponentUpdatingBehavior("change"){
@Override
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.java
index aede1ab8ff..d87ba17642 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
@@ -90,6 +90,8 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
}
};
+
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
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.java
index a520dfd0fb..56f0e5ce37 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
@@ -43,7 +43,9 @@ public class DatePropertyEditor extends PropertyEditor<Date> {
input.setType(getPropertyDescriptor().getPropertyClass());
Method propertyGetter = getPropertyDescriptor().getPropertyGetter();
if (propertyGetter.getAnnotation(OmitName.class) != null)
- input.add(AttributeModifier.replace("placeholder", EditableUtils.getName(propertyGetter)));
+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(propertyGetter)));
+
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
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.java
index 629d8acf1c..4796b5cb18 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
@@ -63,6 +63,8 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
input = new DropDownChoice<String>("input", Model.of(stringValue), choices);
input.setNullValid(!getPropertyDescriptor().isPropertyRequired());
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
input.add(new AjaxFormComponentUpdatingBehavior("change"){
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java
index 16d430d944..ac42f5a332 100644
--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java
@@ -48,6 +48,7 @@ public class FileChoiceEditor extends PropertyEditor<String> {
super.onInitialize();
input = new TextField<String>("input", Model.of(getModelObject()));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new InputAssistBehavior() {
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.java
index 45ee5cc0ef..c082a78936 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
@@ -73,6 +73,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor<Collection<String>> {
input = new GroupMultiChoice("input", new Model((Serializable)groups), new GroupChoiceProvider(choices));
input.setConvertEmptyInputStringToNull(true);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
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.java
index d81a00df6a..9118ebc222 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
@@ -71,7 +71,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {
// add this to control allowClear flag of select2
input.setRequired(propertyDescriptor.isPropertyRequired());
- input.setLabel(Model.of("Group selection"));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
@Override
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.java
index 972c8b2802..640c02167d 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
@@ -27,6 +27,7 @@ public class MarkdownPropertyEditor extends PropertyEditor<String> {
super.onInitialize();
add(input = new MarkdownEditor("input", Model.of(getModelObject()), false, null));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
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.java
index e06940be5a..05edb8927b 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
@@ -30,6 +30,7 @@ public class NumericPropertyEditor extends PropertyEditor<Number> {
input = new TextField<Number>("input", Model.of(getModelObject()));
input.setType(getPropertyDescriptor().getPropertyClass());
add(input);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
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.java
index cec6126550..6c45fc03d7 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
@@ -32,11 +32,13 @@ public class ConfirmativePasswordPropertyEditor extends PropertyEditor<String> {
input = new PasswordTextField("input", Model.of(getModelObject()));
input.setResetPassword(true);
input.setRequired(false);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
inputAgain = new PasswordTextField("inputAgain", Model.of(getModelObject()));
inputAgain.setResetPassword(true);
inputAgain.setRequired(false);
+ inputAgain.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(inputAgain);
Password password = getPropertyDescriptor().getPropertyGetter().getAnnotation(Password.class);
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.java
index 862061ad51..97f0a527af 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
@@ -30,6 +30,7 @@ public class PasswordPropertyEditor extends PropertyEditor<String> {
input = new PasswordTextField("input", Model.of(getModelObject()));
input.setRequired(false);
input.setResetPassword(false);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
Password password = getPropertyDescriptor().getPropertyGetter().getAnnotation(Password.class);
diff --git a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
index bf07a87cbe..4fa97ecb40 100644
--- a/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java
@@ -5,6 +5,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.Project;
@@ -37,6 +38,7 @@ public class PathPatternEditor extends PropertyEditor<String> {
}
}));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
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.java
index a325d78f17..66b9dc5fc8 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
@@ -16,6 +16,7 @@ import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
@@ -67,10 +68,10 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
vertical = true;
}
- private String getName(Class<?> clazz) {
- String name = EditableUtils.getName(clazz);
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
- return name;
+ private String getDisplayName(Class<?> clazz) {
+ String displayName = EditableUtils.getDisplayName(clazz);
+ displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);
+ return displayName;
}
@Override
@@ -89,7 +90,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
List<String> implementationNames = new ArrayList<String>();
for (Class<?> each: implementations)
- implementationNames.add(getName(each));
+ implementationNames.add(getDisplayName(each));
WebMarkupContainer typeSelectorContainer = new WebMarkupContainer("typeSelectorContainer");
typeSelectorContainer.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@@ -116,7 +117,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
public String getObject() {
Component beanEditor = fragment.get(BEAN_EDITOR_ID);
if (beanEditor instanceof BeanEditor) {
- return EditableUtils.getName(((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass());
+ return EditableUtils.getDisplayName(((BeanEditor) beanEditor).getBeanDescriptor().getBeanClass());
} else {
return null;
}
@@ -126,7 +127,7 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
public void setObject(String object) {
Serializable propertyValue = null;
for (Class<?> each: implementations) {
- if (getName(each).equals(object)) {
+ if (getDisplayName(each).equals(object)) {
try {
propertyValue = (Serializable) each.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
@@ -153,6 +154,8 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {
typeSelector.setNullValid(!getPropertyDescriptor().isPropertyRequired());
+ typeSelector.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
typeSelector.add(new AjaxFormComponentUpdatingBehavior("change"){
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
index eb69ca45f9..c4c5713c67 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java
@@ -50,10 +50,10 @@ public class PolymorphicPropertyViewer extends Panel {
fragment.add(AttributeAppender.append("class", " horizontal"));
add(fragment);
- String name = EditableUtils.getName(propertyValue.getClass());
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
+ String displayName = EditableUtils.getDisplayName(propertyValue.getClass());
+ displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);
- fragment.add(new Label("type", name));
+ fragment.add(new Label("type", displayName));
fragment.add(BeanContext.viewBean("beanViewer", propertyValue));
}
diff --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.java
index a7d9bc6bf6..5d2b8d09d8 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
@@ -23,6 +23,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
@@ -88,10 +89,10 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
}
}
- private String getName(Class<?> clazz) {
- String name = EditableUtils.getName(clazz);
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
- return name;
+ private String getDisplayName(Class<?> clazz) {
+ String displayName = EditableUtils.getDisplayName(clazz);
+ displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);
+ return displayName;
}
@Override
@@ -101,7 +102,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
if (getPropertyDescriptor().isPropertyRequired()) {
add(new WebMarkupContainer("enable").setVisible(false));
} else {
- add(new CheckBox("enable", new IModel<Boolean>() {
+ CheckBox checkBox = new CheckBox("enable", new IModel<Boolean>() {
@Override
public void detach() {
@@ -118,15 +119,17 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
PolymorphicListPropertyEditor.this.get("listEditor").setVisible(object);
}
- }).add(new AjaxFormComponentUpdatingBehavior("change") {
+ });
+ checkBox.add(new AjaxFormComponentUpdatingBehavior("change") {
@Override
protected void onUpdate(AjaxRequestTarget target) {
target.add(PolymorphicListPropertyEditor.this.get("listEditor"));
}
- }));
-
+ });
+ checkBox.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+ add(checkBox);
}
List<Serializable> list = getModelObject();
@@ -254,7 +257,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
List<String> implementationNames = new ArrayList<String>();
for (Class<?> each: implementations)
- implementationNames.add(getName(each));
+ implementationNames.add(getDisplayName(each));
row.add(new DropDownChoice<String>("elementTypeSelector", new IModel<String>() {
@@ -266,7 +269,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
public String getObject() {
Component elementEditor = row.get("elementEditor");
if (elementEditor.isVisible()) {
- return EditableUtils.getName(((BeanEditor) elementEditor).getBeanDescriptor().getBeanClass());
+ return EditableUtils.getDisplayName(((BeanEditor) elementEditor).getBeanDescriptor().getBeanClass());
} else {
return null;
}
@@ -275,7 +278,7 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializa
@Override
public void setObject(String object) {
for (Class<?> each: implementations) {
- if (getName(each).equals(object)) {
+ if (getDisplayName(each).equals(object)) {
Serializable element;
try {
element = (Serializable) each.newInstance();
diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java
index 1cb9762037..f87c1f4240 100644
--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java
+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyViewer.java
@@ -61,9 +61,9 @@ public class PolymorphicListPropertyViewer extends Panel {
fragment = new Fragment("content", "verticalFrag", PolymorphicListPropertyViewer.this);
item.add(fragment);
- String name = EditableUtils.getName(item.getModelObject().getClass());
- name = Application.get().getResourceSettings().getLocalizer().getString(name, this, name);
- fragment.add(new Label("elementType", name));
+ String displayName = EditableUtils.getDisplayName(item.getModelObject().getClass());
+ displayName = Application.get().getResourceSettings().getLocalizer().getString(displayName, this, displayName);
+ fragment.add(new Label("elementType", displayName));
fragment.add(BeanContext.viewBean("element", item.getModelObject()));
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
index 9181626d95..b89fb17b94 100644
--- a/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java
@@ -4,6 +4,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.Project;
@@ -35,7 +36,9 @@ public class ReviewRequirementSpecEditor extends PropertyEditor<String> {
}
}, getModel());
-
+
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
add(input);
add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
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.java
index 7d976f3a00..e44a9347b3 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
@@ -33,6 +33,7 @@ public class ScriptPropertyEditor extends PropertyEditor<String> {
add(container);
container.add(input = new TextArea<String>("input", Model.of(getModelObject())));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.setOutputMarkupId(true);
container.add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
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.java
index c60d9072ac..e029f7e31b 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
@@ -48,6 +48,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {
input.setType(getPropertyDescriptor().getPropertyClass());
add(fragment);
}
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
@@ -59,7 +60,7 @@ public class StringPropertyEditor extends PropertyEditor<String> {
});
if (getter.getAnnotation(OmitName.class) != null)
- input.add(AttributeModifier.replace("placeholder", EditableUtils.getName(getter)));
+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
diff --git a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
index acb4544ede..a78eb5fc7a 100644
--- a/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java
@@ -5,6 +5,7 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.model.Project;
@@ -29,6 +30,7 @@ public class TagPatternEditor extends PropertyEditor<String> {
super.onInitialize();
input = new TextField<String>("input", getModel());
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new TagPatternAssistBehavior(new AbstractReadOnlyModel<Project>() {
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.java
index 7575e43da3..b42d6e31f9 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
@@ -74,6 +74,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
input = new UserMultiChoice("input", new Model((Serializable)users), new UserChoiceProvider(choices));
input.setConvertEmptyInputStringToNull(true);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
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.java
index a1bfc11599..07bdd2c872 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
@@ -72,7 +72,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
// add this to control allowClear flag of select2
input.setRequired(propertyDescriptor.isPropertyRequired());
- input.setLabel(Model.of("User selection"));
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
diff --git a/core/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java
index 93629b1c97..4eb04d28ab 100644
--- a/core/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java
@@ -39,6 +39,7 @@ public class VerificationMultiChoiceEditor extends PropertyEditor<List<String>>
input = new VerificationMultiChoice("input", new Model((Serializable) verifications),
new VerificationChoiceProvider());
input.setConvertEmptyInputStringToNull(true);
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
add(input);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java
index b639c7b647..830547fafe 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java
@@ -106,7 +106,7 @@ public class IssueFieldsPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
InputSpec field = rowModel.getObject();
- cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getName(field.getClass()), false));
+ cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getDisplayName(field.getClass()), false));
}
});
@@ -179,7 +179,7 @@ public class IssueFieldsPage extends IssueWorkflowPage {
@Override
protected String getTitle() {
- return getField().getName() + " (type: " + EditableUtils.getName(getField().getClass()) + ")";
+ return getField().getName() + " (type: " + EditableUtils.getDisplayName(getField().getClass()) + ")";
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/test/Bean.java b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
index 72f97060c0..15a7bb5302 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/Bean.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/Bean.java
@@ -1,15 +1,9 @@
package io.onedev.server.web.page.test;
import java.io.Serializable;
-import java.util.List;
-
-import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
-import com.google.common.collect.Lists;
-
-import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Editable;
@Editable
@@ -17,20 +11,9 @@ public class Bean implements Serializable {
private static final long serialVersionUID = 1L;
- private List<String> states;
-
private String name;
-
- @Editable(order=100)
- @ChoiceProvider("getStateChoices")
- @Size(min=1, message="At least one state must be defined")
- public List<String> getStates() {
- return states;
- }
-
- public void setStates(List<String> states) {
- this.states = states;
- }
+
+ private int age;
@Editable(order=200)
@NotEmpty
@@ -42,8 +25,13 @@ public class Bean implements Serializable {
this.name = name;
}
- @SuppressWarnings("unused")
- private static List<String> getStateChoices() {
- return Lists.newArrayList("Open", "Closed");
+ @Editable(order=300)
+ public int getAge() {
+ return age;
}
+
+ public void setAge(int age) {
+ this.age = age;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 977a2c73e2..b887c0c191 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,4 +1,8 @@
<wicket:extend>
<div class="center-box">
+ <form wicket:id="form">
+ <div wicket:id="editor"></div>
+ <button type="submit" class="btn btn-default">Submit</button>
+ </form>
</div>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index f4557125f8..5577997f97 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,5 +1,10 @@
package io.onedev.server.web.page.test;
+import org.apache.wicket.markup.html.form.Form;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -8,6 +13,18 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ Bean bean = new Bean();
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ }
+
+ };
+ form.add(BeanContext.editBean("editor", bean, Sets.newHashSet(), Sets.newHashSet("age")));
+ add(form);
}
}