[power-architect commit] r2945 - in trunk/src/ca/sqlpower/architect/swingui: action query

Wed, 18 Feb 2009 15:21:31 -0800 


Author: thomasobrien95
Date: Wed Feb 18 15:18:38 2009
New Revision: 2945

Added:
trunk/src/ca/sqlpower/architect/swingui/query/QueryFrame.java (contents, props changed) - copied, changed from r2940, /trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java 
Removed:
   trunk/src/ca/sqlpower/architect/swingui/query/QueryDialog.java
Modified:
   trunk/src/ca/sqlpower/architect/swingui/action/SQLQueryAction.java
trunk/src/ca/sqlpower/architect/swingui/action/ShowTableContentsAction.java 

Log:
The SQL Query tool is now in a JFrame to prevent it from always being on top of Architect. 

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 Wed Feb 18 15:18:38 2009 
@@ -21,10 +21,10 @@

 import java.awt.event.ActionEvent;

-import javax.swing.JDialog;
+import javax.swing.JFrame;

 import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-import ca.sqlpower.architect.swingui.query.QueryDialog;
+import ca.sqlpower.architect.swingui.query.QueryFrame;

 /**
  * An action that opens a SQLQuery panel.
@@ -39,7 +39,7 @@
     }

     public void actionPerformed(ActionEvent e) {
- JDialog sqlQueryDialog = new QueryDialog(session, session.getArchitectFrame(), Messages.getString("SQLQueryAction.dialogTitle")); + JFrame sqlQueryDialog = new QueryFrame(session, Messages.getString("SQLQueryAction.dialogTitle")); 
         sqlQueryDialog.setVisible(true);
Modified: trunk/src/ca/sqlpower/architect/swingui/action/ShowTableContentsAction.java 
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/ShowTableContentsAction.java (original) +++ trunk/src/ca/sqlpower/architect/swingui/action/ShowTableContentsAction.java Wed Feb 18 15:18:38 2009 
@@ -21,10 +21,10 @@

 import java.awt.event.ActionEvent;

-import javax.swing.JDialog;
+import javax.swing.JFrame;

 import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-import ca.sqlpower.architect.swingui.query.QueryDialog;
+import ca.sqlpower.architect.swingui.query.QueryFrame;
 import ca.sqlpower.sqlobject.SQLTable;

 /**
@@ -46,7 +46,7 @@

     public void actionPerformed(ActionEvent e) {
         String sql = "SELECT * FROM " + table.toQualifiedName();
- JDialog sqlQueryDialog = new QueryDialog(session, session.getArchitectFrame(), Messages.getString("SQLQueryAction.dialogTitle"), table.getParentDatabase().getDataSource(), sql); + JFrame sqlQueryDialog = new QueryFrame(session, Messages.getString("SQLQueryAction.dialogTitle"), table.getParentDatabase().getDataSource(), sql); 
         sqlQueryDialog.setVisible(true);
     }
Copied: trunk/src/ca/sqlpower/architect/swingui/query/QueryFrame.java (from r2940, /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/QueryFrame.java Wed Feb 18 15:18:38 2009 
@@ -31,6 +31,7 @@

 import org.apache.log4j.Logger;

+import ca.sqlpower.architect.swingui.ASUtils;
 import ca.sqlpower.architect.swingui.ArchitectSwingSession;
 import ca.sqlpower.architect.swingui.DBTree;
 import ca.sqlpower.sql.SPDataSource;
@@ -40,9 +41,9 @@
 /**
* This is like DBVisualizer, only not. It'll be different, I promise, trust me.... 
  */
-public class QueryDialog extends JDialog {
+public class QueryFrame extends JFrame {

-    private static Logger logger = Logger.getLogger(QueryDialog.class);
+    private static Logger logger = Logger.getLogger(QueryFrame.class);

     private final DBTree dbTree;

@@ -52,8 +53,8 @@
     /**
      * Creates and displays the window for executing SQL queries.
      */
- public QueryDialog(ArchitectSwingSession session, JFrame sessionframe, String title) { 
-        this(session, sessionframe, title, null, null);
+    public QueryFrame(ArchitectSwingSession session, String title) {
+        this(session, title, null, null);
     }

     /**
@@ -62,8 +63,9 @@
      * window. If a null value is passed in for the ds or initialSQL
      * then no initial querying will be done.
      */
- public QueryDialog(ArchitectSwingSession session, JFrame sessionframe, String title, SPDataSource ds, String initialSQL) { 
-       super(sessionframe, title);
+ public QueryFrame(ArchitectSwingSession session, String title, SPDataSource ds, String initialSQL) { 
+       super(title);
+       setIconImage(ASUtils.getFrameIconImage());
        setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
        setSize(900,650);
        try {

Reply via email to