Browse Source

MiniBug NullPointerfix

Tom Troppmann 6 years ago
parent
commit
887eff9d96
1 changed files with 12 additions and 7 deletions
  1. 12 7
      src/ui/view/GUI.java

+ 12 - 7
src/ui/view/GUI.java

@@ -107,7 +107,7 @@ public class GUI implements CategoryListener {
 	private final JMenuItem mntmOpen = new JMenuItem("Open");
 	private final JMenuItem mntmNew = new JMenuItem("New");
 	private final JMenuItem mntmSave = new JMenuItem("Save");
-	private final JMenuItem mntmCanvasSize = new JMenuItem("View Size");
+	private final JMenuItem mntmCanvasSize = new JMenuItem("Set View Size");
 	private final JMenuItem mntmBackground = new JMenuItem("Background Image");
 	private final JMenuItem mntmSplitView = new JMenuItem("Split View");
 	private final JSplitPane splitPane = new JSplitPane();
@@ -914,11 +914,13 @@ public class GUI implements CategoryListener {
 			canvas.repaint();
 
 			// Update UpperNodes
-				Component canvasOrUpperNodeCanvas = getScrollPaneFromTabbedPane()
-						.getViewport().getComponent(0);
-				if (canvasOrUpperNodeCanvas != null
-						&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
-					((UpperNodeCanvas) canvasOrUpperNodeCanvas).repaint();
+				JScrollPane spane = getScrollPaneFromTabbedPane();
+				if(spane != null){
+					Component canvasOrUpperNodeCanvas = spane.getViewport().getComponent(0);
+					if (canvasOrUpperNodeCanvas != null
+							&& canvasOrUpperNodeCanvas instanceof UpperNodeCanvas) {
+						((UpperNodeCanvas) canvasOrUpperNodeCanvas).repaint();
+					}
 				}
 			});
 		
@@ -3019,12 +3021,15 @@ public class GUI implements CategoryListener {
 
 	private JScrollPane getScrollPaneFromTabbedPane(int index) {
 		Component upperLevelSelectedComponent;
+		if(tabTemp == null)
+		{
+			return null;
+		}
 		if (index == -1) {
 			upperLevelSelectedComponent = tabTemp.getSelectedComponent();
 		} else {
 			upperLevelSelectedComponent = tabTemp.getComponentAt(index);
 		}
-
 		if (upperLevelSelectedComponent instanceof JTabbedPane) {
 			Component nextLevel = ((JTabbedPane) upperLevelSelectedComponent).getSelectedComponent();
 			if(nextLevel instanceof JPanel)