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

[#1177] Add SQL Console module to jOOQ - Dependency on DJ Swing Suite is removed.

Browse Source
This commit is contained in:
Chrriis 2012-02-23 20:34:11 +00:00
parent 455b5ecb95
commit 001b99b096
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jOOQ-sql-console/.classpath
View File

@ -3,7 +3,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="lib" path="jars/rsyntaxtextarea.jar"/>
<classpathentry kind="lib" path="jars/DJSwingSuite.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry exported="true" kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/jOOQ"/>

BIN
jOOQ-sql-console/jars/DJSwingSuite.jar
View File

Binary file not shown.

14
jOOQ-sql-console/src/main/java/org/jooq/debugger/console/SqlEditorPane.java
View File

@ -69,6 +69,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Timestamp;
import java.sql.Types;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@ -87,6 +88,7 @@ import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JFormattedTextField;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JMenuItem;
@ -125,8 +127,6 @@ import org.jooq.debugger.console.misc.Utils;
import org.fife.ui.rtextarea.RTextScrollPane;
import chrriis.dj.swingsuite.JNumberEntryField;
/**
* @author Christopher Deckers
*/
@ -134,7 +134,7 @@ public class SqlEditorPane extends JPanel {
private static final int MAX_ROW_COUNT = 10000;
private boolean isUsingMaxRowCount = true;
private JNumberEntryField<Integer> displayedRowCountField;
private JFormattedTextField displayedRowCountField;
private DatabaseDescriptor databaseDescriptor;
private SqlTextArea editorTextArea;
@ -170,7 +170,11 @@ public class SqlEditorPane extends JPanel {
});
northPanel.add(stopButton);
northPanel.add(new JLabel("No display when rows >"));
displayedRowCountField = new JNumberEntryField<Integer>(100000, 7, 1, Integer.MAX_VALUE);
NumberFormat numberFormat = NumberFormat.getIntegerInstance();
displayedRowCountField = new JFormattedTextField(numberFormat);
displayedRowCountField.setHorizontalAlignment(JFormattedTextField.RIGHT);
displayedRowCountField.setValue(100000);
displayedRowCountField.setColumns(7);
northPanel.add(displayedRowCountField);
add(northPanel, BorderLayout.NORTH);
// editorTextArea = new JTextArea();
@ -320,7 +324,7 @@ public class SqlEditorPane extends JPanel {
private volatile Thread evaluationThread;
private void evaluate_unrestricted(final String sql) {
final int maxDisplayedRowCount = displayedRowCountField.getNumber();
final int maxDisplayedRowCount = ((Number)displayedRowCountField.getValue()).intValue();
evaluationThread = new Thread("SQLConsole - Evaluation") {
@Override
public void run() {