IEP-1583: Closing old editor window when old workspace is found (#1262)

* IEP-1583: Closing old editor window when old workspace is found

* fix: address NPE while launching

---------

Co-authored-by: Kondal Kolipaka <[email protected]>

Author: alirana01

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/EspressifToolStartup.java

@@ -19,8 +19,11 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
@@ -93,6 +96,7 @@ public void earlyStartup()
 		if (toolInitializer.isOldEspIdfConfigPresent() && !toolInitializer.isOldConfigExported())
 		{
 			Logger.log("Old configuration found and not converted");
+			closeEspIdfManager();
 			boolean isEimInApplications = checkIfEimPathMacOsIsInApplications();
 			if (!isEimInApplications)
 			{
@@ -213,6 +217,33 @@ private void displayInformationMessageBox(String messageTitle, String message)
 		}, ignored -> {
 		});
 	}
+	
+	private void closeEspIdfManager()
+	{
+		Display.getDefault().asyncExec(() -> {
+			IWorkbenchWindow window = EclipseHandler.getActiveWorkbenchWindow();
+			if (window != null)
+			{
+				IWorkbenchPage page = window.getActivePage();
+				if (page != null)
+				{
+					IEditorReference[] editors = page.getEditorReferences();
+					for (IEditorReference editorRef : editors)
+					{
+						if (ESPIDFManagerEditor.EDITOR_ID.equals(editorRef.getId()))
+						{
+							IEditorPart editor = editorRef.getEditor(false);
+							if (editor != null)
+							{
+								page.closeEditor(editor, false);
+							}
+						}
+					}
+				}
+			}
+		});
+	}
+
 
 	private void showEimJsonStateChangeNotification()
 	{

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/manager/ESPIDFManagerEditor.java

@@ -16,22 +16,22 @@
 
 /**
  * Editor main class used for tools management
+ * 
  * @author Ali Azam Rana
  *
  */
 public class ESPIDFManagerEditor extends EditorPart
 {
 	public static final String EDITOR_ID = "com.espressif.idf.ui.manageespidf";
-	
+
 	@Override
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException
 	{
 		setSite(site);
 		setInput(input);
 		setPartName(Messages.EspIdfEditorTitle);
 	}
-	
-	
+
 	@Override
 	public void doSave(IProgressMonitor monitor)
 	{
@@ -49,30 +49,36 @@ public boolean isSaveAsAllowed()
 	{
 		return false;
 	}
-	
+
 	@Override
 	public void createPartControl(Composite parent)
 	{
-		ESPIDFMainTablePage espidfMainTablePage = ESPIDFMainTablePage
-				.getInstance(((EimEditorInput) getEditorInput()).getEimJson());
-		espidfMainTablePage.createPage(parent);
-		if (((EimEditorInput) getEditorInput()).isFirstStartup())
+		IEditorInput input = getEditorInput();
+
+		if (input instanceof EimEditorInput eimInput)
 		{
-			espidfMainTablePage.setupInitialEspIdf();
+			ESPIDFMainTablePage espidfMainTablePage = ESPIDFMainTablePage.getInstance(eimInput.getEimJson());
+			espidfMainTablePage.createPage(parent);
+			if (eimInput.isFirstStartup())
+			{
+				espidfMainTablePage.setupInitialEspIdf();
+			}
+		}
+		else
+		{
+			getSite().getPage().closeEditor(this, false);
 		}
 	}
 
-
 	@Override
 	public boolean isDirty()
 	{
 		return false;
 	}
 
-
 	@Override
 	public void setFocus()
 	{
-		
+
 	}
 }