-

DiamondCoder02 · May 25, 2023 · ebb6a64 · ebb6a64
1 parent 9edb3de
commit ebb6a64
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 42 deletions.
diff --git a/src/windowJframe/_initFrame.java b/src/windowJframe/_initFrame.java
@@ -16,11 +16,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import xmlFolderHandle.saveLoadDoc;
 
 public class _initFrame extends JFrame implements ActionListener {
@@ -62,43 +57,8 @@ public void WindowCreate(String[] columnNames, Object[][] dataFromXMLFile) {
 		refreshEverything.addActionListener(this);
 
 		boolean[] columnVisibility, otherSettings;
-		Document dom = saveLoadDoc.loadDocument();
-		NodeList settingsNode = dom.getElementsByTagName("settings");
-		Node settingsNodeElement = settingsNode.item(0);
-		if (settingsNodeElement.getNodeType() == Node.ELEMENT_NODE) {
-			Element e = (Element) settingsNodeElement;
-			NodeList showncolumns = e.getElementsByTagName("showncolumns");
-			columnVisibility = new boolean[showncolumns.getLength()];
-			for (int i = 0; i < showncolumns.getLength(); i++) {
-				Node showncolumnsNode = showncolumns.item(i);
-				if (showncolumnsNode.getNodeType() == Node.ELEMENT_NODE) {
-					Element e2 = (Element) showncolumnsNode;
-					String enabled = e2.getAttribute("enabled").trim();
-					if (enabled.equals("true")) {
-						columnVisibility[i] = true;
-					} else {
-						columnVisibility[i] = false;
-					}
-				}
-			}
-			NodeList otherSettingsNode = e.getElementsByTagName("othersettings");
-			otherSettings = new boolean[otherSettingsNode.getLength()];
-			for (int i = 0; i < otherSettingsNode.getLength(); i++) {
-				Node otherSettingsNodeElement = otherSettingsNode.item(i);
-				if (otherSettingsNodeElement.getNodeType() == Node.ELEMENT_NODE) {
-					Element e2 = (Element) otherSettingsNodeElement;
-					String enabled = e2.getAttribute("enabled").trim();
-					if (enabled.equals("true")) {
-						otherSettings[i] = true;
-					} else {
-						otherSettings[i] = false;
-					}
-				}
-			}
-		} else {
-			columnVisibility = new boolean[10];
-			otherSettings = new boolean[3];
-		}
+		columnVisibility = settingsManager.loadSettings("showncolumns");
+		otherSettings = settingsManager.loadSettings("othersettings");
 
 		JMenu settings;
 		mb.add(settings = new JMenu("Settings"));

diff --git a/src/windowJframe/settingsManager.java b/src/windowJframe/settingsManager.java
@@ -39,4 +39,31 @@ public static void xmlSettings(String TagName, String options){
 			e.printStackTrace();
 		}
 	}
+
+	public static boolean[] loadSettings(String tagName) {
+		boolean[] settings;
+		Document dom = saveLoadDoc.loadDocument();
+		NodeList settingsNode = dom.getElementsByTagName("settings");
+		Node settingsNodeElement = settingsNode.item(0);
+		if (settingsNodeElement.getNodeType() == Node.ELEMENT_NODE) {
+			Element e = (Element) settingsNodeElement;
+			NodeList showncolumns = e.getElementsByTagName(tagName);
+			settings = new boolean[showncolumns.getLength()];
+			for (int i = 0; i < showncolumns.getLength(); i++) {
+				Node showncolumnsNode = showncolumns.item(i);
+				if (showncolumnsNode.getNodeType() == Node.ELEMENT_NODE) {
+					Element e2 = (Element) showncolumnsNode;
+					String enabled = e2.getAttribute("enabled").trim();
+					if (enabled.equals("true")) {
+						settings[i] = true;
+					} else {
+						settings[i] = false;
+					}
+				}
+			}
+		} else {
+			settings = new boolean[10];
+		}
+		return settings;
+	}
 }