add context menus to tabs with close option

Author: pariskol

src/main/java/gr/sqlbrowserfx/nodes/SqlConsolePane.java

@@ -82,7 +82,7 @@ public SqlConsolePane(SqlConnector sqlConnector) {
         listeners = new ArrayList<>();
 
         queryTabPane = new TabPane();
-        DraggingTabPaneSupport draggingSupport = new DraggingTabPaneSupport("/icons/thunder.png");
+        var draggingSupport = new DraggingTabPaneSupport("/icons/thunder.png");
         draggingSupport.addSupport(queryTabPane);
         newConsoleTab = new Tab("");
         newConsoleTab.setGraphic(JavaFXUtils.createIcon("/icons/add.png"));
@@ -118,7 +118,7 @@ public SqlConsolePane(SqlConnector sqlConnector) {
         queryTabPane.getSelectionModel().selectedItemProperty().addListener(
                 (ov, oldTab, newTab) -> {
                     if (newTab.getContent() != null) {
-                        CodeArea codeArea = (oldTab.getContent() != null) ? ((VirtualizedScrollPane<CodeArea>) oldTab.getContent()).getContent()
+                    	var codeArea = (oldTab.getContent() != null) ? ((VirtualizedScrollPane<CodeArea>) oldTab.getContent()).getContent()
                                 : null;
 
                         if (codeArea instanceof TextAnalyzer) {
@@ -153,10 +153,10 @@ public SqlConsolePane(SqlConnector sqlConnector) {
         });
 
         this.setOnDragDropped(event -> {
-            Dragboard db = event.getDragboard();
-            boolean success = false;
+        	var db = event.getDragboard();
+        	var success = false;
             if (db.hasFiles()) {
-                File file = db.getFiles().get(0);
+            	var file = db.getFiles().get(0);
                 SqlConsolePane.this.openNewFileTab(file);
                 success = true;
             }
@@ -175,11 +175,11 @@ public void destroySplitPane() {
 
     @SuppressWarnings("unchecked")
     private void addTab() {
-        Tab selectedTab = queryTabPane.getSelectionModel().getSelectedItem();
+    	var selectedTab = queryTabPane.getSelectionModel().getSelectedItem();
         if (selectedTab == newConsoleTab) {
             this.openNewSqlConsoleTab();
         } else {
-            CodeArea codeArea = ((VirtualizedScrollPane<CodeArea>) selectedTab.getContent()).getContent();
+        	var codeArea = ((VirtualizedScrollPane<CodeArea>) selectedTab.getContent()).getContent();
             if (codeArea instanceof CSqlCodeArea) {
                 codeAreaRef = (CSqlCodeArea) codeArea;
             }
@@ -197,23 +197,28 @@ private void showFileSearchPopOver() {
 
         createFileSearchPopover();
 
-        Bounds boundsInScene = this.localToScreen(this.getBoundsInLocal());
+        var boundsInScene = this.localToScreen(this.getBoundsInLocal());
         fileSearchPopOver.show(toolbar, boundsInScene.getMaxX() - 620,
                 boundsInScene.getMinY());
     }
 
     private void openNewSqlConsoleTab() {
-        CSqlCodeArea sqlCodeArea = new CSqlCodeArea();
+    	var sqlCodeArea = new CSqlCodeArea();
         sqlCodeArea.wrapTextProperty().bind(this.wrapTextCheckBox.selectedProperty());
         sqlCodeArea.showLinesProperty().bind(this.showLinesCheckBox.selectedProperty());
         sqlCodeArea.autoCompleteProperty().bind(this.autoCompleteOnTypeCheckBox.selectedProperty());
 
         sqlCodeArea.setRunAction(this::executeButtonAction);
         sqlCodeArea.addEventHandler(SimpleEvent.EVENT_TYPE, simpleEvent -> SqlConsolePane.this.changed());
 
-        VirtualizedScrollPane<CodeArea> scrollPane = new VirtualizedScrollPane<>(sqlCodeArea);
-        Tab newTab = new Tab("query " + queryTabPane.getTabs().size(), scrollPane);
-        newTab.setOnClosed(event -> sqlCodeArea.stopTextAnalyzerDaemon());
+        var scrollPane = new VirtualizedScrollPane<>(sqlCodeArea);
+        var newTab = new Tab("query " + queryTabPane.getTabs().size(), scrollPane);
+        
+		var closeTabItem = new MenuItem("Close Tab", JavaFXUtils.createIcon("/icons/minus.png"));
+		closeTabItem.setOnAction(event -> newTab.getTabPane().getTabs().remove(newTab));
+		
+		newTab.setContextMenu(new ContextMenu(closeTabItem));
+		newTab.setOnClosed(event -> sqlCodeArea.stopTextAnalyzerDaemon());
 
         queryTabPane.getTabs().add(newTab);
         queryTabPane.getSelectionModel().select(newTab);

src/main/java/gr/sqlbrowserfx/nodes/sqlpane/SqlTableTab.java

@@ -1,16 +1,21 @@
 package gr.sqlbrowserfx.nodes.sqlpane;
 
+import gr.sqlbrowserfx.nodes.ContextMenuOwner;
 import gr.sqlbrowserfx.nodes.tableviews.SqlTableView;
 import gr.sqlbrowserfx.utils.JavaFXUtils;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.StackPane;
 
-public class SqlTableTab extends Tab {
+public class SqlTableTab extends Tab implements ContextMenuOwner {
 
 	private SqlTableView sqlTableView;
 	private TabPane recordsTabPane;
@@ -25,7 +30,7 @@ public SqlTableTab(String text, final SqlTableView sqlTableView) {
 		super(text, sqlTableView);
 		this.sqlTableView = sqlTableView;
 
-		Node graphic = JavaFXUtils.createIcon("/icons/table-e.png");
+		var graphic = JavaFXUtils.createIcon("/icons/table-e.png");
 		label = new Label(text, graphic);
 		label.textProperty().bind(this.getSqlTableView().titleProperty());
 		this.setText(null);
@@ -34,6 +39,7 @@ public SqlTableTab(String text, final SqlTableView sqlTableView) {
 			this.sqlTableView = null;
 			System.gc();
 		});
+		this.setContextMenu(this.createContextMenu());
 	}
 
 	public SqlTableView getSqlTableView() {
@@ -61,7 +67,7 @@ public void setCustomGraphic(Node graphic) {
 	}
 
 	public void startLoading() {
-		ProgressIndicator progressIndicator = new ProgressIndicator();
+		var progressIndicator = new ProgressIndicator();
 		progressIndicator.setMaxHeight(40);
 		progressIndicator.setMaxWidth(40);
 		this.setContent(new StackPane(progressIndicator));
@@ -71,4 +77,23 @@ public void load() {
 		this.setContent(sqlTableView);
 	}
 
+	@Override
+	public ContextMenu createContextMenu() {
+		var showQuery = new MenuItem("Show Query", JavaFXUtils.createIcon("/icons/thunder.png"));
+		showQuery.setOnAction(event -> {
+			new CustomPopOver(new Label(this.sqlTableView.getQuery())).show(this.getGraphic());
+		});
+		var copyQuery = new MenuItem("Copy Query", JavaFXUtils.createIcon("/icons/copy.png"));
+		copyQuery.setOnAction(event -> {
+            var content = new ClipboardContent();
+            content.putString(this.sqlTableView.getQuery());
+            Clipboard.getSystemClipboard().setContent(content);
+		});
+		var closeTab = new MenuItem("Close Tab", JavaFXUtils.createIcon("/icons/minus.png"));
+		closeTab.setOnAction(event -> {
+            this.getTabPane().getTabs().remove(this);
+		});
+		return new ContextMenu(showQuery, copyQuery, closeTab);
+	}
+
 }