From c2af3e1ce98c49d4087e202162784d46bb2e63cf Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 21 Mar 2019 13:21:44 +0100 Subject: [PATCH] [platform] an assertion for JNA availability in macOS Foundation wrapper Needed for lazy loading. --- .../src/com/intellij/ui/mac/foundation/Foundation.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java b/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java index 1c0484f8b5f7..681817a4c500 100644 --- a/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java +++ b/platform/util/src/com/intellij/ui/mac/foundation/Foundation.java @@ -1,6 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui.mac.foundation; +import com.intellij.jna.JnaLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.util.ImageLoader; @@ -22,13 +23,13 @@ public class Foundation { private static final FoundationLibrary myFoundationLibrary; static { + assert JnaLoader.isLoaded() : "JNA library is not available"; myFoundationLibrary = Native.loadLibrary("Foundation", FoundationLibrary.class, Collections.singletonMap("jna.encoding", "UTF8")); } public static void init() { /* fake method to init foundation */ } - private Foundation() { - } + private Foundation() { } /** * Get the ID of the NSClass with className @@ -607,4 +608,4 @@ public class Foundation { throw new IllegalArgumentException("Unsupported type! " + o.getClass()); } } -} +} \ No newline at end of file