replaced for loops with foreach loops

alexdcramer · Sep 19, 2024 · eee91a0 · eee91a0
1 parent c2c43a2
commit eee91a0
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 24 deletions.
diff --git a/src/main/java/net/oijon/susquehanna/App.java b/src/main/java/net/oijon/susquehanna/App.java
@@ -168,9 +168,9 @@ public static void setScene(Scene s) {
 	}
 
 	public static void refreshType(String type) {
-		for (int i = 0; i < books.size(); i++) {
-			if (books.get(i).getID().startsWith(type)) {
-				books.get(i).refresh();
+		for (Book book : books) {
+			if (book.getID().startsWith(type)) {
+				book.refresh();
 			}
 		}
 	}
@@ -190,8 +190,8 @@ public static void setSelectedLangNull() {
     public static void setSelectedLang(Language l, File f) {
     	selectedLanguage = l;
     	currentFile = f;
-    	for (int i = 0; i < books.size(); i++) {
-    		books.get(i).updateOnLanguageChange();
+    	for (Book book : books) {
+    		book.updateOnLanguageChange();
     	}
     } 
 

diff --git a/src/main/java/net/oijon/susquehanna/gui/components/BinderTab.java b/src/main/java/net/oijon/susquehanna/gui/components/BinderTab.java
@@ -10,7 +10,6 @@
 import javafx.scene.image.ImageView;
 import net.oijon.susquehanna.App;
 import net.oijon.susquehanna.gui.scenes.Book;
-import net.oijon.susquehanna.gui.toolboxes.Toolbox;
 
 public class BinderTab extends Button {
 
@@ -32,10 +31,10 @@ public void createTransferAction(String id) {
         	@Override
         	public void handle(ActionEvent event) {
         		ArrayList<Book> books = App.getSceneList();
-        		for (int i = 0; i < books.size(); i++) {
-        			String bookID = books.get(i).getID();
+        		for (Book book : books) {
+        			String bookID = book.getID();
         			if (bookID.equals(id)) {
-        				App.setScene(books.get(i));
+        				App.setScene(book);
         				break;
         			}
         		}

diff --git a/src/main/java/net/oijon/susquehanna/gui/components/OrthoList.java b/src/main/java/net/oijon/susquehanna/gui/components/OrthoList.java
@@ -105,10 +105,10 @@ public void handle(ActionEvent event) {
 		chartHeaders.setAlignment(Pos.TOP_CENTER);
 		orthoBox.getChildren().add(chartHeaders);
 		orthoBox.setAlignment(Pos.CENTER);
-		for (int i = 0; i < sortedOrtho.length; i++) {
+		for (String[] pair : sortedOrtho) {
 			HBox cell = new HBox();
-			Label phoneme = new Label(sortedOrtho[i][0]);
-			Label grapheme = new Label(sortedOrtho[i][1]);
+			Label phoneme = new Label(pair[0]);
+			Label grapheme = new Label(pair[1]);
 			phoneme.setPadding(new Insets(0, 10, 0, 10));
 			grapheme.setPadding(new Insets(0, 10, 0, 10));
 			phoneme.setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, null , null)));

diff --git a/src/main/java/net/oijon/susquehanna/gui/components/ToolButton.java b/src/main/java/net/oijon/susquehanna/gui/components/ToolButton.java
@@ -50,9 +50,9 @@ public void createTransferAction(String id) {
         	@Override
         	public void handle(ActionEvent event) {
         		ArrayList<Book> books = App.getSceneList();
-        		for (int i = 0; i < books.size(); i++) {
-        			if (books.get(i).getID().equals(id)) {
-        				App.setScene(books.get(i));
+        		for (Book book : books) {
+        			if (book.getID().equals(id)) {
+        				App.setScene(book);
         				break;
         			}
         		}

diff --git a/src/main/java/net/oijon/susquehanna/gui/scenes/file/InfoPage.java b/src/main/java/net/oijon/susquehanna/gui/scenes/file/InfoPage.java
@@ -96,8 +96,8 @@ private String generateDebugInfo() {
 		list += "=== OLog Settings ===\n";
 		list += "Log location=" + log.getLogFile() + "\n";
 		list += "=== System Settings ===\n";
-		for (int i = 0; i < propArray.length; i++) {
-			list += propArray[i] + "\n";
+		for (String prop : propArray) {
+			list += prop + "\n";
 		}
 		return list;
 	}

diff --git a/src/main/java/net/oijon/susquehanna/gui/scenes/file/OpenLangPage.java b/src/main/java/net/oijon/susquehanna/gui/scenes/file/OpenLangPage.java
@@ -56,13 +56,13 @@ public void refresh() {
 				new File(System.getProperty("user.home") + "/Susquehanna/"));
     	log.info("Found " + files.length + " language(s)");
     	log.debug("Language(s) found:");
-    	for (int i = 0; i < files.length; i++) {
-    		log.debug(files[i].getName());
+    	for (File file : files) {
+    		log.debug(file.getName());
     	}
     	languageSelect.getChildren().clear();
 
     	if (files != null) {
-	        for (int i = 0; i < files.length; i++) {
+	        for (File file : files) {
 	        	Label nameLabel = new Label();
 	        	nameLabel.setFont(Fonts.OPENSANS);
 	        	Label timeCreatedLabel = new Label();
@@ -81,8 +81,7 @@ public void refresh() {
 	        	HBox buttonHBox = new HBox();
 	        	HBox box = new HBox();
 
-	        	try (InputStream input = new FileInputStream(files[i])) {
-	        		final File file = files[i];
+	        	try (InputStream input = new FileInputStream(file)) {
 	                Properties prop = new Properties();
 
 	                prop.load(input);

diff --git a/src/main/java/net/oijon/susquehanna/gui/scenes/lexicon/EditWordsPage.java b/src/main/java/net/oijon/susquehanna/gui/scenes/lexicon/EditWordsPage.java
@@ -44,8 +44,8 @@ public EditWordsPage() {
 		// TODO: make this get from selected language dir
 		File[] langs = Language.getLanguageFiles(
 				new File(System.getProperty("user.home") + "/Susquehanna/"));
-		for (int i = 0; i < langs.length; i++) {
-			options.add(langs[i].getName().replace(".language", ""));
+		for (File langFile : langs) {
+			options.add(langFile.getName().replace(".language", ""));
 		}
 		sourceLanguageInput.setItems(options);