Review comments fixed

Author: Vorago

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/GraphPanelInteractions.java

@@ -12,6 +12,8 @@
 import com.neueda.jetbrains.plugin.graphdb.visualization.VisualizationApi;
 import com.neueda.jetbrains.plugin.graphdb.visualization.events.EventType;
 
+import java.util.Optional;
+
 public class GraphPanelInteractions {
 
     private final GraphConsoleView graphConsoleView;

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/actions/MetadataAction.java

@@ -37,6 +37,6 @@ public void actionPerformed(AnActionEvent e) {
         DataSourcesComponent dataSourcesComponent = project.getComponent(DataSourcesComponent.class);
         Optional<DataSourceApi> dataSource = dataSourcesComponent.getDataSourceContainer().findDataSource(dataSourceUuid);
 
-        executeQueryEvent.executeQuery(dataSource.get(), payload);
+        dataSource.ifPresent(dataSourceApi -> executeQueryEvent.executeQuery(dataSourceApi, payload));
     }
 }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/metadata/actions/MetadataActionGroup.java

@@ -12,12 +12,12 @@
 public class MetadataActionGroup extends ActionGroup {
 
     private final String type;
-    private final String label;
+    private final String data;
     private final String dataSourceUuid;
 
-    public MetadataActionGroup(String type, String label, String dataSourceUuid) {
+    public MetadataActionGroup(String type, String data, String dataSourceUuid) {
         this.type = type;
-        this.label = label;
+        this.data = data;
         this.dataSourceUuid = dataSourceUuid;
     }
 
@@ -26,15 +26,13 @@ public MetadataActionGroup(String type, String label, String dataSourceUuid) {
     public AnAction[] getChildren(@Nullable AnActionEvent e) {
         switch (type) {
             case RELATIONSHIP_TYPES:
-                return new AnAction[]{new MetadataRelationshipAction(label, dataSourceUuid, "Query this relationship", "", NEO4J)};
+                return new AnAction[]{new MetadataRelationshipAction(data, dataSourceUuid, "Query this relationship", "", NEO4J)};
             case LABELS:
-                return new AnAction[]{new MetadataLabelAction(label, dataSourceUuid, "Query this label", "", NEO4J)};
+                return new AnAction[]{new MetadataLabelAction(data, dataSourceUuid, "Query this label", "", NEO4J)};
             case PROPERTY_KEYS:
-                return new AnAction[]{new MetadataPropertyKeyAction(label, dataSourceUuid, "Query this property", "", NEO4J)};
+                return new AnAction[]{new MetadataPropertyKeyAction(data, dataSourceUuid, "Query this property", "", NEO4J)};
             default:
                 return new AnAction[]{};
         }
     }
-
 }
-

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/ContextMenuService.java

@@ -1,7 +1,7 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree;
 
 import com.intellij.ui.treeStructure.PatchedDefaultMutableTreeNode;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.impl.DataSourceV1;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.dto.ContextMenu;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.dto.ValueWithIcon;
 
@@ -71,8 +71,8 @@ private Object extractUserObject(Object dataSourceNode) {
     }
 
     private String extractUuid(Object dsUserObject) {
-        if (dsUserObject instanceof DataSourceV1) {
-            return ((DataSourceV1) dsUserObject).getUUID();
+        if (dsUserObject instanceof DataSourceApi) {
+            return ((DataSourceApi) dsUserObject).getUUID();
         }
         return null;
     }

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/DataSourcesTreeMouseAdapter.java

@@ -8,6 +8,7 @@
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.actions.MetadataActionGroup;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.metadata.dto.ContextMenu;
 
+import javax.swing.*;
 import javax.swing.tree.TreePath;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -22,7 +23,7 @@ public class DataSourcesTreeMouseAdapter extends MouseAdapter {
 
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON3) {
+        if (SwingUtilities.isRightMouseButton(e)) {
             Tree tree = (Tree) e.getComponent();
             TreePath pathForLocation = tree.getPathForLocation(e.getX(), e.getY());