Version 1.26.2 release

Signed-off-by: Jason Winning <[email protected]>

pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.hypernomicon</groupId>
   <artifactId>hypernomicon</artifactId>
   <packaging>jar</packaging>
-  <version>1.26.1</version>
+  <version>1.26.2</version>
   <name>Hypernomicon</name>
   <url>http://hypernomicon.org</url>
   <inceptionYear>2012</inceptionYear>
@@ -195,7 +195,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version>
+      <version>33.0.0-jre</version>
     </dependency>
     <dependency>
       <groupId>org.jbibtex</groupId>
@@ -205,12 +205,12 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.16.1</version>
+      <version>1.17.2</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
-      <version>73.2</version>
+      <version>74.2</version>
     </dependency>
     <dependency>
       <groupId>com.github.scribejava</groupId>
@@ -230,42 +230,42 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>2.0.27</version>
+      <version>2.0.30</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
-      <version>2.8.0</version>
+      <version>2.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.7</version>
+      <version>2.0.12</version>
     </dependency>
     <dependency>
       <groupId>org.controlsfx</groupId>
       <artifactId>controlsfx</artifactId>
-      <version>11.1.2</version>
+      <version>11.2.0</version>
     </dependency>	
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <version>3.14.0</version>
     </dependency>	
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.13.0</version>
+      <version>2.15.1</version>
     </dependency>	
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.20.0</version>
+      <version>2.22.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
-      <version>1.10.0</version>
+      <version>1.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.zwobble.mammoth</groupId>

src/main/java/org/hypernomicon/Const.java

@@ -266,7 +266,7 @@ public final class Const
    * Change this and the version in pom.xml to set the application version
    * <br>
    */
-  public static final VersionNumber appVersion = new VersionNumber(1, 26, 1); // 1.26.1
+  public static final VersionNumber appVersion = new VersionNumber(1, 26, 2); // 1.26.2
 
   /**
    * This is the minimum version that the application version is able to load

src/main/java/org/hypernomicon/fileManager/FileManager.java

@@ -763,6 +763,7 @@ void paste(FileRow destRow, boolean copying, boolean dragging)
     {
       if (folderTreeWatcher.isRunning() == false)
         folderTreeWatcher.createNewWatcherAndStart();
+
       return;
     }
 

src/main/java/org/hypernomicon/view/mainText/MainTextCtrlr.java

@@ -143,6 +143,7 @@ public class MainTextCtrlr
   void hilite()                       { highlighter.hilite(); }
   public void nextSearchResult()      { highlighter.nextSearchResult(); }
   public void previousSearchResult()  { highlighter.previousSearchResult(); }
+  public void updateZoom()            { updateZoomFromPref(webView, PREF_KEY_MAINTEXT_ZOOM); }
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

src/main/java/org/hypernomicon/view/mainText/MainTextUtil.java

@@ -961,6 +961,14 @@ public static void webViewAddZoom(WebView view, String prefID)
       }
     });
 
+    updateZoomFromPref(view, prefID);
+  }
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+  public static void updateZoomFromPref(WebView view, String prefID)
+  {
     view.setZoom(zoomFactors.get(app.prefs.getInt(prefID, zoomFactors.indexOf(100))) / 100.0);
   }
 

src/main/java/org/hypernomicon/view/mainText/MainTextWrapper.java

@@ -232,6 +232,8 @@ public void showReadOnly()
 
     parentPane.getChildren().setAll(view);
 
+    updateZoomFromPref(view, PREF_KEY_MAINTEXT_ZOOM);
+
     if (curRecord == null)
     {
       we.loadContent("");
@@ -727,6 +729,8 @@ else if (curRecord != null)
     else
       editCtrlr.clear();
 
+    editCtrlr.updateZoom();
+
     if (focus) editCtrlr.focus();
 
     state = editing;