Merge pull request #616 from MyersResearchGroup/Hierachy_Issue

Fixed nullpointerexception in FileTree that resulted in bug when using
MyersResearchGroup · Apr 21, 2021 · ffccbd3 · ffccbd3
2 parents f153c32 + d518ac2
commit ffccbd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/util/FileTree.java b/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/util/FileTree.java
@@ -201,6 +201,9 @@ public void valueChanged(TreeSelectionEvent e) {
 					}
 					fileLocation = dir.getAbsolutePath() + fileLocation;
 
+					// Lukas added :
+					if(tree.getSelectionPaths() != null) {
+
 					fileLocations = new String[tree.getSelectionPaths().length];
 					int i = 0;
 					for (TreePath path : tree.getSelectionPaths()) {
@@ -225,6 +228,7 @@ public void valueChanged(TreeSelectionEvent e) {
 						i++;
 					}
 				}
+				}
 			});
 			tree.addMouseListener(this);
 			tree.addMouseListener(gui);

diff --git a/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/util/tabs/CloseTabPaneUI.java b/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/util/tabs/CloseTabPaneUI.java
@@ -69,7 +69,7 @@
 import javax.swing.plaf.basic.BasicTabbedPaneUI;
 import javax.swing.text.View;
 
-import com.sun.java.swing.plaf.windows.WindowsIconFactory;
+//import com.sun.java.swing.plaf.windows.WindowsIconFactory;
 
 import edu.utah.ece.async.ibiosim.gui.Gui;
 import edu.utah.ece.async.ibiosim.gui.ResourceManager;