Refactored CloseableForm

Author: ScarletRedMan

README.md

@@ -33,7 +33,7 @@ form.setContent("This is a text")
     .add(new Button("Same button but with image", Button.Icon.texture("textures/items/diamond"), handler));
 
 //We can set handler for null result
-form.setNoneHandler(p -> {
+form.setOnCloseHandler(p -> {
     p.sendMessage("Why you closed this form? :c");
 });
 

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

@@ -1,15 +1,15 @@
 package ru.contentforge.formconstructor.form;
 
 import lombok.Getter;
-import ru.contentforge.formconstructor.form.handler.NoneHandler;
+import ru.contentforge.formconstructor.form.handler.OnCloseFormHandler;
 
 @Getter
 abstract public class CloseableForm extends Form {
 
-    protected transient NoneHandler noneHandler = null;
+    protected transient OnCloseFormHandler onCloseHandler = null;
 
-    public CloseableForm setNoneHandler(NoneHandler noneHandler) {
-        this.noneHandler = noneHandler;
+    public CloseableForm setOnCloseHandler(OnCloseFormHandler onCloseHandler) {
+        this.onCloseHandler = onCloseHandler;
         return this;
     }
 }

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

@@ -3,7 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import ru.contentforge.formconstructor.form.element.Button;
-import ru.contentforge.formconstructor.form.handler.NoneHandler;
+import ru.contentforge.formconstructor.form.handler.OnCloseFormHandler;
 import ru.contentforge.formconstructor.form.response.SimpleFormResponse;
 
 import java.util.ArrayList;
@@ -29,14 +29,14 @@ public SimpleForm(String title, String content){
         this(title, content,null);
     }
 
-    public SimpleForm(String title, String content, NoneHandler noneHandler){
+    public SimpleForm(String title, String content, OnCloseFormHandler noneHandler){
         this(title, content, noneHandler, null);
     }
 
-    public SimpleForm(String title, String content, NoneHandler noneHandler, Collection<Button> buttons){
+    public SimpleForm(String title, String content, OnCloseFormHandler noneHandler, Collection<Button> buttons){
         this.title = title;
         this.content = content;
-        this.noneHandler = noneHandler;
+        this.onCloseHandler = noneHandler;
 
         if(buttons == null) return;
         for(Button button: buttons) add(button);

…onstructor/form/handler/NoneHandler.java …tor/form/handler/OnCloseFormHandler.javasrc/main/java/ru/contentforge/formconstructor/form/handler/NoneHandler.java renamed to src/main/java/ru/contentforge/formconstructor/form/handler/OnCloseFormHandler.java src/main/java/ru/contentforge/formconstructor/form/handler/NoneHandler.java renamed to src/main/java/ru/contentforge/formconstructor/form/handler/OnCloseFormHandler.java

@@ -2,7 +2,7 @@
 
 import cn.nukkit.Player;
 
-public interface NoneHandler extends FormHandler {
+public interface OnCloseFormHandler extends FormHandler {
 
     void handle(Player player);
 }

src/main/java/ru/contentforge/formconstructor/task/FormHandlingTask.java

@@ -5,7 +5,7 @@
 import cn.nukkit.scheduler.AsyncTask;
 import ru.contentforge.formconstructor.form.CloseableForm;
 import ru.contentforge.formconstructor.form.Form;
-import ru.contentforge.formconstructor.form.handler.NoneHandler;
+import ru.contentforge.formconstructor.form.handler.OnCloseFormHandler;
 import ru.contentforge.formconstructor.form.response.CustomFormResponse;
 import ru.contentforge.formconstructor.form.response.ModalFormResponse;
 import ru.contentforge.formconstructor.form.response.SimpleFormResponse;
@@ -30,7 +30,7 @@ public void onRun() {
         }
 
         if(response == null && form instanceof CloseableForm){
-            NoneHandler noneHandler = ((CloseableForm) form).getNoneHandler();
+            OnCloseFormHandler noneHandler = ((CloseableForm) form).getOnCloseHandler();
             if(noneHandler != null) noneHandler.handle(player);
             return;
         }