Update dependencies and minor UI tweaks

af-a1997 · May 27, 2023 · 108934f · 108934f
1 parent cc6427b
commit 108934f
Show file tree

Hide file tree

Showing 17 changed files with 254 additions and 85 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,14 +4,17 @@
   <groupId>com.afa1997</groupId>
   <artifactId>GeoPicSorter</artifactId>
   <name>GeoPicSorter</name>
-  <version>1.0.0</version>
-  <description>GeoPicSorter is a tool being coded in Java by Aldo Franquez &lt; github.com/af-a1997 &gt;, licensed under GNU AGPL 3.0.
+  <version>1.1.0</version>
+  <description>GeoPicSorter is a tool written in Java by Aldo Franquez &lt; af-a1997.github.io &gt;, licensed under GNU AGPL 3.0.
 
-Its goal is to help the user automate the process of organizing geotagged pictures based on groups of locations such as streets, cities, etc.</description>
+Its goal is to help the user automate the process of organizing geotagged pictures based on groups of locations such as streets, cities, etc.
+
+Home page: https://af-a1997.github.io/pages/programs/GeoPicSorter/</description>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <goals>
@@ -31,9 +34,9 @@ Its goal is to help the user automate the process of organizing geotagged pictur
     </plugins>
   </build>
   <properties>
-    <maven.compiler.target>18</maven.compiler.target>
+    <maven.compiler.target>19</maven.compiler.target>
     <exec.mainClass>com.afa1997.geopicsorter.GeoPicSorter</exec.mainClass>
-    <maven.compiler.source>18</maven.compiler.source>
+    <maven.compiler.source>19</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -4,15 +4,17 @@
     <groupId>com.afa1997</groupId>
     <artifactId>GeoPicSorter</artifactId>
     <name>GeoPicSorter</name>
-    <description>GeoPicSorter is a tool being coded in Java by Aldo Franquez &lt; github.com/af-a1997 &gt;, licensed under GNU AGPL 3.0.
+    <description>GeoPicSorter is a tool written in Java by Aldo Franquez &lt; af-a1997.github.io &gt;, licensed under GNU AGPL 3.0.
 
-Its goal is to help the user automate the process of organizing geotagged pictures based on groups of locations such as streets, cities, etc.</description>
-    <version>1.0.0</version> <!-- Version of GeoPicSorter: x.y.z ; where: x = major release, y = minor release, z = hotfix -->
+Its goal is to help the user automate the process of organizing geotagged pictures based on groups of locations such as streets, cities, etc.
+
+Home page: https://af-a1997.github.io/pages/programs/GeoPicSorter/</description>
+    <version>1.1.0</version> <!-- Version of GeoPicSorter: x.y.z ; where: x = major release, y = minor release, z = hotfix -->
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>19</maven.compiler.target>
         <exec.mainClass>com.afa1997.geopicsorter.GeoPicSorter</exec.mainClass>
     </properties>
     <dependencies>
@@ -27,7 +29,7 @@ Its goal is to help the user automate the process of organizing geotagged pictur
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.39.3.0</version>
+            <version>3.42.0.0</version>
         </dependency>
 
         <!-- https://square.github.io/okhttp/ -->
@@ -41,32 +43,25 @@ Its goal is to help the user automate the process of organizing geotagged pictur
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>20230227</version>
         </dependency>
 
         <!-- https://search.maven.org/artifact/commons-io/commons-io/2.11.0/jar -->
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
         </dependency>
 
         <!-- https://github.com/srikanth-lingala/zip4j -->
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.5</version>
         </dependency>
 
         <!-- 
