Version 1.30.3 release

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

Author: jasonwinning

pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.hypernomicon</groupId>
   <artifactId>hypernomicon</artifactId>
   <packaging>jar</packaging>
-  <version>1.30.2</version>
+  <version>1.30.3</version>
   <name>Hypernomicon</name>
   <url>http://hypernomicon.org</url>
   <inceptionYear>2012</inceptionYear>

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

@@ -41,7 +41,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, 30, 2);  // 1.30.2
+  public static final VersionNumber appVersion = new VersionNumber(1, 30, 3);  // 1.30.3
 
   /**
    * This is the minimum version that the application version (or higher) is able to load

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

@@ -34,7 +34,8 @@ final class FolderHistory
 
   private final List<FolderHistoryItem> history = new ArrayList<>();
   private final Button btnForward, btnBack;
-  private int ndx = -1;
+
+  private int cursorNdx = -1;
 
 //---------------------------------------------------------------------------
 
@@ -52,7 +53,7 @@ final class FolderHistory
   void clear()
   {
     history.clear();
-    ndx = -1;
+    cursorNdx = -1;
     updateButtons();
   }
 
@@ -63,33 +64,33 @@ void removeRecord(HDT_Folder folder)
   {
     if (folder == null) return;
 
-    for (int i = 0; i < history.size(); i++)
+    for (int ndx = 0; ndx < history.size(); ndx++)
     {
-      FolderHistoryItem item = history.get(i);
+      FolderHistoryItem item = history.get(ndx);
 
       if (item.folder == folder)
       {
-        // Update ndx if it points to or follows the deleted entry
-        if (i <= ndx)
-          ndx--;
+        // Update cursorNdx if it points to or follows the deleted entry
+        if (ndx <= cursorNdx)
+          cursorNdx--;
 
         // Remove the matching item
-        history.remove(i);
-        i--; // Adjust index to recheck after removal
+        history.remove(ndx);
+        ndx--; // Adjust index to recheck after removal
       }
-      else if ((i > 0) && (history.get(i - 1).folder == item.folder))
+      else if ((ndx > 0) && (history.get(ndx - 1).folder == item.folder))
       {
         // Remove adjacent duplicates
-        history.remove(i);
-        i--; // Adjust index for recheck
+        history.remove(ndx);
+        ndx--; // Adjust index for recheck
       }
     }
 
-    // Ensure ndx is valid after all deletions
-    if (ndx < 0)
-      ndx = 0; // Default to the first folder if no valid preceding folder exists
-    else if (ndx >= history.size())
-      ndx = history.size() - 1; // Default to the last folder if out of bounds
+    // Ensure cursorNdx is valid after all deletions
+    if (cursorNdx < 0)
+      cursorNdx = 0; // Default to the first folder if no valid preceding folder exists
+    else if (cursorNdx >= history.size())
+      cursorNdx = history.size() - 1; // Default to the last folder if out of bounds
 
     // Update navigation buttons
     updateButtons();
@@ -105,11 +106,11 @@ else if (ndx >= history.size())
    */
   void add(FolderHistoryItem newItem)
   {
-    while (history.size() > (ndx + 1))
-      history.remove(ndx + 1);
+    while (history.size() > (cursorNdx + 1))
+      history.remove(cursorNdx + 1);
 
     history.add(newItem);
-    ndx++;
+    cursorNdx++;
     updateButtons();
   }
 
@@ -118,8 +119,8 @@ void add(FolderHistoryItem newItem)
 
   private void updateButtons()
   {
-    btnBack   .setDisable(ndx < 1);
-    btnForward.setDisable(ndx == (history.size() - 1));
+    btnBack   .setDisable(cursorNdx < 1);
+    btnForward.setDisable(cursorNdx == (history.size() - 1));
   }
 
 //---------------------------------------------------------------------------
@@ -131,9 +132,9 @@ private void updateButtons()
    */
   FolderHistoryItem back()
   {
-    ndx--;
+    cursorNdx--;
     updateButtons();
-    return history.get(ndx);
+    return history.get(cursorNdx);
   }
 
 //---------------------------------------------------------------------------
@@ -145,9 +146,9 @@ FolderHistoryItem back()
    */
   FolderHistoryItem forward()
   {
-    ndx++;
+    cursorNdx++;
     updateButtons();
-    return history.get(ndx);
+    return history.get(cursorNdx);
   }
 
 //---------------------------------------------------------------------------
