diff --git a/jOOQ-sql-console/.classpath b/jOOQ-sql-console/.classpath
index af47c13320..6b567e2d08 100644
--- a/jOOQ-sql-console/.classpath
+++ b/jOOQ-sql-console/.classpath
@@ -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"/>
diff --git a/jOOQ-sql-console/jars/DJSwingSuite.jar b/jOOQ-sql-console/jars/DJSwingSuite.jar
deleted file mode 100644
index 2497aced2f..0000000000
Binary files a/jOOQ-sql-console/jars/DJSwingSuite.jar and /dev/null differ
diff --git a/jOOQ-sql-console/src/main/java/org/jooq/debugger/console/SqlEditorPane.java b/jOOQ-sql-console/src/main/java/org/jooq/debugger/console/SqlEditorPane.java
index 01d3e81f55..160baaac33 100644
--- a/jOOQ-sql-console/src/main/java/org/jooq/debugger/console/SqlEditorPane.java
+++ b/jOOQ-sql-console/src/main/java/org/jooq/debugger/console/SqlEditorPane.java
@@ -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() {