Author: [EMAIL PROTECTED]
Date: Fri Oct 17 14:44:31 2008
New Revision: 2794
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/SQLQueryAction.java
trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java
Log:
QueryDialog is once again a Query Dialog. This will allow the Dialog to
pass itself into the static method when created the default panel and add
itself to the window listener. By extending the panel again, we reduced the
need for an extra panel.
The SQLQueryAction was updated to accept this change.
Modified: trunk/src/ca/sqlpower/architect/swingui/action/SQLQueryAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/SQLQueryAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/SQLQueryAction.java Fri
Oct 17 14:44:31 2008
@@ -22,7 +22,6 @@
import java.awt.event.ActionEvent;
import javax.swing.JDialog;
-import javax.swing.JPanel;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.query.QueryDialog;
@@ -40,10 +39,7 @@
}
public void actionPerformed(ActionEvent e) {
- JDialog sqlQueryDialog = new JDialog(session.getArchitectFrame(),
Messages.getString("SQLQueryAction.dialogTitle"));
- JPanel sqlQueryPanel = new QueryDialog(session);
- sqlQueryDialog.setContentPane(sqlQueryPanel);
- sqlQueryDialog.setSize(900,450);
+ JDialog sqlQueryDialog = new QueryDialog(session,
session.getArchitectFrame(),
Messages.getString("SQLQueryAction.dialogTitle"));
sqlQueryDialog.setVisible(true);
Modified: trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java Fri Oct
17 14:44:31 2008
@@ -23,7 +23,8 @@
import java.awt.Dimension;
import javax.swing.JComponent;
-import javax.swing.JPanel;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.tree.TreeModel;
@@ -38,7 +39,7 @@
/**
* This is like DBVisualizer, only not. It'll be different, I promise,
trust me....
*/
-public class QueryDialog extends JPanel {
+public class QueryDialog extends JDialog {
private static Logger logger = Logger.getLogger(QueryDialog.class);
@@ -50,11 +51,10 @@
/**
* Creates and displays the window for executing SQL queries.
*/
- public QueryDialog(ArchitectSwingSession session) {
-
- /*
- * TODO the createQueryPanel does not accept a DBTree anymore, this will
be fixed later.
- */
+ public QueryDialog(ArchitectSwingSession session, JFrame sessionframe,
String title) {
+ super(sessionframe, title);
+ setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
+ setSize(900,450);
try {
dbTree = new DBTree(session);
} catch (ArchitectException e) {
@@ -64,7 +64,7 @@
TreeModel model = session.getSourceDatabases().getModel();
dbTree.setModel(model);
- queryPanel = SQLQueryUIComponents.createQueryPanel(session,
session.getContext().getPlDotIni());
+ queryPanel = SQLQueryUIComponents.createQueryPanel(session,
session.getContext().getPlDotIni(),this);
queryPanel.setMinimumSize(new Dimension(100,100));
buildUI(session);
