From 2d140567edf035fe665f66b78d488bc12c0f157b Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Mon, 30 Mar 2020 20:58:40 -0400
Subject: Clean up warnings

Clear up some warnings that had popped up. Mostly, closing some input
streams after we're done with them.
---
 src/main/java/bjc/inflexion/InflectionML.java     | 14 ++++++++++++--
 src/main/java/bjc/inflexion/InflectionString.java | 22 ++++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'src/main/java/bjc')

diff --git a/src/main/java/bjc/inflexion/InflectionML.java b/src/main/java/bjc/inflexion/InflectionML.java
index f5fbb02..e92e171 100644
--- a/src/main/java/bjc/inflexion/InflectionML.java
+++ b/src/main/java/bjc/inflexion/InflectionML.java
@@ -13,6 +13,8 @@
  */
 package bjc.inflexion;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -57,10 +59,18 @@ public class InflectionML {
 	/* Load DBs from files. */
 	static {
 		final Prepositions prepositionDB = new Prepositions();
-		prepositionDB.loadFromStream(InflectionML.class.getResourceAsStream("/prepositions.txt"));
+		try (InputStream strim = InflectionML.class.getResourceAsStream("/prepositions.txt")) {
+			prepositionDB.loadFromStream(strim);
+		} catch (IOException ioex) {
+			ioex.printStackTrace();
+		}
 
 		nounDB = new Nouns(prepositionDB);
-		nounDB.loadFromStream(InflectionML.class.getResourceAsStream("/nouns.txt"));
+		try (InputStream strim = InflectionML.class.getResourceAsStream("/nouns.txt")) {
+			nounDB.loadFromStream(strim);
+		} catch (IOException ioex) {
+			ioex.printStackTrace();
+		}
 	}
 
 	/**
diff --git a/src/main/java/bjc/inflexion/InflectionString.java b/src/main/java/bjc/inflexion/InflectionString.java
index 486c93b..7310374 100644
--- a/src/main/java/bjc/inflexion/InflectionString.java
+++ b/src/main/java/bjc/inflexion/InflectionString.java
@@ -20,6 +20,8 @@ import static bjc.inflexion.InflectionString.InflectionDirective.numeric;
 import static bjc.inflexion.InflectionString.InflectionDirective.variable;
 import static java.util.Arrays.asList;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -743,12 +745,12 @@ public class InflectionString {
 
 			// Directive nesting level
 			int level   = 0;
-			int prevPos = pos;;
+			int prevPos = pos;
 
 			char prevChar = ' ';
 			boolean parsingVar = false;
 
-			for (pos = pos; pos < strang.length(); pos++) {
+			for (; pos < strang.length(); pos++) {
 				// Backslash escapes a character
 				if (prevChar == '\\') continue;
 
@@ -825,10 +827,18 @@ public class InflectionString {
 	/* Load DBs from files. */
 	static {
 		final Prepositions prepositionDB = new Prepositions();
-		prepositionDB.loadFromStream(InflectionML.class.getResourceAsStream("/prepositions.txt"));
+		try (InputStream strim = InflectionML.class.getResourceAsStream("/prepositions.txt")) {
+			prepositionDB.loadFromStream(strim);
+		} catch (IOException ioex) {
+			ioex.printStackTrace();
+		}
 
 		nounDB = new Nouns(prepositionDB);
-		nounDB.loadFromStream(InflectionML.class.getResourceAsStream("/nouns.txt"));
+		try (InputStream strim = InflectionML.class.getResourceAsStream("/nouns.txt")) {
+			nounDB.loadFromStream(strim);
+		} catch (IOException ioex) {
+			ioex.printStackTrace();
+		}
 	}
 
 	/*
@@ -1137,7 +1147,7 @@ public class InflectionString {
 	public String toString() {
 		if (rawString != null)
 			return rawString;
-		else
-			return super.toString();
+		
+		return super.toString();
 	}
 }
-- 
cgit v1.2.3