Skip to content

Commit b842054

Browse files
committed
review comments resolved
1 parent 881343f commit b842054

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/messages.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ IDFToolChainsMissingErrorMsg=Toolchains are missing. Please use ESP-IDF Manager
3131
NoActiveEspIdfInWorkspaceMsgTitle=ESP-IDF Setup
3232
NoActiveEspIdfInWorkspaceMsg=ESP-IDF is required to use Espressif IDE. Would you like to configure it now?
3333

34-
OldConfigFoundMsgBoxTitle=Old Configuration Found
35-
OldConfigFoundMsgBoxMsg=Please export the current workspace configuration to the EIM configuration for proper environment setup. Do you want to export configurations?
34+
OldConfigFoundMsgBoxTitle=Old Configuration Detected
35+
OldConfigFoundMsgBoxMsg=Espressif IDE now uses the EIM system to manage ESP-IDF installations. A legacy configuration was found in your current workspace. Converting it to the EIM format will allow proper environment setup and ensure the IDE works seamlessly with your existing projects. Would you like to convert the configuration now?
3636
OldConfigExportDirectorSelectionDialogTitle=Select Destination
3737
OldConfigExportDirectorSelectionDialogInfo=Choose a directory to save the exported settings.
3838
OldConfigExportCompleteSuccessMsgTitle=Import Successful
3939
OldConfigExportCompleteSuccessMsg=The configuration has been successfully Imported
40-
OldConfigExportCompleteFailMsgTitle=Import Failed
41-
OldConfigExportCompleteFailMsg=An error occurred while importing old configuration.
40+
OldConfigExportCompleteFailMsgTitle=Conversion Failed
41+
OldConfigExportCompleteFailMsg=An error occurred while converting old configuration.

bundles/com.espressif.idf.core/src/com/espressif/idf/core/logging/Logger.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
*/
2121
public class Logger
2222
{
23+
public static void log(String message, Exception e)
24+
{
25+
log(IDFCorePlugin.getPlugin(), message, e);
26+
}
2327

2428
public static void log(String message)
2529
{

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,19 @@ public void earlyStartup()
5252
preferences = org.eclipse.core.runtime.preferences.InstanceScope.INSTANCE.getNode(UIPlugin.PLUGIN_ID);
5353
toolInitializer = new ToolInitializer(preferences);
5454

55-
if (toolInitializer.isEspIdfSet() && toolInitializer.isOldEspIdfConfigPresent()
56-
&& !toolInitializer.isOldConfigExported())
57-
{
58-
Logger.log("Old configuration not imported");
59-
handleOldConfigExport();
60-
}
61-
6255
if (!toolInitializer.isEimInstalled())
6356
{
57+
Logger.log("EIM not installed");
6458
notifyMissingTools();
6559
return;
6660
}
61+
62+
if (toolInitializer.isOldEspIdfConfigPresent()
63+
&& !toolInitializer.isOldConfigExported())
64+
{
65+
Logger.log("Old configuration found and not converted");
66+
handleOldConfigExport();
67+
}
6768

6869
EimJson eimJson = toolInitializer.loadEimJson();
6970
if (eimJson == null)
@@ -119,8 +120,7 @@ private void handleOldConfigExport()
119120
}
120121
catch (IOException e)
121122
{
122-
Logger.log("Error exporting old configuration");
123-
Logger.log(e);
123+
Logger.log("Error exporting old configuration", e);
124124
displayInformationMessageBox(Messages.OldConfigExportCompleteFailMsgTitle,
125125
Messages.OldConfigExportCompleteFailMsg);
126126
}

0 commit comments

Comments
 (0)