Fixed bug iwth no month row 4 or 5.

Also bumped dependencies
Cleaned up the code a small bit for both cal and libray

Author: frossm

build.gradle.kts

@@ -30,7 +30,7 @@ plugins {
    java
    application
    id("com.github.ben-manes.versions") version "0.53.0"
-   id("com.gradleup.shadow") version "9.3.1"
+   id("com.gradleup.shadow") version "9.3.2"
 }
 
 group = "org.fross"
@@ -70,8 +70,8 @@ dependencies {
    implementation("com.google.code.gson:gson:2.13.2")
 
    // --- JLine Terminal Access for Colorized Output---
-   implementation("org.jline:jline-terminal:3.30.6")
-   implementation("org.jline:jline-terminal-ffm:3.30.6")
+   implementation("org.jline:jline-terminal:4.0.0")
+   implementation("org.jline:jline-terminal-ffm:4.0.0")
 
    // --- JUnit Testing ---
    testImplementation("org.junit.jupiter:junit-jupiter-api:6.1.0-M1")

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.caching=false
 org.gradle.console=colored
 
 # Cal Program Version
-version=3.0.2
+version=3.0.3
 
 # Cal Inception Date
 inceptionYear=2018

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: fcal
 title: fCal
-version: '3.0.2'
+version: '3.0.3'
 summary: Command line calendar display
 description: |
   fCal is a command line calendar utility.  It will display a

src/main/java/org/fross/cal/Calendar.java

@@ -34,8 +34,7 @@ public class Calendar {
    static protected final int DEFAULT_CALS_PER_ROW = 3;
    static protected final int CALENDARWIDTH = 20;
    static protected final int SPACESBETWEENCALS = 2;
-   static protected final String[] MONTHLIST = {"", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October",
-         "November", "December"};
+   static protected final String[] MONTHLIST = {"", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
    static protected final int TODAYHIGHLIGHT_FG = Output.WHITE;
    static protected final int TODAYHIGHLIGHT_BG = Output.BLUE;
 
@@ -96,10 +95,12 @@ public static int getDayOfWeek(int month, int day, int year) {
     * @return
     */
    public static boolean isLeapYear(int year) {
-      if ((year % 4 == 0) && (year % 100 != 0))
+      if ((year % 4 == 0) && (year % 100 != 0)) {
          return true;
-      if (year % 400 == 0)
+      } else if (year % 400 == 0) {
          return true;
+      }
+
       return false;
    }
 
@@ -244,9 +245,9 @@ public static String[] getCalDays(int month, int year) {
       // Insert spaces until we get to first day of the month in the calendar
       returnString[row] += "   ".repeat(firstDayOfMon);
 
-      // Initialize the length of the each row
+      // Initialize the length of each row
       // I can't just use the length of returnString[row] because the ANSI colored characters take up more room and that won't be
-      // printed. Therefore I'll keep the length of the returnString in a separate variable
+      // printed. Therefore, I'll keep the length of the returnString in a separate variable
       returnStringLen[row] = returnString[row].length();
 
       // Create the day strings. After 7 days start a new line.
@@ -277,6 +278,7 @@ public static String[] getCalDays(int month, int year) {
          if (((day + firstDayOfMon) % 7 == 0) || (day == daysInMonth[month])) {
             // Ensure that the array element is padded with space characters
             if (returnStringLen[row] < CALENDARWIDTH) {
+               // Pad the return string for this row with spaces
                returnString[row] += " ".repeat(CALENDARWIDTH - returnStringLen[row] + 1);
             }
 
@@ -285,6 +287,12 @@ public static String[] getCalDays(int month, int year) {
          }
       }
 
+      // Ensure the 5th row (row=4) is padded.
+      // Fixed bug where 2/28 ended on Sunday, and we didn't have anything in row=4
+      if (returnStringLen[4] == 0) {
+         returnString[4] = " ".repeat(CALENDARWIDTH + 1);
+      }
+
       // Ensure last row / array element is CALENDARWIDTH characters. Pad with spaces.
       int lastElement = returnString.length - 1;
       if (returnString[lastElement].length() < CALENDARWIDTH) {

src/main/java/org/fross/cal/CommandLineArgs.java

@@ -144,11 +144,11 @@ public static void ProcessCommandLine(String[] argv) {
                Output.debugPrintln("No Month or Year provided on command line. Showing current year: " + yearToUse);
                break;
 
-            // Just a date or month provided
+            // Just a Year or Month provided
             case 1:
-               int d = Integer.parseInt(cli.clMonthAndOrYear.get(0));
+               int d = Integer.parseInt(cli.clMonthAndOrYear.getFirst());
 
-               // Number must be a year if it's greater than 12
+               // If the entered number is greater than 12 then it must be a year
                if (d > 12) {
                   yearToUse = d;
                   Output.debugPrintln("Commandline Year provided. Showing Year: " + yearToUse);
@@ -180,7 +180,7 @@ public static void ProcessCommandLine(String[] argv) {
    /**
     * Return the month to use after processing the command line
     *
-    * @return
+    * @return Selected Month
     */
    public static int queryMonthToUse() {
       return monthToUse;
@@ -189,7 +189,7 @@ public static int queryMonthToUse() {
    /**
     * Return the year to use after processing the command line
     *
-    * @return
+    * @return Selected Year
     */
    public static int queryYearToUse() {
       return yearToUse;

src/main/java/org/fross/cal/Holidays.java

@@ -29,6 +29,7 @@
 import org.fross.library.Output;
 import org.fross.library.URLOperations;
 
+import java.io.IOException;
 import java.util.Locale;
 import java.util.TreeMap;
 import java.util.prefs.BackingStoreException;

src/main/java/org/fross/cal/Main.java

@@ -48,7 +48,7 @@ public class Main {
    /**
     * Main(): Start of program and holds main command loop
     *
-    * @param args
+    * @param args Command Line Arguments
     */
    public static void main(String[] args) {
       // Force JLine to assume the terminal supports ANSI color and movement
@@ -63,23 +63,23 @@ public static void main(String[] args) {
 
       // Create a terminal used for output with JLine
       try {
-         // This will print the actual reason (like "Missing library" or "Access Denied") to the console
-         // For Debugging: System.setProperty("org.jline.terminal.debug", "true");
+         // Print any jline issues to the console for debugging
+         // System.setProperty("org.jline.terminal.debug", "true");
 
          // Create the terminal
          terminal = TerminalBuilder.builder()
                .system(true)
                .build();
 
-         // Let Output and Input classes know which terminal to use
+         // Let the Output classes know which terminal to use
          Output.setTerminal(terminal);
 
       } catch (IOException ex) {
-         // Note: Since terminal failed, we use System.out as a fallback
+         // Note: Since terminal failed, Output will use System.out as a fallback
          Output.println("Unable to create a terminal. Visuals may be impacted");
       }
 
-      // Process application level properties file
+      // Process application level properties file. The values are updated via the Gradle processResources task
       try {
          InputStream iStream = Main.class.getClassLoader().getResourceAsStream(PROPERTIES_FILE);
          Properties prop = new Properties();
@@ -108,7 +108,7 @@ public static void main(String[] args) {
          Output.fatalError("There can not be more than 2 dates given on the commandline.\nPlease see Help (-h)", 6);
       }
 
-      // Ensure the month / year is a valid integer
+      // Ensure the Month / Year is a valid integer
       for (int i = 0; i < CommandLineArgs.cli.clMonthAndOrYear.size(); i++) {
          int monthAndOrYear = 0;
          try {

src/main/java/org/fross/library/Output.java

@@ -236,7 +236,7 @@ public static void Ansi256Test() {
          Output.printColor(index, String.format("%d", index));
       }
 
-      System.out.println("\n");
+      Output.println("\n");
 
       // Test Backgrounds
       for (int index = 0; index < 256; index++) {

src/main/java/org/fross/library/URLOperations.java

@@ -54,7 +54,7 @@ public static String ReadURL(String urlString) throws Exception {
          }
 
       } catch (Exception ex) {
-         Output.printColorln(Output.RED, "ERROR: An IO Error Occurred\n" + ex.getMessage());
+         throw new IOException(ex.getMessage());
       } finally {
          if (reader != null) {
             reader.close();
@@ -83,7 +83,8 @@ public static void DownloadURLToFile(String urlStr, String file) throws IOExcept
          fos = new FileOutputStream(file);
 
       } catch (Exception ex) {
-         Output.printColorln(Output.RED, "ERROR: An error occurred opening the URL\n" + ex.getMessage());
+         //Output.printColorln(Output.RED, "ERROR: An error occurred opening the URL\n" + ex.getMessage());
+         throw new IOException(ex.getMessage());
       }
 
       // Download chunks of the file and write them out
@@ -98,9 +99,13 @@ public static void DownloadURLToFile(String urlStr, String file) throws IOExcept
          Output.printColorln(Output.RED, "ERROR: An error occurred reading from the URL\n" + ex.getMessage());
       }
 
-      // Cleanup by closing the streams
-      fos.close();
-      bis.close();
+      // Cleanup by closing the streams.
+      if (fos != null) {
+         fos.close();
+      }
+      if (bis != null) {
+         bis.close();
+      }
    }
 
    /**