Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ OldConfigFoundMsgBoxMsg=Espressif IDE now uses the EIM system to manage ESP-IDF
OldConfigExportDirectorSelectionDialogTitle=Select Destination
OldConfigExportDirectorSelectionDialogInfo=Choose a directory to save the exported settings.
OldConfigExportCompleteSuccessMsgTitle=Import Successful
OldConfigExportCompleteSuccessMsg=The configuration has been successfully Imported
OldConfigExportCompleteSuccessMsg=The old configuration has been successfully imported.
OldConfigExportCompleteFailMsgTitle=Conversion Failed
OldConfigExportCompleteFailMsg=An error occurred while converting old configuration.
OldConfigExportCompleteFailMsg=An error occurred while importing old configuration.
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,9 @@ private boolean checkIfEimPathMacOsIsInApplications()
private void handleOldConfigExport()
{
Display display = Display.getDefault();

GlobalModalLock.showModal(() -> MessageDialog.openQuestion(display.getActiveShell(),
Messages.OldConfigFoundMsgBoxTitle, Messages.OldConfigFoundMsgBoxMsg), response -> {
if (response)
{
startExportOldConfig();
}
});

display.asyncExec(()-> {
startExportOldConfig();
});
}

private void startExportOldConfig()
Expand Down Expand Up @@ -184,31 +178,42 @@ else if (!StringUtil.isEmpty(eimPathEnvVar))
if (status.getSeverity() != IStatus.ERROR)
{
preferences.putBoolean(EimConstants.OLD_CONFIG_EXPORTED_FLAG, true);
displayInformationMessageBox(Messages.OldConfigExportCompleteSuccessMsgTitle,
Messages.OldConfigExportCompleteSuccessMsg);
writeToStandardConsoleStream(Messages.OldConfigExportCompleteSuccessMsg);
}
else
{
displayInformationMessageBox(Messages.OldConfigExportCompleteFailMsgTitle,
Messages.OldConfigExportCompleteFailMsg);
writeToErrorConsoleStream(Messages.OldConfigExportCompleteFailMsg);
}
}
catch (IOException e)
{
Logger.log("Error exporting old configuration", e);
displayInformationMessageBox(Messages.OldConfigExportCompleteFailMsgTitle,
Messages.OldConfigExportCompleteFailMsg);
writeToErrorConsoleStream(Messages.OldConfigExportCompleteFailMsg);
}
}

private void displayInformationMessageBox(String messageTitle, String message)
private void writeToStandardConsoleStream(String msg)
{
Display display = Display.getDefault();
GlobalModalLock.showModal(() -> {
MessageDialog.openInformation(display.getActiveShell(), messageTitle, message);
return null;
}, ignored -> {
});
try
{
standardConsoleStream.write(msg);
}
catch (IOException e)
{
Logger.log(e);
}
}

private void writeToErrorConsoleStream(String msg)
{
try
{
errorConsoleStream.write(msg);
}
catch (IOException e)
{
Logger.log(e);
}
}

private void closeEspIdfManager()
Expand Down
Loading