Skip to content

The Unified and Autonomous Development Platform

Format enum value when display a enum property in bean editor

robin shenb05dd358d203
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
index 7a1c8ab8b3..ef331d7674 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java
@@ -10,6 +10,7 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
public class EnumEditSupport implements EditSupport {
@@ -28,7 +29,7 @@ public class EnumEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
if (model.getObject() != null)
- return new Label(id, model.getObject().toString());
+ return new Label(id, StringUtils.capitalize(model.getObject().name().replace('_', ' ').toLowerCase()));
else
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
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 4796b5cb18..4bcf0a381d 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
@@ -7,10 +7,12 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -50,9 +52,8 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
List<String> choices = new ArrayList<>();
for (Iterator<?> it = enumSet.iterator(); it.hasNext();) {
Enum<?> value = (Enum<?>) it.next();
- if (!excludeValues.contains(value.name())) {
+ if (!excludeValues.contains(value.name()))
choices.add(value.toString());
- }
}
String stringValue;
@@ -60,7 +61,26 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
stringValue = getModelObject().toString();
else
stringValue = null;
- input = new DropDownChoice<String>("input", Model.of(stringValue), choices);
+
+ IChoiceRenderer<String> choiceRenderer = new IChoiceRenderer<String>() {
+
+ @Override
+ public Object getDisplayValue(String object) {
+ return StringUtils.capitalize(object.replace('_', ' ').toLowerCase());
+ }
+
+ @Override
+ public String getIdValue(String object, int index) {
+ return object;
+ }
+
+ @Override
+ public String getObject(String id, IModel<? extends List<? extends String>> choices) {
+ return id;
+ }
+
+ };
+ input = new DropDownChoice<String>("input", Model.of(stringValue), choices, choiceRenderer);
input.setNullValid(!getPropertyDescriptor().isPropertyRequired());
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
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 15a7bb5302..fe4c439c0d 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
@@ -2,8 +2,6 @@ package io.onedev.server.web.page.test;
import java.io.Serializable;
-import org.hibernate.validator.constraints.NotEmpty;
-
import io.onedev.server.util.editable.annotation.Editable;
@Editable
@@ -11,27 +9,17 @@ public class Bean implements Serializable {
private static final long serialVersionUID = 1L;
- private String name;
-
- private int age;
+ public enum Type {HUMAN, AMIMAL, PLANT};
- @Editable(order=200)
- @NotEmpty
- public String getName() {
- return name;
- }
+ private Type type;
- public void setName(String name) {
- this.name = name;
+ @Editable
+ public Type getType() {
+ return type;
}
- @Editable(order=300)
- public int getAge() {
- return age;
+ public void setType(Type type) {
+ this.type = type;
}
-
- public void setAge(int age) {
- this.age = age;
- }
-
+
}
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 d9c7a78095..d0948710b2 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
@@ -18,6 +18,7 @@ public class TestPage extends BasePage {
@Override
protected void onSubmit() {
super.onSubmit();
+ System.out.println(bean.getType());
}
};