Context menu for tables (#126)

dwitry · Sergejs Muromcevs · commit 7ffa813d5ad5 · 2019-08-15T13:04:28.000+03:00
* `Copy` and `Copy value` actions * Part of #74
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/CopyToClipboardAction.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/CopyToClipboardAction.java
@@ -2,7 +2,6 @@
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.neueda.jetbrains.plugin.graphdb.database.api.data.NoIdGraphEntity;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.helpers.SerialisationHelper;
 import org.jetbrains.annotations.NotNull;
 
@@ -11,17 +10,17 @@
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 
-public class EntityCopyToClipboardAction extends AnAction {
-    private Object node;
+public class CopyToClipboardAction extends AnAction {
+    private Object object;
 
-    EntityCopyToClipboardAction(String title, String description, Icon icon, NoIdGraphEntity node) {
+    CopyToClipboardAction(String title, String description, Icon icon, Object object) {
         super(title, description, icon);
-        this.node = node;
+        this.object = object;
     }
 
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
-        StringSelection selection = new StringSelection(SerialisationHelper.convertToCsv(node));
+        StringSelection selection = new StringSelection(SerialisationHelper.convertToCsv(object));
         Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
         clipboard.setContents(selection, selection);
     }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/EntityActionGroup.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/graph/EntityActionGroup.java
@@ -7,6 +7,7 @@
 import com.neueda.jetbrains.plugin.graphdb.database.api.data.GraphRelationship;
 import com.neueda.jetbrains.plugin.graphdb.database.api.data.NoIdGraphEntity;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.ObjectModel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,19 +18,24 @@ public class EntityActionGroup extends ActionGroup {
     public EntityActionGroup(DataSourceApi dataSourceApi, NoIdGraphEntity entity) {
         if (entity instanceof GraphNode) {
             actions = new AnAction[]{
-                    new EntityCopyToClipboardAction("Copy node", "", null, entity),
+                    new CopyToClipboardAction("Copy node", "", null, entity),
                     new NodeEditAction("Edit node", "", null, dataSourceApi, (GraphNode) entity),
                     new NodeDeleteAction("Delete node", "", null, dataSourceApi, (GraphNode) entity),
             };
         } else if (entity instanceof GraphRelationship) {
             actions = new AnAction[]{
-                    new EntityCopyToClipboardAction("Copy relationship", "", null, entity),
+                    new CopyToClipboardAction("Copy relationship", "", null, entity),
                     new RelationshipEditAction("Edit relationship", "", null, dataSourceApi, (GraphRelationship) entity),
                     new RelationshipDeleteAction("Delete relationship", "", null, dataSourceApi, (GraphRelationship) entity)
             };
+        } else if (entity instanceof ObjectModel) {
+            actions = new AnAction[] {
+                    new CopyToClipboardAction("Copy " + entity.getRepresentation().toLowerCase(), "", null, entity),
+                    new CopyToClipboardAction("Copy value", "", null, ((ObjectModel) entity).getValue().orElse(null))
+            };
         } else {
             actions = new AnAction[]{
-                    new EntityCopyToClipboardAction("Copy " + entity.getRepresentation().toLowerCase(), "", null, entity)
+                    new CopyToClipboardAction("Copy " + entity.getRepresentation().toLowerCase(), "", null, entity)
             };
         }
     }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/TableContextMenuMouseAdapter.java
@@ -4,11 +4,15 @@
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.ui.table.JBTable;
 import com.intellij.ui.treeStructure.Tree;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.ObjectModel;
 
 import javax.swing.*;
 import javax.swing.tree.TreePath;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Optional;
+
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.helpers.UiHelper.cast;
 
 public class TableContextMenuMouseAdapter extends MouseAdapter {
 
@@ -23,16 +27,28 @@ public void mouseClicked(MouseEvent e) {
             int selectedColumn = table.columnAtPoint(e.getPoint());
 
             Object value = table.getModel().getValueAt(selectedRow, selectedColumn);
-            if (Tree.class.isAssignableFrom(value.getClass())) {
-                Tree tree = (Tree) value;
-
-                TreePath path = tree.getPathForLocation(e.getX(), e.getY());
-                DataContext dataContext = DataManager.getInstance()
-                        .getDataContext(table, e.getX(), e.getY());
 
-                contextMenuService.getContextMenu(path)
-                        .ifPresent(dto -> dto.showPopup(dataContext));
-            }
+            DataContext dataContext = DataManager.getInstance()
+                    .getDataContext(table, e.getX(), e.getY());
+
+            cast(value, Tree.class)
+                    .map(tree -> {
+                        TreePath path = tree.getPathForLocation(e.getX(), e.getY());
+                        return contextMenuService.getContextMenu(path);
+                    })
+                    .orElseGet(() -> {
+                        String columnName = table.getModel().getColumnName(selectedColumn);
+                        return new ObjectModel(trim(value), columnName, String.valueOf(value), null, value)
+                                .getContextMenu();
+                    })
+                    .ifPresent(c -> c.showPopup(dataContext));
         }
     }
+
+    private Object trim(Object value) {
+        return Optional.ofNullable(value)
+                .flatMap(e -> cast(e, String.class))
+                .map(s -> s.replaceAll("^\"|\"$", ""))
+                .orElse(null);
+    }
 }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/TreeMouseAdapter.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/TreeMouseAdapter.java
@@ -12,6 +12,8 @@
 import java.awt.event.MouseEvent;
 import java.util.Optional;
 
+import static com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.helpers.UiHelper.cast;
+
 public class TreeMouseAdapter extends MouseAdapter {
 
     private ContextMenuService contextMenuService = new ContextMenuService();
@@ -32,13 +34,4 @@ public void mouseClicked(MouseEvent e) {
                     .ifPresent(dto -> dto.showPopup(dataContext));
         }
     }
-
-    @SuppressWarnings("unchecked")
-    private <T> Optional<T> cast(Object o, Class<T> clazz) {
-        if (clazz.isInstance(o)) {
-            return Optional.of((T) o);
-        } else {
-            return Optional.empty();
-        }
-    }
 }
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/model/ObjectModel.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/tree/model/ObjectModel.java
@@ -35,7 +35,7 @@ public Optional<Icon> getIcon() {
 
     @Override
     public Optional<String> getText() {
-        return Optional.of(text);
+        return Optional.ofNullable(text);
     }
 
     @Override
diff --git a/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/helpers/UiHelper.java b/ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/helpers/UiHelper.java
@@ -7,17 +7,12 @@
 import com.neueda.jetbrains.plugin.graphdb.database.api.data.GraphRelationship;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource.state.DataSourceApi;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.TreeNodeModelApi;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.LabelsModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.ListModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.MapModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.NodeModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.ObjectModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.PropertiesModel;
-import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.RelationshipModel;
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.tree.model.*;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import static java.lang.String.format;
 
@@ -162,4 +157,13 @@ private static TreeNodeModelApi modelOf(Object value, String key, String descrip
     public static String representUiString(String value) {
             return format("\"%s\"", Objects.toString(value));
     }
+
+    @SuppressWarnings("unchecked")
+    public static  <T> Optional<T> cast(Object o, Class<T> clazz) {
+        if (clazz.isInstance(o)) {
+            return Optional.of((T) o);
+        } else {
+            return Optional.empty();
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public Optional<Icon> getIcon() {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public Optional<String> getText() {`
`38`		`- return Optional.of(text);`
	`38`	`+ return Optional.ofNullable(text);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`