Attachment #149524 for bug #188051

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 188051
Collapse All | Expand All





package org.netbeans.modules.db.explorer.action;

import java.util.HashSet;
import java.util.Set;
import org.netbeans.modules.db.explorer.DatabaseConnection;
import org.netbeans.modules.db.explorer.sql.editor.SQLEditorSupport;
import org.openide.nodes.Node;

import org.openide.util.NbBundle;

/**
 * Open an sql editor as an sql console.
 *
 * @author Rob Englander
 */
public class ExecuteCommandAction extends BaseAction {
    @Override
    protected boolean enable(Node[] activatedNodes) {
        return true; // This action is always enabled
            return false;
        }

    @Override
    public void performAction (Node[] activatedNodes) {
        // If exactly one DatabaseConnection can be detected via the activated
        // nodes, that database connection is set as the default connection
        Set<DatabaseConnection> dbconnSet = new HashSet<>();
        if (activatedNodes != null) {
            for (Node node : activatedNodes) {
                DatabaseConnection dbconn = node.getLookup().lookup(DatabaseConnection.class);
                if(dbconn != null) {
                    dbconnSet.add(dbconn);
        }

        return enabled;
    }
        }
        if(dbconnSet.size() == 1) {
            DatabaseConnection dbconn = dbconnSet.iterator().next();
            DatabaseConnection dbconn = activatedNodes[0].getLookup().lookup(DatabaseConnection.class);
            SQLEditorSupport.openSQLEditor(dbconn.getDatabaseConnection(), "", false); // NOI18N
        } else {
            SQLEditorSupport.openSQLEditor(null, "", false); // NOI18N
        }
    }


Lines 45-51 Link Here

(-)db/src/org/netbeans/modules/db/resources/mf-layer.xml (-16 / +45 lines)
45	-->	45	-->
46	<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">	46	<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
47	<filesystem>	47	<filesystem>
		48	<folder name="Actions">
		49	<folder name="Database">
		50	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
		51	<attr name="position" intvalue="100"/>
		52	</file>
		53	</folder>
		54	</folder>
48		55
		56	<folder name="Shortcuts">
		57	<file name="AS-Q.shadow">
		58	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance"/>
		59	</file>
		60	</folder>
		61
49	<folder name="Databases">	62	<folder name="Databases">
50	<folder name="Explorer">	63	<folder name="Explorer">
51	<folder name="Root">	64	<folder name="Root">
Lines 134-140 Link Here
134	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	147	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
135	<attr name="position" intvalue="200"/>	148	<attr name="position" intvalue="200"/>
136	</file>	149	</file>
137	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	150	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		151	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
138	<attr name="position" intvalue="250"/>	152	<attr name="position" intvalue="250"/>
139	</file>	153	</file>
140	<file name="Separator2.instance">	154	<file name="Separator2.instance">
Lines 231-237 Link Here
231	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	245	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
232	<attr name="position" intvalue="200"/>	246	<attr name="position" intvalue="200"/>
233	</file>	247	</file>
234	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	248	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		249	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
235	<attr name="position" intvalue="250"/>	250	<attr name="position" intvalue="250"/>
236	</file>	251	</file>
237	<file name="Separator2.instance">	252	<file name="Separator2.instance">
Lines 252-258 Link Here
252	</file>	267	</file>
253	</folder>	268	</folder>
254	<folder name="Actions">	269	<folder name="Actions">
255	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	270	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		271	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
256	<attr name="position" intvalue="250"/>	272	<attr name="position" intvalue="250"/>
257	</file>	273	</file>
258	<file name="Separator2.instance">	274	<file name="Separator2.instance">
Lines 286-292 Link Here
286	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">	302	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
287	<attr name="position" intvalue="100"/>	303	<attr name="position" intvalue="100"/>
288	</file>	304	</file>
289	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	305	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		306	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
290	<attr name="position" intvalue="125"/>	307	<attr name="position" intvalue="125"/>
291	</file>	308	</file>
292	<file name="Separator1.instance">	309	<file name="Separator1.instance">
Lines 339-345 Link Here
339	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	356	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
340	<attr name="position" intvalue="200"/>	357	<attr name="position" intvalue="200"/>
341	</file>	358	</file>
342	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	359	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		360	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
343	<attr name="position" intvalue="250"/>	361	<attr name="position" intvalue="250"/>
344	</file>	362	</file>
345	<file name="Separator2.instance">	363	<file name="Separator2.instance">
Lines 363-369 Link Here
363	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">	381	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
364	<attr name="position" intvalue="100"/>	382	<attr name="position" intvalue="100"/>
365	</file>	383	</file>
366	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	384	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		385	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
367	<attr name="position" intvalue="200"/>	386	<attr name="position" intvalue="200"/>
368	</file>	387	</file>
369	<file name="Separator.instance">	388	<file name="Separator.instance">
Lines 389-395 Link Here
389	</file>	408	</file>
390	</folder>	409	</folder>
391	<folder name="Actions">	410	<folder name="Actions">
392	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	411	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		412	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
393	<attr name="position" intvalue="250"/>	413	<attr name="position" intvalue="250"/>
394	</file>	414	</file>
395	<file name="Separator2.instance">	415	<file name="Separator2.instance">
Lines 420-426 Link Here
420	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	440	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
421	<attr name="position" intvalue="90"/>	441	<attr name="position" intvalue="90"/>
422	</file>	442	</file>
423	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	443	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		444	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
424	<attr name="position" intvalue="100"/>	445	<attr name="position" intvalue="100"/>
425	</file>	446	</file>
426	<file name="Separator1.instance">	447	<file name="Separator1.instance">
Lines 441-447 Link Here
441	<folder name="NodeProviders">	462	<folder name="NodeProviders">
442	</folder>	463	</folder>
443	<folder name="Actions">	464	<folder name="Actions">
444	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	465	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		466	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
445	<attr name="position" intvalue="100"/>	467	<attr name="position" intvalue="100"/>
446	</file>	468	</file>
447	<file name="org-openide-actions-PropertiesAction.shadow">	469	<file name="org-openide-actions-PropertiesAction.shadow">
Lines 466-472 Link Here
466	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	488	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
467	<attr name="position" intvalue="250"/>	489	<attr name="position" intvalue="250"/>
468	</file>	490	</file>
469	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	491	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		492	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
470	<attr name="position" intvalue="300"/>	493	<attr name="position" intvalue="300"/>
471	</file>	494	</file>
472	</folder>	495	</folder>
Lines 484-490 Link Here
484	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>	507	<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
485	<attr name="position" intvalue="200"/>	508	<attr name="position" intvalue="200"/>
486	</file>	509	</file>
487	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	510	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		511	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
488	<attr name="position" intvalue="250"/>	512	<attr name="position" intvalue="250"/>
489	</file>	513	</file>
490	<file name="Separator2.instance">	514	<file name="Separator2.instance">
Lines 517-523 Link Here
517	</file>	541	</file>
518	</folder>	542	</folder>
519	<folder name="Actions">	543	<folder name="Actions">
520	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	544	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		545	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
521	<attr name="position" intvalue="100"/>	546	<attr name="position" intvalue="100"/>
522	</file>	547	</file>
523	<file name="org-netbeans-modules-db-explorer-action-RefreshAction.instance">	548	<file name="org-netbeans-modules-db-explorer-action-RefreshAction.instance">
Lines 534-540 Link Here
534	</file>	559	</file>
535	</folder>	560	</folder>
536	<folder name="Actions">	561	<folder name="Actions">
537	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	562	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		563	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
538	<attr name="position" intvalue="100"/>	564	<attr name="position" intvalue="100"/>
539	</file>	565	</file>
540	<file name="Separator1.instance">	566	<file name="Separator1.instance">
Lines 553-559 Link Here
553	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">	579	<file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
554	<attr name="position" intvalue="100"/>	580	<attr name="position" intvalue="100"/>
555	</file>	581	</file>
556	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	582	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		583	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
557	<attr name="position" intvalue="200"/>	584	<attr name="position" intvalue="200"/>
558	</file>	585	</file>
559	<file name="Separator1.instance">	586	<file name="Separator1.instance">
Lines 574-580 Link Here
574	<folder name="NodeProviders">	601	<folder name="NodeProviders">
575	</folder>	602	</folder>
576	<folder name="Actions">	603	<folder name="Actions">
577	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	604	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		605	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
578	<attr name="position" intvalue="100"/>	606	<attr name="position" intvalue="100"/>
579	</file>	607	</file>
580	<file name="org-openide-actions-PropertiesAction.shadow">	608	<file name="org-openide-actions-PropertiesAction.shadow">
Lines 587-593 Link Here
587	<folder name="NodeProviders">	615	<folder name="NodeProviders">
588	</folder>	616	</folder>
589	<folder name="Actions">	617	<folder name="Actions">
590	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">	618	<file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
		619	<attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
591	<attr name="position" intvalue="100"/>	620	<attr name="position" intvalue="100"/>
592	</file>	621	</file>
593	<file name="org-openide-actions-PropertiesAction.shadow">	622	<file name="org-openide-actions-PropertiesAction.shadow">

Return to bug 188051

Lines 42-47 Link Here

(-)db/src/org/netbeans/modules/db/explorer/action/ExecuteCommandAction.java (-14 / +20 lines)
42		42
43	package org.netbeans.modules.db.explorer.action;	43	package org.netbeans.modules.db.explorer.action;
44		44
		45	import java.util.HashSet;
		46	import java.util.Set;
45	import org.netbeans.modules.db.explorer.DatabaseConnection;	47	import org.netbeans.modules.db.explorer.DatabaseConnection;
46	import org.netbeans.modules.db.explorer.sql.editor.SQLEditorSupport;	48	import org.netbeans.modules.db.explorer.sql.editor.SQLEditorSupport;
47	import org.openide.nodes.Node;	49	import org.openide.nodes.Node;
Lines 49-78 Link Here
49	import org.openide.util.NbBundle;	51	import org.openide.util.NbBundle;
50		52
51	/**	53	/**
		54	* Open an sql editor as an sql console.
52	*	55	*
53	* @author Rob Englander	56	* @author Rob Englander
54	*/	57	*/
55	public class ExecuteCommandAction extends BaseAction {	58	public class ExecuteCommandAction extends BaseAction {
56		59	@Override
57	protected boolean enable(Node[] activatedNodes) {	60	protected boolean enable(Node[] activatedNodes) {
58	if (activatedNodes == null \|\| activatedNodes.length != 1) {	61	return true; // This action is always enabled
59	return false;
60	}	62	}
61		63
62	boolean enabled = false;	64	@Override
63	DatabaseConnection dbconn = activatedNodes[0].getLookup().lookup(DatabaseConnection.class);	65	public void performAction (Node[] activatedNodes) {
64		66	// If exactly one DatabaseConnection can be detected via the activated
65	if (dbconn != null) {	67	// nodes, that database connection is set as the default connection
66	enabled = DatabaseConnection.isVitalConnection(dbconn.getConnection(), dbconn);	68	Set<DatabaseConnection> dbconnSet = new HashSet<>();
		69	if (activatedNodes != null) {
		70	for (Node node : activatedNodes) {
		71	DatabaseConnection dbconn = node.getLookup().lookup(DatabaseConnection.class);
		72	if(dbconn != null) {
		73	dbconnSet.add(dbconn);
67	}	74	}
68
69	return enabled;
70	}	75	}
71		76	}
72	public void performAction (Node[] activatedNodes) {	77	if(dbconnSet.size() == 1) {
73	if (activatedNodes != null && activatedNodes.length == 1) {	78	DatabaseConnection dbconn = dbconnSet.iterator().next();
74	DatabaseConnection dbconn = activatedNodes[0].getLookup().lookup(DatabaseConnection.class);
75	SQLEditorSupport.openSQLEditor(dbconn.getDatabaseConnection(), "", false); // NOI18N	79	SQLEditorSupport.openSQLEditor(dbconn.getDatabaseConnection(), "", false); // NOI18N
		80	} else {
		81	SQLEditorSupport.openSQLEditor(null, "", false); // NOI18N
76	}	82	}
77	}	83	}
78		84