From 93f8a11aac5ae7900e363510f64878e83b146a59 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Sat, 29 May 2021 12:15:36 +0300 Subject: [PATCH] [Build] Remove lomok from imgui-app --- config/checkstyle/suppressions.xml | 1 + imgui-app/build.gradle | 1 - imgui-app/lombok.config | 2 -- imgui-app/src/main/java/imgui/app/Color.java | 32 ++++++++++++++--- .../main/java/imgui/app/Configuration.java | 35 +++++++++++++++++-- imgui-app/src/main/java/imgui/app/Window.java | 6 ++-- 6 files changed, 64 insertions(+), 13 deletions(-) delete mode 100644 imgui-app/lombok.config diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml index 1a8371f..83e4a8c 100644 --- a/config/checkstyle/suppressions.xml +++ b/config/checkstyle/suppressions.xml @@ -12,4 +12,5 @@ + diff --git a/imgui-app/build.gradle b/imgui-app/build.gradle index c41c321..e09e4c5 100644 --- a/imgui-app/build.gradle +++ b/imgui-app/build.gradle @@ -1,6 +1,5 @@ plugins { id 'java-library' - id 'io.freefair.lombok' version '6.0.0-m2' id 'checkstyle' id 'maven-publish' id 'signing' diff --git a/imgui-app/lombok.config b/imgui-app/lombok.config deleted file mode 100644 index 6aa51d7..0000000 --- a/imgui-app/lombok.config +++ /dev/null @@ -1,2 +0,0 @@ -# This file is generated by the 'io.freefair.lombok' Gradle plugin -config.stopBubbling = true diff --git a/imgui-app/src/main/java/imgui/app/Color.java b/imgui-app/src/main/java/imgui/app/Color.java index 33cb78a..b77cc75 100644 --- a/imgui-app/src/main/java/imgui/app/Color.java +++ b/imgui-app/src/main/java/imgui/app/Color.java @@ -1,16 +1,16 @@ package imgui.app; -import lombok.Data; -import lombok.NoArgsConstructor; +import java.util.Arrays; /** * Object for color data. */ -@Data -@NoArgsConstructor public class Color implements Cloneable { private final float[] data = new float[4]; + public Color() { + } + public Color(final float[] color) { set(color); } @@ -49,6 +49,30 @@ public class Color implements Cloneable { return data[3]; } + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final Color color = (Color) o; + return Arrays.equals(data, color.data); + } + + @Override + public int hashCode() { + return Arrays.hashCode(data); + } + + @Override + public String toString() { + return "Color{" + + "data=" + Arrays.toString(data) + + '}'; + } + /** * Method to clone Color instance. * diff --git a/imgui-app/src/main/java/imgui/app/Configuration.java b/imgui-app/src/main/java/imgui/app/Configuration.java index 3692504..4c52a0e 100644 --- a/imgui-app/src/main/java/imgui/app/Configuration.java +++ b/imgui-app/src/main/java/imgui/app/Configuration.java @@ -1,11 +1,8 @@ package imgui.app; -import lombok.Data; - /** * Data class to provide basic information about the window. Like, the title name etc. */ -@Data public class Configuration { /** * Application title. @@ -23,4 +20,36 @@ public class Configuration { * When true, application will be maximized by default. */ private boolean fullScreen = false; + + public String getTitle() { + return title; + } + + public void setTitle(final String title) { + this.title = title; + } + + public int getWidth() { + return width; + } + + public void setWidth(final int width) { + this.width = width; + } + + public int getHeight() { + return height; + } + + public void setHeight(final int height) { + this.height = height; + } + + public boolean isFullScreen() { + return fullScreen; + } + + public void setFullScreen(final boolean fullScreen) { + this.fullScreen = fullScreen; + } } diff --git a/imgui-app/src/main/java/imgui/app/Window.java b/imgui-app/src/main/java/imgui/app/Window.java index 7b95253..166b2e6 100644 --- a/imgui-app/src/main/java/imgui/app/Window.java +++ b/imgui-app/src/main/java/imgui/app/Window.java @@ -42,7 +42,7 @@ public abstract class Window { * * @param config configuration object with basic window information */ - protected final void init(final Configuration config) { + protected void init(final Configuration config) { initWindow(config); initImGui(config); imGuiGlfw.init(handle, true); @@ -52,7 +52,7 @@ public abstract class Window { /** * Method to dispose all used application resources and destroy its window. */ - protected final void dispose() { + protected void dispose() { imGuiGl3.dispose(); imGuiGlfw.dispose(); disposeImGui(); @@ -139,7 +139,7 @@ public abstract class Window { /** * Main application loop. */ - protected final void run() { + protected void run() { while (!GLFW.glfwWindowShouldClose(handle)) { startFrame(); preProcess();