Skip to content

Commit 3d68a59

Browse files
committed
improved null checks
1 parent 159b632 commit 3d68a59

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/tools/watcher/EimJsonUiChangeHandler.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import java.nio.file.Path;
99

1010
import org.eclipse.jface.dialogs.MessageDialog;
11-
import org.eclipse.swt.SWT;
1211
import org.eclipse.swt.widgets.Display;
13-
import org.eclipse.swt.widgets.MessageBox;
1412
import org.eclipse.swt.widgets.Shell;
1513
import org.eclipse.ui.IWorkbenchWindow;
1614
import org.eclipse.ui.PartInitException;
@@ -119,22 +117,21 @@ private void launchEspIdfManager() throws PartInitException
119117
{
120118
Display.getDefault().asyncExec(() -> {
121119
IWorkbenchWindow activeww = EclipseHandler.getActiveWorkbenchWindow();
122-
if (activeww != null && activeww.getActivePage() != null)
120+
if (activeww == null || activeww.getActivePage() == null)
123121
{
124-
try
125-
{
126-
IDE.openEditor(activeww.getActivePage(), new EimEditorInput(eimJson), ESPIDFManagerEditor.EDITOR_ID,
127-
true);
128-
}
129-
catch (PartInitException e)
130-
{
131-
Logger.log("Failed to open ESP-IDF Manager Editor.");
132-
Logger.log(e);
133-
}
122+
Logger.log("Cannot open ESP-IDF Manager. No active workbench window or active page.");
123+
return;
134124
}
135-
else
125+
126+
try
127+
{
128+
IDE.openEditor(activeww.getActivePage(), new EimEditorInput(eimJson), ESPIDFManagerEditor.EDITOR_ID,
129+
true);
130+
}
131+
catch (PartInitException e)
136132
{
137-
Logger.log("Cannot open ESP-IDF Manager Editor. No active workbench window yet.");
133+
Logger.log("Failed to open ESP-IDF Manager Editor.");
134+
Logger.log(e);
138135
}
139136
});
140137

0 commit comments

Comments
 (0)