-            About each dependency's usage on GeoPicSorter:
-            
-            * metadata-extractor: necessary to get latitude and longitude from geotagged pictures.
-            * sqlite-jdbc: to store user preferences and picture details on SQLite databases.
-            * okhttp: to make requests to reverse geocoding API.
-            * org.json: used APIs return a JSON response body with names of places, this library is used to get the needed data.
-            * commons-io: used for I/O operations with pictures.
-            * zip4j: used on the last sorting action to package the unsorted pictures. I'm aware Java has its own library but it works with streams and is more complex to use, this means that the files' properties such as modification timestamps are lost. Zip4j has proven to be useful as only a line of code is needed to compress files, and the files' properties are preserved.
+            For information on each dependences' usage on GeoPicSorter, you may refer to the project's home page: < https://af-a1997.github.io/pages/programs/GeoPicSorter/ >
         -->
     </dependencies>
 
@@ -76,6 +71,7 @@ Its goal is to help the user automate the process of organizing geotagged pictur
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/src/main/java/com/afa1997/geopicsorter/features/ShStrings.java b/src/main/java/com/afa1997/geopicsorter/features/ShStrings.java
@@ -6,7 +6,7 @@ public class ShStrings {
 
     // Project related values.
     public static final String PROG_NAME = "GeoPicSorter";
-    public static final String PROG_VER = "1.0.0";
+    public static final String PROG_VER = "1.1.0";
     public static final String PROG_NAME_FULL = PROG_NAME + " " + PROG_VER;
     public static final String REPO_LOC = "https://github.com/af-a1997/GeoPicSorter";
 

diff --git a/src/main/java/com/afa1997/geopicsorter/frames/Preferences.form b/src/main/java/com/afa1997/geopicsorter/frames/Preferences.form
@@ -7,6 +7,9 @@
       <Connection code="ShStrings.PROG_NAME + &quot; preferences&quot;" type="code"/>
     </Property>
     <Property name="resizable" type="boolean" value="false"/>
+    <Property name="type" type="java.awt.Window$Type" editor="org.netbeans.modules.form.editors.EnumEditor">
+      <Value id="POPUP"/>
+    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>

diff --git a/src/main/java/com/afa1997/geopicsorter/frames/Preferences.java b/src/main/java/com/afa1997/geopicsorter/frames/Preferences.java
@@ -95,6 +95,7 @@ private void initComponents() {
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setTitle(ShStrings.PROG_NAME + " preferences");
         setResizable(false);
+        setType(java.awt.Window.Type.POPUP);
 
         pref_jtp_gen_ttl_lang.setFont(new java.awt.Font("sansserif", 1, 14)); // NOI18N
         pref_jtp_gen_ttl_lang.setText("Language");

diff --git a/src/main/java/com/afa1997/geopicsorter/frames/SorterProcess.form b/src/main/java/com/afa1997/geopicsorter/frames/SorterProcess.form
@@ -5,6 +5,9 @@
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" value="Sorting process"/>
     <Property name="resizable" type="boolean" value="false"/>
+    <Property name="type" type="java.awt.Window$Type" editor="org.netbeans.modules.form.editors.EnumEditor">
+      <Value id="POPUP"/>
+    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>

diff --git a/src/main/java/com/afa1997/geopicsorter/frames/SorterProcess.java b/src/main/java/com/afa1997/geopicsorter/frames/SorterProcess.java
@@ -102,6 +102,7 @@ private void initComponents() {
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
         setTitle("Sorting process");
         setResizable(false);
+        setType(java.awt.Window.Type.POPUP);
         addWindowListener(new java.awt.event.WindowAdapter() {
             public void windowOpened(java.awt.event.WindowEvent evt) {
                 formWindowOpened(evt);

diff --git a/src/main/java/com/afa1997/geopicsorter/frames/SortingCriteria.form b/src/main/java/com/afa1997/geopicsorter/frames/SortingCriteria.form
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
+  <NonVisualComponents>
+    <Component class="javax.swing.ButtonGroup" name="jbg_out_dir">
+    </Component>
+  </NonVisualComponents>
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" value="Sorting criteria"/>
     <Property name="resizable" type="boolean" value="false"/>
+    <Property name="type" type="java.awt.Window$Type" editor="org.netbeans.modules.form.editors.EnumEditor">
+      <Value id="POPUP"/>
+    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -30,32 +37,37 @@
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="jl_footnote" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="0" pref="48" max="32767" attributes="0"/>
+                      <Component id="jl_place_lev" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="jcb_sort_crit" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jck_date_sub_sort" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="jb_custom_rgn" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jtf_outdir_path" min="-2" pref="326" max="-2" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
+                      <Component id="jb_outdir_browse" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jl_title" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jl_desc" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jl_footnote" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Group type="102" alignment="0" attributes="0">
-                              <Component id="jl_place_lev" min="-2" max="-2" attributes="0"/>
+                              <Component id="jl_outdir_desc" min="-2" max="-2" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Component id="jcb_sort_crit" max="32767" attributes="0"/>
-                          </Group>
-                          <Group type="102" attributes="0">
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="jl_title" alignment="0" min="-2" max="-2" attributes="0"/>
-                                  <Component id="jl_desc" alignment="0" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jck_date_sub_sort" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="32767" attributes="0"/>
-                              <Component id="jb_custom_rgn" min="-2" max="-2" attributes="0"/>
+                              <Component id="jrb_outdir_chosen" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="jrb_outdir_custom" min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
               </Group>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -71,21 +83,26 @@
                   <Component id="jl_place_lev" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="jcb_sort_crit" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" alignment="0" attributes="0">
-                      <EmptySpace min="0" pref="146" max="32767" attributes="0"/>
-                      <Component id="jl_footnote" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="jp_toolbar" min="-2" max="-2" attributes="0"/>
-                  </Group>
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="3" attributes="0">
-                          <Component id="jb_custom_rgn" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="jck_date_sub_sort" alignment="3" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jb_custom_rgn" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jck_date_sub_sort" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jl_outdir_desc" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jrb_outdir_chosen" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jrb_outdir_custom" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jtf_outdir_path" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jb_outdir_browse" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
+              <EmptySpace pref="48" max="32767" attributes="0"/>
+              <Component id="jl_footnote" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jp_toolbar" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -188,7 +205,7 @@
         <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
           <Color blue="0" green="66" red="66" type="rgb"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="&lt;html&gt;&#xa;Sorting by location&amp;gt;date is a future planned feature, along with defining&lt;br&gt;&#xa;custom sorting criterias and sorting by block and place."/>
+        <Property name="text" type="java.lang.String" value="&lt;html&gt;&#xa;Some of the features are currently disabled because these will be&lt;br&gt;&#xa;implemented at a later update."/>
       </Properties>
     </Component>
     <Component class="javax.swing.JButton" name="jb_custom_rgn">
@@ -200,5 +217,54 @@
         <Property name="enabled" type="boolean" value="false"/>
       </Properties>
     </Component>
+    <Component class="javax.swing.JLabel" name="jl_outdir_desc">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Output directory:"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="jrb_outdir_chosen">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="jbg_out_dir"/>
+        </Property>
+        <Property name="selected" type="boolean" value="true"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="OUTDIR_DEF" type="code"/>
+        </Property>
+        <Property name="actionCommand" type="java.lang.String" value=""/>
+        <Property name="enabled" type="boolean" value="false"/>
+        <Property name="name" type="java.lang.String" value="same" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="jrb_outdir_custom">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="jbg_out_dir"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="OUTDIR_OTHER" type="code"/>
+        </Property>
+        <Property name="actionCommand" type="java.lang.String" value=""/>
+        <Property name="enabled" type="boolean" value="false"/>
+        <Property name="name" type="java.lang.String" value="custom" noResource="true"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JButton" name="jb_outdir_browse">
+      <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/icons/stock_open.png"/>
+        </Property>
+        <Property name="text" type="java.lang.String" value="Browse..."/>
+        <Property name="enabled" type="boolean" value="false"/>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jb_outdir_browseActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JTextField" name="jtf_outdir_path">
+      <Properties>
+        <Property name="enabled" type="boolean" value="false"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>