@@ -159,7 +160,7 @@ FolderHistoryItem forward()
    */
   void updateCurrent(FolderHistoryItem newItem)
   {
-    history.set(ndx, newItem);
+    history.set(cursorNdx, newItem);
   }
 
 //---------------------------------------------------------------------------

src/main/java/org/hypernomicon/view/HyperViewSequence.java

@@ -54,7 +54,7 @@ public class HyperViewSequence
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
-  private int curNdx = -1;
+  private int cursorNdx = -1;
   private Instant lastArrowKey = Instant.EPOCH;
   private final List<HyperView<? extends HDT_Record>> slots = new ArrayList<>();
   private final TabPane tabPane;
@@ -104,7 +104,7 @@ public class HyperViewSequence
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
-  HyperView<? extends HDT_Record> getViewInCurrentSlot()                        { return slots.get(curNdx); }
+  HyperView<? extends HDT_Record> getViewInCurrentSlot()                        { return slots.get(cursorNdx); }
   HyperTab<? extends HDT_Record, ? extends HDT_Record> tabOfViewInCurrentSlot() { return getViewInCurrentSlot().getHyperTab(); }
   TabEnum tabEnumOfViewInCurrentSlot()                                          { return getViewInCurrentSlot().getTabEnum();  }
   boolean isEmpty()                                                             { return slots.isEmpty(); }
@@ -179,8 +179,8 @@ void stepBack()
   {
     saveViewFromUItoCurrentSlotAndTab();
 
-    if (--curNdx < 0)
-      curNdx = 0;
+    if (--cursorNdx < 0)
+      cursorNdx = 0;
 
     showCurrentViewInUI();
   }
@@ -219,12 +219,12 @@ void saveViewFromUItoSlotAdvanceCursorAndLoadNewViewToUI(HyperView<? extends HDT
     }
 
     // delete any later slots
-    while (slots.size() > (curNdx + 1))
-      slots.remove(curNdx + 1);
+    while (slots.size() > (cursorNdx + 1))
+      slots.remove(cursorNdx + 1);
 
     // advance the slot cursor (if we were already on a record tab that previously had a record)
     if (advance)
-      goForward(true); // This only changes curNdx
+      goForward(true); // This only changes cursorNdx
 
     // Save the new view to the current slot
     saveViewToCurrentSlot(hyperView);
@@ -247,8 +247,8 @@ private void showCurrentViewInUI()
 
     ui.setSelectorTab(ui.tabOmniSelector);
 
-    chbBack   .setDisable(curNdx < 1);
-    chbForward.setDisable(curNdx >= (slots.size() - 1));
+    chbBack   .setDisable(cursorNdx < 1);
+    chbForward.setDisable(cursorNdx >= (slots.size() - 1));
 
     HDT_Record activeRecord = (curHyperTab.getTabEnum() == treeTabEnum) || (curHyperTab.getTabEnum() == queryTabEnum) ?
       curView.getViewRecord()
@@ -294,18 +294,18 @@ void init(TabEnum activeTabEnum)
   public void clear()
   {
     slots.clear();
-    curNdx = -1;
+    cursorNdx = -1;
   }
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
   private void goForward(boolean okToAddSlotIfNeeded)
   {
-    curNdx++;
+    cursorNdx++;
 
-    if ((okToAddSlotIfNeeded == false) && (curNdx >= slots.size()))
-      curNdx = slots.size() - 1;
+    if ((okToAddSlotIfNeeded == false) && (cursorNdx >= slots.size()))
+      cursorNdx = slots.size() - 1;
   }
 
 //---------------------------------------------------------------------------
