diff --git a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java index 9f803e83..217f79aa 100644 --- a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java +++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/documentation/database/DocumentationStorage.java @@ -7,8 +7,9 @@ */ package com.github.mdelambilly.graphdbplugin.language.cypher.documentation.database; -import com.google.common.base.Charsets; import com.google.common.io.Resources; + +import java.nio.charset.StandardCharsets; import com.intellij.openapi.diagnostic.Logger; import java.net.URL; @@ -45,7 +46,7 @@ private synchronized void initialize() { String filePath = documentationDir + "/" + name + ".html"; try { URL documentationFile = DocumentationStorage.class.getResource(filePath); - String documentation = Resources.toString(documentationFile, Charsets.UTF_8); + String documentation = Resources.toString(documentationFile, StandardCharsets.UTF_8); cache.put(name.toLowerCase(), documentation); } catch (Exception e) { diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java index d3332b33..51c89431 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/highlighter/QueryHighlighterComponentImpl.java @@ -9,7 +9,6 @@ import com.intellij.openapi.Disposable; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.EditorFactory; import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterCaretListener; import com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.listener.QueryHighlighterDocumentListener; @@ -21,7 +20,7 @@ public class QueryHighlighterComponentImpl implements QueryHighlighterComponent, private final SyncedElementHighlighter syncedElementHighlighter; public QueryHighlighterComponentImpl() { - EditorFactory editorFactory = ApplicationManager.getApplication().getComponent(EditorFactory.class); + EditorFactory editorFactory = EditorFactory.getInstance(); syncedElementHighlighter = new SyncedElementHighlighter(); queryHighlighterCaretListener = new QueryHighlighterCaretListener(syncedElementHighlighter); @@ -33,7 +32,7 @@ public QueryHighlighterComponentImpl() { @Override public void dispose() { - EditorFactory editorFactory = ApplicationManager.getApplication().getComponent(EditorFactory.class); + EditorFactory editorFactory = EditorFactory.getInstance(); if (queryHighlighterCaretListener != null) { editorFactory.getEventMulticaster().removeCaretListener(queryHighlighterCaretListener); } diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java index 8417213b..f1801beb 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/component/linemarker/CypherLineMarkerProvider.java @@ -13,8 +13,8 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.editor.markup.GutterIconRenderer; import com.intellij.psi.PsiElement; import com.github.mdelambilly.graphdbplugin.language.cypher.util.PsiTraversalUtilities; @@ -53,8 +53,11 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement element) { AllIcons.Actions.Execute, element1 -> "Execute Query", (mouseEvent, psiElement) -> - getDataContext().ifPresent(c -> - ActionUtil.invokeAction(new ExecuteQueryAction(queryElement), c, "", mouseEvent, null)), + getDataContext().ifPresent(c -> { + ExecuteQueryAction action = new ExecuteQueryAction(queryElement); + AnActionEvent event = AnActionEvent.createFromAnAction(action, mouseEvent, "", c); + action.actionPerformed(event); + }), GutterIconRenderer.Alignment.CENTER, () -> "Execute Query") { @Override diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java index 25db9c30..523a79e7 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/graph/GraphPanel.java @@ -20,7 +20,7 @@ import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; -import com.intellij.ui.popup.BalloonPopupBuilderImpl; +import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.messages.MessageBus; @@ -175,7 +175,7 @@ public void resetPan() { } private void balloonBuilder() { - final BalloonPopupBuilderImpl builder = new BalloonPopupBuilderImpl(null, balloonLabel); + final BalloonBuilder builder = JBPopupFactory.getInstance().createBalloonBuilder(balloonLabel); final Color bg = lookAndFeelService.getBackgroundColor(); final Color borderOriginal = lookAndFeelService.getEdgeStrokeColor(); diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java index a1911a8a..8f7c6024 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/ui/console/params/ParametersService.java @@ -10,9 +10,11 @@ import com.github.mdelambilly.graphdbplugin.language.cypher.psi.impl.CypherParameterImpl; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.json.JsonReadFeature; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.google.common.base.Throwables; import com.intellij.psi.PsiElement; import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherTypes; @@ -24,12 +26,13 @@ public class ParametersService { - private static final ObjectMapper MAPPER = new ObjectMapper() - .configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true) - .configure(JsonParser.Feature.ALLOW_COMMENTS, true) - .configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true) - .configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true) - .configure(JsonParser.Feature.ALLOW_NUMERIC_LEADING_ZEROS, true); + private static final ObjectMapper MAPPER = JsonMapper.builder() + .enable(JsonReadFeature.ALLOW_SINGLE_QUOTES) + .enable(JsonReadFeature.ALLOW_JAVA_COMMENTS) + .enable(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES) + .enable(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS) + .enable(JsonReadFeature.ALLOW_LEADING_ZEROS_FOR_NUMBERS) + .build(); private static final JsonFactory FACTORY = MAPPER.getFactory(); diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java index cd3afece..16ad7cd4 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/FileUtil.java @@ -9,7 +9,6 @@ import com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.state.DataSourceApi; import com.intellij.ide.scratch.ScratchFileService; -import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; @@ -32,22 +31,18 @@ public class FileUtil { private static final FileAttribute QUERY_PARAMS_FILE_ATTRIBUTE = new FileAttribute("queryParamsFileAttribute"); public static VirtualFile getDataSourceFile(Project project, DataSourceApi dataSource) throws IOException { - return ReadAction.compute(() -> - ScratchFileService.getInstance().findFile( - GraphDbEditorsConsoleRootType.getInstance(), - NameUtil.createDataSourceFileName(dataSource), - ScratchFileService.Option.create_if_missing - ) + return ScratchFileService.getInstance().findFile( + GraphDbEditorsConsoleRootType.getInstance(), + NameUtil.createDataSourceFileName(dataSource), + ScratchFileService.Option.create_if_missing ); } public static VirtualFile getScratchFile(Project project, String fileName) throws IOException { - return ReadAction.compute(() -> - ScratchFileService.getInstance().findFile( - ParameterRootType.getInstance(), - project.getName() + fileName, - ScratchFileService.Option.create_if_missing - ) + return ScratchFileService.getInstance().findFile( + ParameterRootType.getInstance(), + project.getName() + fileName, + ScratchFileService.Option.create_if_missing ); } diff --git a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java index 0914160b..ecc614e8 100644 --- a/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java +++ b/ui/jetbrains/src/main/java/com/github/mdelambilly/graphdbplugin/jetbrains/util/PluginUtil.java @@ -22,7 +22,7 @@ public static String getVersion() { } public static boolean isEnabled() { - return plugin().isEnabled(); + return plugin() != null; } private static IdeaPluginDescriptor plugin() {