Merge lp:~tapaal-contributor/tapaal/pnml-disable-buttons-1868535 into lp:tapaal

[Peter Haahr Taankvist]

When import PNML fails and there are no other tabs open buttons are correctly disabled (as when closing a last tab).

SmartDrawDialog also does not appear if import PNML fails.

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/CreateGui.java'
--- src/pipe/gui/CreateGui.java	2018-10-19 14:18:17 +0000
+++ src/pipe/gui/CreateGui.java	2020-03-23 20:00:20 +0000
@@ -97,4 +97,8 @@
 	public static GuiFrame getAppGui() {
 		return appGui;
 	}
+        
+        public static int getTabsSize(){
+            return tabs.size();
+        }
 }
 
=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2020-03-18 19:23:12 +0000
+++ src/pipe/gui/GuiFrame.java	2020-03-23 20:00:20 +0000
@@ -1492,6 +1492,7 @@
 
 	//XXX 2018-05-23 kyrke, implementation close to closeTab, needs refactoring
 	private void undoAddTab(int currentlySelected) {
+                if(appTab.getTabCount() == 1) { CreateGui.getApp().setGUIMode(GUIMode.noNet); }
 		CreateGui.removeTab(appTab.getSelectedIndex() );
 		appTab.removeTabAt(appTab.getSelectedIndex());
 		appTab.setSelectedIndex(currentlySelected);
@@ -2558,6 +2559,7 @@
 		
 		importMenu.add(importPNMLAction = new GuiAction("PNML untimed net", "Import an untimed net in the PNML format", KeyStroke.getKeyStroke('X', shortcutkey)) {
 			public void actionPerformed(ActionEvent arg0) {
+                                int currNumTabs = CreateGui.getTabsSize();
 				final File[] files = FileBrowser.constructor("Import PNML", "pnml", FileBrowser.userPath).openFiles();
 				
 				//Show loading cursor
@@ -2600,7 +2602,8 @@
 						e.printStackTrace();
 					}
 			    }
-			    if(files.length != 0 && !CreateGui.getCurrentTab().currentTemplate().getHasPositionalInfo()) {
+                            //files.length != 0 makes sure a file has been selected, CreateGui.getTabsSize() > currNumTabs makes sure the new tab was added
+			    if(files.length != 0 && CreateGui.getTabsSize() > currNumTabs && !CreateGui.getCurrentTab().currentTemplate().getHasPositionalInfo()) {
 				    int dialogResult = JOptionPane.showConfirmDialog (null, "The net does not have any layout information. Would you like to do automatic layout?","Automatic Layout?", JOptionPane.YES_NO_OPTION);
 				    if(dialogResult == JOptionPane.YES_OPTION) {
 				    	SmartDrawDialog.showSmartDrawDialog();