github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1177] Add SQL Console module to jOOQ - Debugger renaming.

Browse Source
This commit is contained in:
Chrriis 2012-02-26 11:14:44 +00:00
parent 4e03322e66
commit 3e07dbc36c
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jOOQ-sql-console/src/main/java/org/jooq/debug/console/SqlConsoleFrame.java → jOOQ-sql-console/src/main/java/org/jooq/debug/console/Console.java
View File

@ -95,12 +95,12 @@ import org.jooq.debug.console.remote.SqlRemoteQueryDebuggerClient;
/**
* @author Christopher Deckers
*/
public class SqlConsoleFrame extends JFrame {
public class Console extends JFrame {
private JTabbedPane mainTabbedPane;
private JTabbedPane editorTabbedPane;
public SqlConsoleFrame(final DatabaseDescriptor editorDatabaseDescriptor, boolean isShowingLoggingTab) {
public Console(final DatabaseDescriptor editorDatabaseDescriptor, boolean isShowingLoggingTab) {
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
JMenuBar menuBar = new JMenuBar();
JMenu fileMenu = new JMenu("File");
@ -140,7 +140,7 @@ public class SqlConsoleFrame extends JFrame {
aboutMenuItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
final JDialog aboutDialog = new JDialog(SqlConsoleFrame.this, "About jOOQ Console", ModalityType.APPLICATION_MODAL);
final JDialog aboutDialog = new JDialog(Console.this, "About jOOQ Console", ModalityType.APPLICATION_MODAL);
aboutDialog.setResizable(false);
Container contentPane = aboutDialog.getContentPane();
JPanel centerPane = new JPanel(new GridBagLayout());
@ -182,7 +182,7 @@ public class SqlConsoleFrame extends JFrame {
southPane.add(okButton);
contentPane.add(southPane, BorderLayout.SOUTH);
aboutDialog.pack();
aboutDialog.setLocationRelativeTo(SqlConsoleFrame.this);
aboutDialog.setLocationRelativeTo(Console.this);
aboutDialog.setVisible(true);
}
});
@ -229,15 +229,15 @@ public class SqlConsoleFrame extends JFrame {
}
if(editorTabbedPane != null) {
for(int i=editorTabbedPane.getTabCount()-2; i>=0; i--) {
((SqlEditorPane)editorTabbedPane.getComponentAt(i)).closeConnection();
((EditorPane)editorTabbedPane.getComponentAt(i)).closeConnection();
}
}
}
private SqlLoggerPane sqlLoggerPane;
private LoggerPane sqlLoggerPane;
private void addLoggerTab() {
sqlLoggerPane = new SqlLoggerPane();
sqlLoggerPane = new LoggerPane();
mainTabbedPane.addTab("Logger", sqlLoggerPane);
}
@ -378,7 +378,7 @@ public class SqlConsoleFrame extends JFrame {
}
public static void openConsole(DatabaseDescriptor databaseDescriptor, boolean isLoggingActive) {
SqlConsoleFrame sqlConsoleFrame = new SqlConsoleFrame(databaseDescriptor, true);
Console sqlConsoleFrame = new Console(databaseDescriptor, true);
sqlConsoleFrame.setLoggingActive(isLoggingActive);
sqlConsoleFrame.setVisible(true);
}
@ -397,7 +397,7 @@ public class SqlConsoleFrame extends JFrame {
private void addSQLEditorPane(DatabaseDescriptor databaseDescriptor) {
isAdjusting = true;
int index = editorTabbedPane.getTabCount() - 1;
final SqlEditorPane sqlEditorPane = new SqlEditorPane(databaseDescriptor);
final EditorPane sqlEditorPane = new EditorPane(databaseDescriptor);
String title = "Context " + contextCount++;
editorTabbedPane.insertTab(title, null, sqlEditorPane, null, index);
final JPanel tabComponent = new JPanel(new BorderLayout());
@ -414,7 +414,7 @@ public class SqlConsoleFrame extends JFrame {
if(editorTabbedPane.getTabCount() > 2) {
for(int i=editorTabbedPane.getTabCount()-1; i>=0; i--) {
if(editorTabbedPane.getTabComponentAt(i) == tabComponent) {
((SqlEditorPane)editorTabbedPane.getComponentAt(i)).closeConnection();
((EditorPane)editorTabbedPane.getComponentAt(i)).closeConnection();
editorTabbedPane.removeTabAt(i);
if(i == editorTabbedPane.getTabCount() - 1) {
editorTabbedPane.setSelectedIndex(i - 1);
@ -443,8 +443,8 @@ public class SqlConsoleFrame extends JFrame {
sqlEditorPane.adjustDefaultFocus();
}
private SqlEditorPane getFocusedEditorPane() {
return (SqlEditorPane)editorTabbedPane.getSelectedComponent();
private EditorPane getFocusedEditorPane() {
return (EditorPane)editorTabbedPane.getSelectedComponent();
}
private static String[] getTableNames(DatabaseDescriptor databaseDescriptor) {
@ -477,7 +477,7 @@ public class SqlConsoleFrame extends JFrame {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
SqlConsoleFrame sqlConsoleFrame = new SqlConsoleFrame(null, true);
Console sqlConsoleFrame = new Console(null, true);
sqlConsoleFrame.setDefaultCloseOperation(EXIT_ON_CLOSE);
sqlConsoleFrame.setVisible(true);
}

6
jOOQ-sql-console/src/main/java/org/jooq/debug/console/SqlEditorPane.java → jOOQ-sql-console/src/main/java/org/jooq/debug/console/EditorPane.java
View File

@ -132,7 +132,7 @@ import org.fife.ui.rtextarea.RTextScrollPane;
/**
* @author Christopher Deckers
*/
public class SqlEditorPane extends JPanel {
public class EditorPane extends JPanel {
private static final int MAX_ROW_COUNT = 10000;
private boolean isUsingMaxRowCount = true;
@ -145,7 +145,7 @@ public class SqlEditorPane extends JPanel {
private JButton startButton;
private JButton stopButton;
SqlEditorPane(DatabaseDescriptor databaseDescriptor) {
EditorPane(DatabaseDescriptor databaseDescriptor) {
super(new BorderLayout());
this.databaseDescriptor = databaseDescriptor;
this.isDBEditable = !databaseDescriptor.isReadOnly();
@ -868,7 +868,7 @@ public class SqlEditorPane extends JPanel {
((TableRowSorter<?>)table.getRowSorter()).setRowFilter(new RowFilter<Object, Object>() {
@Override
public boolean include(javax.swing.RowFilter.Entry<? extends Object, ? extends Object> entry) {
String lcFilter = SqlEditorPane.this.filter.toLowerCase();
String lcFilter = EditorPane.this.filter.toLowerCase();
for (int i = entry.getValueCount() - 1; i >= 0; i--) {
if (entry.getStringValue(i).toLowerCase().contains(lcFilter)) {
return true;

4
jOOQ-sql-console/src/main/java/org/jooq/debug/console/SqlLoggerPane.java → jOOQ-sql-console/src/main/java/org/jooq/debug/console/LoggerPane.java
View File

@ -109,7 +109,7 @@ import org.jooq.debug.console.misc.XTableColumnModel;
/**
* @author Christopher Deckers
*/
public class SqlLoggerPane extends JPanel {
public class LoggerPane extends JPanel {
private static final SimpleDateFormat TIMESTAMP_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS");
@ -145,7 +145,7 @@ public class SqlLoggerPane extends JPanel {
private boolean isOtherQueryTypeDisplayed = true;
private boolean isScrollLocked;
public SqlLoggerPane() {
public LoggerPane() {
super(new BorderLayout());
setOpaque(false);
JPanel loggerHeaderPanel = new JPanel(new BorderLayout());