@@ -317,12 +317,12 @@ private void goForward(boolean okToAddSlotIfNeeded)
    */
   private void saveViewToCurrentSlot(HyperView<? extends HDT_Record> view)
   {
-    if (curNdx == -1) curNdx = 0;
+    if (cursorNdx == -1) cursorNdx = 0;
 
-    if (curNdx == slots.size())
+    if (cursorNdx == slots.size())
       slots.add(view);
     else
-      slots.set(curNdx, view);
+      slots.set(cursorNdx, view);
 
     // This next part prevents duplicate adjacent entries
 
@@ -337,7 +337,7 @@ private void saveViewToCurrentSlot(HyperView<? extends HDT_Record> view)
       if ((lastView != null) && (view.getTabEnum() == lastView.getTabEnum()) && (view.getViewRecord() == lastView.getViewRecord()))
       {
         it.remove();
-        if (ndx <= curNdx) curNdx--;
+        if (ndx <= cursorNdx) cursorNdx--;
         view = null;
       }
 
@@ -360,12 +360,12 @@ private void rebuildNavMenu(List<MenuItem> menu, boolean isForward)
 
     if (isForward)
     {
-      for (int ndx = curNdx + 1; ndx < slots.size(); ndx++)
+      for (int ndx = cursorNdx + 1; ndx < slots.size(); ndx++)
         if (addMenuItem(menu, ndx)) return;
     }
     else
     {
-      for (int ndx = curNdx - 1; ndx >= 0; ndx--)
+      for (int ndx = cursorNdx - 1; ndx >= 0; ndx--)
         if (addMenuItem(menu, ndx)) return;
     }
   }
@@ -409,7 +409,7 @@ private boolean addMenuItem(List<MenuItem> menu, int ndx)
       if (ui.cantSaveRecord()) return;
 
       saveViewFromUItoCurrentSlotAndTab();
-      curNdx = ndx;
+      cursorNdx = ndx;
       showCurrentViewInUI();
     });
 
@@ -422,14 +422,14 @@ private boolean addMenuItem(List<MenuItem> menu, int ndx)
 
   void removeRecord(HDT_Record record)
   {
-    // Do not change the following code to use ArrayList.removeIf. The line that checks whether curNdx should be decremented will not work
+    // Do not change the following code to use ArrayList.removeIf. The line that checks whether cursorNdx should be decremented will not work
     // because the ArrayList does not actually get modified until all of the removeIf checks are completed.
 
     Iterators.removeIf(slots.iterator(), view ->
     {
       if (view.getViewRecord() != record) return false;
 
-      if (curNdx >= slots.indexOf(view)) curNdx--;
+      if (cursorNdx >= slots.indexOf(view)) cursorNdx--;
       return true;
     });
   }
@@ -442,7 +442,7 @@ RecordType lastActiveRecordType()
     if (slots.isEmpty())
       return hdtNone;
 
-    for (int ndx = curNdx; ndx >= 0; ndx--)
+    for (int ndx = cursorNdx; ndx >= 0; ndx--)
     {
       RecordType recordType = slots.get(ndx).getTabRecordType();
       if (recordType != hdtNone)

src/main/java/org/hypernomicon/view/tabs/NoteTabCtrlr.java

@@ -29,6 +29,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.io.FilenameUtils;
+
 import org.hypernomicon.model.records.*;
 import org.hypernomicon.dialogs.RenameDlgCtrlr;
 import org.hypernomicon.model.items.HyperPath;
@@ -388,9 +390,10 @@ private String createFolderToolTip()
 
     HDT_Folder parentFolder = HyperPath.getFolderFromFilePath(getParentForNewFolder(), true);
 
-    if (folderName.isBlank()) return "Assign new folder in parent folder: " + parentFolder.filePath().toString();
-
-    return "Assign new folder: " + parentFolder.filePath().resolve(folderName);
+    return folderName.isBlank() ?
+      "Assign new folder in parent folder: " + parentFolder.filePath().toString()
+    :
+      "Assign new folder: " + FilenameUtils.separatorsToUnix(db.getRootPath().relativize(parentFolder.filePath().resolve(folderName)).toString());
   }
 
 //---------------------------------------------------------------------------

src/main/java/org/hypernomicon/view/tabs/PersonTabCtrlr.java

@@ -125,7 +125,7 @@ public class PersonTabCtrlr extends HyperTab<HDT_Person, HDT_RecordWithMainText>
   @FXML public TextField tfFirst, tfLast;
 
   private final List<InvestigationView> invViews = new ArrayList<>();
-  public final HyperTable htPersonInst, htWorks, htArguments;
+  private final HyperTable htPersonInst, htWorks, htArguments;
   private final HyperCB hcbRank, hcbStatus, hcbSubfield;
   private final MainTextWrapper mainText;