From 01615c0d93a01b2562f6320be163be95b1492926 Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Mon, 25 Aug 2025 18:25:26 +0400 Subject: [PATCH] =?UTF-8?q?OPENIDE=20#29=20=D0=9F=D0=B5=D1=80=D0=B5=D0=BB?= =?UTF-8?q?=D0=BE=D0=B6=D0=B8=D1=82=D1=8C=20=D0=B0=D1=80=D1=82=D0=B5=D1=84?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D1=8B=20=D0=B8=D0=B7=20=20JB=20=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=83=D1=80=D1=81=D0=BE=D0=B2=20=D0=BA=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 15f3c6643b8087f2feb09fbcb64b806e22b67ddb) --- .../sceneBuilder/SceneBuilderEditor.java | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java index 05b1df994c1a..aadfe46f0fdd 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java @@ -113,36 +113,35 @@ public final class SceneBuilderEditor extends UserDataHolderBase implements File e instanceof NoClassDefFoundError && !SceneBuilderUtil.getSceneBuilder11Path().toFile().isFile()) { myErrorNotification.setText(JavaFXBundle.message("javafx.scene.builder.editor.failed.to.open.file.error")); - // TODO [OpenIDE]: https://git.haulmont.com/platform/open-ide/idea/-/issues/29 - //myErrorNotification.createActionLabel( - // JavaFXBundle.message("javafx.scene.builder.editor.download.scene.builder.kit"), - // () -> { - // DownloadableFileService service = DownloadableFileService.getInstance(); - // var description = service.createFileDescription("https://cache-redirector.jetbrains.com/" + - // "intellij-dependencies/org/jetbrains/intellij/deps/scenebuilderkit/" + - // SceneBuilderUtil.SCENE_BUILDER_VERSION + "/" + SceneBuilderUtil.SCENE_BUILDER_KIT_FULL_NAME, SceneBuilderUtil.SCENE_BUILDER_KIT_FULL_NAME); - // FileDownloader downloader = service.createDownloader(Collections.singletonList(description), "Scene Builder Kit"); - // try { - // Path tempDir = Files.createTempDirectory(""); - // - // final var list = downloader.downloadWithProgress(tempDir.toString(), myProject, myErrorPanel); - // if (list == null || list.isEmpty()) { - // myErrorNotification.clear(); - // myErrorNotification.setText(JavaFXBundle.message("javafx.scene.builder.editor.failed.to.download.kit.error")); - // return; - // } - // - // FileUtil.copy(VfsUtilCore.virtualToIoFile(list.get(0).first), SceneBuilderUtil.getSceneBuilder11Path().toFile()); - // FileUtil.delete(tempDir.toFile()); - // - // SceneBuilderUtil.updateLoader(); - // updateState(); - // } - // catch (IOException e2) { - // LOG.warn("Can't download SceneBuilderKit", e2); - // } - // } - //); + myErrorNotification.createActionLabel( + JavaFXBundle.message("javafx.scene.builder.editor.download.scene.builder.kit"), + () -> { + DownloadableFileService service = DownloadableFileService.getInstance(); + var description = service.createFileDescription("https://download.openide.ru" + + "/deps/scenebuilderkit/" + + SceneBuilderUtil.SCENE_BUILDER_VERSION + "/" + SceneBuilderUtil.SCENE_BUILDER_KIT_FULL_NAME, SceneBuilderUtil.SCENE_BUILDER_KIT_FULL_NAME); + FileDownloader downloader = service.createDownloader(Collections.singletonList(description), "Scene Builder Kit"); + try { + Path tempDir = Files.createTempDirectory(""); + + final var list = downloader.downloadWithProgress(tempDir.toString(), myProject, myErrorPanel); + if (list == null || list.isEmpty()) { + myErrorNotification.clear(); + myErrorNotification.setText(JavaFXBundle.message("javafx.scene.builder.editor.failed.to.download.kit.error")); + return; + } + + FileUtil.copy(VfsUtilCore.virtualToIoFile(list.get(0).first), SceneBuilderUtil.getSceneBuilder11Path().toFile()); + FileUtil.delete(tempDir.toFile()); + + SceneBuilderUtil.updateLoader(); + updateState(); + } + catch (IOException e2) { + LOG.warn("Can't download SceneBuilderKit", e2); + } + } + ); myLayout.show(myPanel, ERROR_CARD); return; }