fix natives module name

Author: MORIMORI0317

native/build.gradle natives/build.gradlenative/build.gradle renamed to natives/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'signing'
 }
 group rootProject.group
-archivesBaseName = rootProject.archivesBaseName + "-native"
+archivesBaseName = rootProject.archivesBaseName + "-natives"
 version rootProject.version
 
 repositories {
@@ -32,7 +32,7 @@ publishing {
             artifactId = archivesBaseName
             from components.java
             pom {
-                name = 'FelNullJavaLibrary-Native'
+                name = 'FelNullJavaLibrary-Natives'
                 description = 'Java integrated library(native onry) used by FelNull'
                 url = 'https://github.com/TeamFelnull/'
                 licenses {

…java/dev/felnull/fnjln/FNJLNBuildIn.java …java/dev/felnull/fnjln/FNJLNBuildIn.javanative/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java renamed to natives/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java native/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java renamed to natives/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java

@@ -12,31 +12,31 @@
  *
  * @since 1.25
  */
-public class FNNativeFileChooser {
+public class FNNativesFileChooser {
     private String title;
     private String defExt;
-    private FNNativeFileChooser.Flag flag;
+    private FNNativesFileChooser.Flag flag;
     private Path initialDirectory;
     private String initialName;
-    private FNNativeFileChooser.Filter[] filters;
+    private FNNativesFileChooser.Filter[] filters;
     private int initialFilterIndex;
 
-    public FNNativeFileChooser() {
+    public FNNativesFileChooser() {
     }
 
-    public FNNativeFileChooser(String title) {
+    public FNNativesFileChooser(String title) {
         this.title = title;
     }
 
-    public FNNativeFileChooser(String title, FNNativeFileChooser.Flag flags, FNNativeFileChooser.Filter... filters) {
+    public FNNativesFileChooser(String title, FNNativesFileChooser.Flag flags, FNNativesFileChooser.Filter... filters) {
         this.title = title;
         this.flag = flags;
         this.filters = filters;
     }
 
     public static boolean isSupport() {
         try {
-            FelNullJavaLibraryNative.check();
+            FelNullJavaLibraryNatives.check();
         } catch (RuntimeException ex) {
             return false;
         }
@@ -47,7 +47,7 @@ public void setInitialDirectory(Path initialDirectory) {
         this.initialDirectory = initialDirectory;
     }
 
-    public void setFilters(FNNativeFileChooser.Filter[] filters) {
+    public void setFilters(FNNativesFileChooser.Filter[] filters) {
         this.filters = filters;
     }
 
@@ -60,17 +60,17 @@ public File[] openWindow() {
     }
 
     public File[] openWindow(long hwndId) {
-        FelNullJavaLibraryNative.check();
+        FelNullJavaLibraryNatives.check();
         if (OSs.isWindows() && OSs.isX64())
             return WindowsOpenFileName.open(this, hwndId);
         return null;
     }
 
-    public FNNativeFileChooser.Filter[] getFilters() {
+    public FNNativesFileChooser.Filter[] getFilters() {
         return filters;
     }
 
-    public FNNativeFileChooser.Flag getFlag() {
+    public FNNativesFileChooser.Flag getFlag() {
         return flag;
     }
 
@@ -111,7 +111,7 @@ public static class Flag {
          * @param allow 許可
          * @return this
          */
-        public FNNativeFileChooser.Flag allowMultiSelect(boolean allow) {
+        public FNNativesFileChooser.Flag allowMultiSelect(boolean allow) {
             this.multiSelect = allow;
             return this;
         }
@@ -122,7 +122,7 @@ public FNNativeFileChooser.Flag allowMultiSelect(boolean allow) {
          * @param explorer 表示させない
          * @return this
          */
-        public FNNativeFileChooser.Flag explorer(boolean explorer) {
+        public FNNativesFileChooser.Flag explorer(boolean explorer) {
             this.explorer = explorer;
             return this;
         }
@@ -133,7 +133,7 @@ public FNNativeFileChooser.Flag explorer(boolean explorer) {
          * @param creatEPrompt 表示するかどうか
          * @return this
          */
-        public FNNativeFileChooser.Flag creatEPrompt(boolean creatEPrompt) {
+        public FNNativesFileChooser.Flag creatEPrompt(boolean creatEPrompt) {
             this.creatEPrompt = creatEPrompt;
             return this;
         }
@@ -144,7 +144,7 @@ public FNNativeFileChooser.Flag creatEPrompt(boolean creatEPrompt) {
          * @param fileMustExist 選択できないかどうか
          * @return this
          */
-        public FNNativeFileChooser.Flag fileMustExist(boolean fileMustExist) {
+        public FNNativesFileChooser.Flag fileMustExist(boolean fileMustExist) {
             this.fileMustExist = fileMustExist;
             return this;
         }
@@ -155,7 +155,7 @@ public FNNativeFileChooser.Flag fileMustExist(boolean fileMustExist) {
          * @param hideReadOnly 隠すかどうか
          * @return this
          */
-        public FNNativeFileChooser.Flag hideReadOnly(boolean hideReadOnly) {
+        public FNNativesFileChooser.Flag hideReadOnly(boolean hideReadOnly) {
             this.hideReadOnly = hideReadOnly;
             return this;
         }
@@ -166,7 +166,7 @@ public FNNativeFileChooser.Flag hideReadOnly(boolean hideReadOnly) {
          * @param nodeReferenceLinks どうか
          * @return this
          */
-        public FNNativeFileChooser.Flag nodeReferenceLinks(boolean nodeReferenceLinks) {
+        public FNNativesFileChooser.Flag nodeReferenceLinks(boolean nodeReferenceLinks) {
             this.nodeReferenceLinks = nodeReferenceLinks;
             return this;
         }
@@ -177,7 +177,7 @@ public FNNativeFileChooser.Flag nodeReferenceLinks(boolean nodeReferenceLinks) {
          * @param readOnly 読み取り専用かどうか
          * @return this
          */
-        public FNNativeFileChooser.Flag readOnly(boolean readOnly) {
+        public FNNativesFileChooser.Flag readOnly(boolean readOnly) {
             this.readOnly = readOnly;
             return this;
         }

…v/felnull/fnjln/FNNativeFileChooser.java …/felnull/fnjln/FNNativesFileChooser.javanative/src/main/java/dev/felnull/fnjln/FNNativeFileChooser.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesFileChooser.java native/src/main/java/dev/felnull/fnjln/FNNativeFileChooser.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesFileChooser.java

@@ -9,10 +9,10 @@
  * @author MORIMORI0317
  * @since 1.32
  */
-public class FNNativeFont {
+public class FNNativesFont {
     public static boolean isSupport() {
         try {
-            FelNullJavaLibraryNative.check();
+            FelNullJavaLibraryNatives.check();
         } catch (RuntimeException ex) {
             return false;
         }
@@ -25,7 +25,7 @@ public static boolean isSupport() {
      * @return フォント名
      */
     public static String getSystemFontName() {
-        FelNullJavaLibraryNative.check();
+        FelNullJavaLibraryNatives.check();
         return WindowsSystemFont.IconTitleLogFont.getFaceName();
     }
 }

…java/dev/felnull/fnjln/FNNativeFont.java …ava/dev/felnull/fnjln/FNNativesFont.javanative/src/main/java/dev/felnull/fnjln/FNNativeFont.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesFont.java native/src/main/java/dev/felnull/fnjln/FNNativeFont.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesFont.java

@@ -11,10 +11,10 @@
  * @author MORIMORI0317
  * @since 1.32
  */
-public class FNNativeSpecialFolder {
+public class FNNativesSpecialFolder {
     public static boolean isSupport() {
         try {
-            FelNullJavaLibraryNative.check();
+            FelNullJavaLibraryNatives.check();
         } catch (RuntimeException ex) {
             return false;
         }

…felnull/fnjln/FNNativeSpecialFolder.java …elnull/fnjln/FNNativesSpecialFolder.javanative/src/main/java/dev/felnull/fnjln/FNNativeSpecialFolder.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesSpecialFolder.java native/src/main/java/dev/felnull/fnjln/FNNativeSpecialFolder.java renamed to natives/src/main/java/dev/felnull/fnjln/FNNativesSpecialFolder.java

@@ -17,7 +17,7 @@
  * @author MORIMORI0317
  * @since 1.32
  */
-public class FelNullJavaLibraryNative {
+public class FelNullJavaLibraryNatives {
     private static boolean init;
     private static boolean loaded;
 
@@ -64,7 +64,7 @@ public synchronized static void init(String libraryLocation, Path libraryPath) {
             return;
         }
 
-        InputStream stream = FNDataUtil.resourceExtractor(FelNullJavaLibraryNative.class, libraryLocation + libName);
+        InputStream stream = FNDataUtil.resourceExtractor(FelNullJavaLibraryNatives.class, libraryLocation + libName);
         if (stream != null) {
             stream = new BufferedInputStream(stream);
             try {

…null/fnjln/FelNullJavaLibraryNative.java …ull/fnjln/FelNullJavaLibraryNatives.javanative/src/main/java/dev/felnull/fnjln/FelNullJavaLibraryNative.java renamed to natives/src/main/java/dev/felnull/fnjln/FelNullJavaLibraryNatives.java native/src/main/java/dev/felnull/fnjln/FelNullJavaLibraryNative.java renamed to natives/src/main/java/dev/felnull/fnjln/FelNullJavaLibraryNatives.java

@@ -1,6 +1,6 @@
 package dev.felnull.fnjln.jni.windows;
 
-import dev.felnull.fnjln.FelNullJavaLibraryNative;
+import dev.felnull.fnjln.FelNullJavaLibraryNatives;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -20,7 +20,7 @@ public class WindowsLibrary {
      * @return パス
      */
     public static Path getSpecialFolderPath(int num) {
-        FelNullJavaLibraryNative.check();
+        FelNullJavaLibraryNatives.check();
         return Paths.get(WindowsNative.getSpecialFolderPath(num));
     }
 
@@ -37,7 +37,7 @@ public static Path getSpecialFolderPath(int num) {
      * @return フォント名
      */
     public static String getSystemFontFaceName(int num) {
-        FelNullJavaLibraryNative.check();
+        FelNullJavaLibraryNatives.check();
         return WindowsNative.getSystemFontFaceName(num);
     }
 
@@ -55,7 +55,7 @@ public static String getSystemFontFaceName(int num) {
      * @return ファイルパス
      */
     public static byte[] getOpenFileName(long hwndId, String title, String initDir, String initName, String defExt, String filter, int filterIndex, int flags) {
-        FelNullJavaLibraryNative.check();
+        FelNullJavaLibraryNatives.check();
         return WindowsNative.getOpenFileName(hwndId, title, initDir, initName, defExt, filter, filterIndex, flags);
     }
 }

…ll/fnjln/jni/windows/WindowsLibrary.java …ll/fnjln/jni/windows/WindowsLibrary.javanative/src/main/java/dev/felnull/fnjln/jni/windows/WindowsLibrary.java renamed to natives/src/main/java/dev/felnull/fnjln/jni/windows/WindowsLibrary.java native/src/main/java/dev/felnull/fnjln/jni/windows/WindowsLibrary.java renamed to natives/src/main/java/dev/felnull/fnjln/jni/windows/WindowsLibrary.java

@@ -1,6 +1,6 @@
 package dev.felnull.fnjln.jni.windows;
 
-import dev.felnull.fnjln.FNNativeFileChooser;
+import dev.felnull.fnjln.FNNativesFileChooser;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -13,7 +13,7 @@
  * @since 1.32
  */
 public class WindowsOpenFileName {
-    public static File[] open(FNNativeFileChooser fc, long hwnd) {
+    public static File[] open(FNNativesFileChooser fc, long hwnd) {
         String title = fc.getTitle() == null ? "" : fc.getTitle();
         String initDir = fc.getInitialDirectory() == null ? "" : fc.getInitialDirectory().toAbsolutePath().toString();
         String initName = fc.getInitialName() == null ? "" : fc.getInitialName();
@@ -44,16 +44,16 @@ private static String getFlgStr(int flg) {
         return "\0";
     }
 
-    private static String createFilterString(FNNativeFileChooser.Filter[] filters) {
+    private static String createFilterString(FNNativesFileChooser.Filter[] filters) {
         if (filters == null) return "";
         StringBuilder sb = new StringBuilder();
-        for (FNNativeFileChooser.Filter filter : filters) {
+        for (FNNativesFileChooser.Filter filter : filters) {
             sb.append(filter.toWindowsFilterText());
         }
         return sb.toString();
     }
 
-    private static int createFlagNum(FNNativeFileChooser.Flag flags) {
+    private static int createFlagNum(FNNativesFileChooser.Flag flags) {
         if (flags == null) return 0;
         int num = 0;
         if (flags.isCreatEPrompt())