From 28f0acde249e40e1912df8cbafdaed92bde439ed Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 24 Jan 2023 15:12:15 +0100
Subject: [PATCH] Reorder methods' definitions.

For better comparaison with the generated header.
---
 lib/src/main/cpp/libkiwix/book.cpp    | 27 ++++++++++++++++++++++-----
 lib/src/main/cpp/libkiwix/library.cpp |  8 ++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/cpp/libkiwix/book.cpp b/lib/src/main/cpp/libkiwix/book.cpp
index b021565..a1fff5c 100644
--- a/lib/src/main/cpp/libkiwix/book.cpp
+++ b/lib/src/main/cpp/libkiwix/book.cpp
@@ -47,21 +47,43 @@ METHOD(void, update__Lorg_kiwix_libkiwix_JNIKiwixReader_2, jobject archive)
 }
 
 GETTER(jstring, getId)
+
 GETTER(jstring, getPath)
+
 GETTER(jboolean, isPathValid)
+
 GETTER(jstring, getTitle)
+
 GETTER(jstring, getDescription)
+
 GETTER(jstring, getLanguage)
+
 GETTER(jstring, getCreator)
+
 GETTER(jstring, getPublisher)
+
 GETTER(jstring, getDate)
+
 GETTER(jstring, getUrl)
+
 GETTER(jstring, getName)
+
 GETTER(jstring, getFlavour)
+
 GETTER(jstring, getCategory)
+
 GETTER(jstring, getTags)
+
+METHOD(jstring, getTagStr, jstring tagName) try {
+  return TO_JNI(THIS->getTagStr(TO_C(tagName)));
+} catch(...) {
+  return c2jni<std::string>("", env);
+}
+
 GETTER(jlong, getArticleCount)
+
 GETTER(jlong, getMediaCount)
+
 GETTER(jlong, getSize)
 
 METHOD0(jobjectArray, getIllustrations) {
@@ -78,8 +100,3 @@ METHOD0(jobjectArray, getIllustrations) {
 METHOD(jobject, getIllustration, jint size) {
   return BUILD_WRAPPER("org/kiwix/libkiwix/Illustration", THIS->getIllustration(TO_C(size)));
 }
-METHOD(jstring, getTagStr, jstring tagName) try {
-  return TO_JNI(THIS->getTagStr(TO_C(tagName)));
-} catch(...) {
-  return c2jni<std::string>("", env);
-}
diff --git a/lib/src/main/cpp/libkiwix/library.cpp b/lib/src/main/cpp/libkiwix/library.cpp
index 76dbb18..909ca01 100644
--- a/lib/src/main/cpp/libkiwix/library.cpp
+++ b/lib/src/main/cpp/libkiwix/library.cpp
@@ -70,13 +70,13 @@ METHOD(jint, getBookCount, jboolean localBooks, jboolean remoteBooks) {
 }
 
 GETTER(jobjectArray, getBooksIds)
-GETTER(jobjectArray, getBooksLanguages)
-GETTER(jobjectArray, getBooksCategories)
-GETTER(jobjectArray, getBooksCreators)
-GETTER(jobjectArray, getBooksPublishers)
 
 METHOD(jobjectArray, filter, jobject filterObj) {
   auto filter = getPtr<kiwix::Filter>(env, filterObj);
   return c2jni(THIS->filter(*filter), env);
 }
 
+GETTER(jobjectArray, getBooksLanguages)
+GETTER(jobjectArray, getBooksCategories)
+GETTER(jobjectArray, getBooksCreators)
+GETTER(jobjectArray, getBooksPublishers)