From 52f0343ac423bac1b25f58d87894f5f3f8addc9f Mon Sep 17 00:00:00 2001 From: SpaiR Date: Tue, 16 Jun 2020 16:59:39 +0300 Subject: [PATCH] Rename package: callbacks->callback --- imgui-binding/src/main/java/imgui/ImGuiIO.java | 4 ++-- imgui-binding/src/main/java/imgui/ImGuiListClipper.java | 2 +- .../{callbacks => callback}/ImListClipperCallback.java | 2 +- .../java/imgui/{callbacks => callback}/ImStrConsumer.java | 2 +- .../java/imgui/{callbacks => callback}/ImStrSupplier.java | 2 +- imgui-binding/src/main/native/jni_callbacks.cpp | 6 +++--- imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename imgui-binding/src/main/java/imgui/{callbacks => callback}/ImListClipperCallback.java (86%) rename imgui-binding/src/main/java/imgui/{callbacks => callback}/ImStrConsumer.java (85%) rename imgui-binding/src/main/java/imgui/{callbacks => callback}/ImStrSupplier.java (84%) diff --git a/imgui-binding/src/main/java/imgui/ImGuiIO.java b/imgui-binding/src/main/java/imgui/ImGuiIO.java index 6ed1199..d42c418 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiIO.java +++ b/imgui-binding/src/main/java/imgui/ImGuiIO.java @@ -1,7 +1,7 @@ package imgui; -import imgui.callbacks.ImStrConsumer; -import imgui.callbacks.ImStrSupplier; +import imgui.callback.ImStrConsumer; +import imgui.callback.ImStrSupplier; /** * Communicate most settings and inputs/outputs to Dear ImGui using this structure. diff --git a/imgui-binding/src/main/java/imgui/ImGuiListClipper.java b/imgui-binding/src/main/java/imgui/ImGuiListClipper.java index f6f5b3a..71ca948 100644 --- a/imgui-binding/src/main/java/imgui/ImGuiListClipper.java +++ b/imgui-binding/src/main/java/imgui/ImGuiListClipper.java @@ -1,6 +1,6 @@ package imgui; -import imgui.callbacks.ImListClipperCallback; +import imgui.callback.ImListClipperCallback; /** * Helper: Manually clip large list of items. diff --git a/imgui-binding/src/main/java/imgui/callbacks/ImListClipperCallback.java b/imgui-binding/src/main/java/imgui/callback/ImListClipperCallback.java similarity index 86% rename from imgui-binding/src/main/java/imgui/callbacks/ImListClipperCallback.java rename to imgui-binding/src/main/java/imgui/callback/ImListClipperCallback.java index de459bc..5893d27 100644 --- a/imgui-binding/src/main/java/imgui/callbacks/ImListClipperCallback.java +++ b/imgui-binding/src/main/java/imgui/callback/ImListClipperCallback.java @@ -1,4 +1,4 @@ -package imgui.callbacks; +package imgui.callback; /** * Callback for {@link imgui.ImGuiListClipper} class. diff --git a/imgui-binding/src/main/java/imgui/callbacks/ImStrConsumer.java b/imgui-binding/src/main/java/imgui/callback/ImStrConsumer.java similarity index 85% rename from imgui-binding/src/main/java/imgui/callbacks/ImStrConsumer.java rename to imgui-binding/src/main/java/imgui/callback/ImStrConsumer.java index d0d2ac1..584b2be 100644 --- a/imgui-binding/src/main/java/imgui/callbacks/ImStrConsumer.java +++ b/imgui-binding/src/main/java/imgui/callback/ImStrConsumer.java @@ -1,4 +1,4 @@ -package imgui.callbacks; +package imgui.callback; /** * Callback to supply Java string form native code. diff --git a/imgui-binding/src/main/java/imgui/callbacks/ImStrSupplier.java b/imgui-binding/src/main/java/imgui/callback/ImStrSupplier.java similarity index 84% rename from imgui-binding/src/main/java/imgui/callbacks/ImStrSupplier.java rename to imgui-binding/src/main/java/imgui/callback/ImStrSupplier.java index d8f2be8..5958d81 100644 --- a/imgui-binding/src/main/java/imgui/callbacks/ImStrSupplier.java +++ b/imgui-binding/src/main/java/imgui/callback/ImStrSupplier.java @@ -1,4 +1,4 @@ -package imgui.callbacks; +package imgui.callback; /** * Callback to get Java string from native code. diff --git a/imgui-binding/src/main/native/jni_callbacks.cpp b/imgui-binding/src/main/native/jni_callbacks.cpp index 2eee850..68074e4 100644 --- a/imgui-binding/src/main/native/jni_callbacks.cpp +++ b/imgui-binding/src/main/native/jni_callbacks.cpp @@ -8,13 +8,13 @@ jmethodID jImStrSupplierGetMID; namespace Jni { void InitCallbacks(JNIEnv* env) { - jclass jImListClipperCallback = env->FindClass("imgui/callbacks/ImListClipperCallback"); + jclass jImListClipperCallback = env->FindClass("imgui/callback/ImListClipperCallback"); jImListClipperCallbackAcceptMID = env->GetMethodID(jImListClipperCallback, "accept", "(I)V"); - jclass jImStrConsumer = env->FindClass("imgui/callbacks/ImStrConsumer"); + jclass jImStrConsumer = env->FindClass("imgui/callback/ImStrConsumer"); jImStrConsumerAcceptMID = env->GetMethodID(jImStrConsumer, "accept", "(Ljava/lang/String;)V"); - jclass jImStrSupplier = env->FindClass("imgui/callbacks/ImStrSupplier"); + jclass jImStrSupplier = env->FindClass("imgui/callback/ImStrSupplier"); jImStrSupplierGetMID = env->GetMethodID(jImStrSupplier, "get", "()Ljava/lang/String;"); } diff --git a/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java b/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java index f99c844..5e9c2b8 100644 --- a/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java +++ b/imgui-lwjgl3/src/test/java/ImGuiGlfwExample.java @@ -3,8 +3,8 @@ import imgui.ImFontConfig; import imgui.ImGui; import imgui.ImGuiFreeType; import imgui.ImGuiIO; -import imgui.callbacks.ImStrConsumer; -import imgui.callbacks.ImStrSupplier; +import imgui.callback.ImStrConsumer; +import imgui.callback.ImStrSupplier; import imgui.flag.ImGuiBackendFlags; import imgui.flag.ImGuiConfigFlags; import imgui.flag.ImGuiKey;