Skip to content

Commit 40b80f9

Browse files
committed
Refactored CustomForm
1 parent 6a25836 commit 40b80f9

File tree

5 files changed

+14
-24
lines changed

5 files changed

+14
-24
lines changed

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ List<SelectableElement> elements = Arrays.asList(
6565
new SelectableElement("Option 3")
6666
);
6767

68-
form.addElement(new Label("This is a test"))
69-
.addElement("Easy way to add a label")
70-
.addElement("my-text", new Input("A sample input"))
71-
.addElement("my-toggle", new Toggle("Toggle?", true))
72-
.addElement("my-dd", new Dropdown("Dropdown", elements))
73-
.addElement(new Dropdown("Dropdown with default value", elements, 1))
74-
.addElement("my-ss", new StepSlider("Step slider", elements, 2));
68+
form.add(new Label("This is a test"))
69+
.add("Easy way to add a label")
70+
.add("my-text", new Input("A sample input"))
71+
.add("my-toggle", new Toggle("Toggle?", true))
72+
.add("my-dd", new Dropdown("Dropdown", elements))
73+
.add(new Dropdown("Dropdown with default value", elements, 1))
74+
.add("my-ss", new StepSlider("Step slider", elements, 2));
7575

7676
form.setHandler((p, response) -> {
7777
//We can get by id and index
@@ -86,6 +86,8 @@ form.setHandler((p, response) -> {
8686
el = response.getStepSlider("my-ss").getValue();
8787
p.sendMessage(el.getText());
8888
});
89+
90+
form.send(player);
8991
```
9092

9193
### Async handling

src/main/java/ru/contentforge/formconstructor/form/CustomForm.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ public CustomForm setTitle(String title){
4343
return this;
4444
}
4545

46-
public CustomForm addElement(String text){
47-
return addElement(new Label(text));
46+
public CustomForm add(String text){
47+
return add(new Label(text));
4848
}
4949

50-
public CustomForm addElement(CustomFormElement element){
50+
public CustomForm add(CustomFormElement element){
5151
elements.add(element);
5252
return this;
5353
}
5454

55-
public CustomForm addElement(String elementId, CustomFormElement element){
55+
public CustomForm add(String elementId, CustomFormElement element){
5656
element.elementId = elementId;
5757
containsId.add(elementId);
58-
return addElement(element);
58+
return add(element);
5959
}
6060

6161
public CustomForm setHandler(CustomFormHandler handler){

src/main/java/ru/contentforge/formconstructor/form/element/Dropdown.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ public class Dropdown extends CustomFormElement {
1414
@Getter protected transient List<SelectableElement> elements = new ArrayList<>();
1515
@Getter protected transient int selectedIndex = -1;
1616

17-
public Dropdown(List<SelectableElement> elements){
18-
this("", elements);
19-
}
20-
2117
public Dropdown(String name, List<SelectableElement> elements){
2218
this(name, elements, 0);
2319
}

src/main/java/ru/contentforge/formconstructor/form/element/StepSlider.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ public class StepSlider extends CustomFormElement {
1414
@Getter protected transient List<SelectableElement> elements = new ArrayList<>();
1515
@Getter protected transient int selectedIndex = -1;
1616

17-
public StepSlider(List<SelectableElement> elements){
18-
this("", elements);
19-
}
20-
2117
public StepSlider(String name, List<SelectableElement> elements){
2218
this(name, elements, 0);
2319
}

src/main/java/ru/contentforge/formconstructor/form/element/Toggle.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ public class Toggle extends CustomFormElement {
77
@SerializedName("default") protected final boolean defaultValue;
88
protected transient boolean value;
99

10-
public Toggle(){
11-
this("");
12-
}
13-
1410
public Toggle(String name){
1511
this(name, false);
1612
}

0 commit comments

Comments
 (0)