CAY-2320 Modeler: Limit input into numeric fields to 10 digits

Author: stariy95

RELEASE-NOTES.txt

@@ -18,6 +18,7 @@ CAY-2447 Crypto support for LocalDateTime
 
 Bug Fixes:
 
+CAY-2320 Modeler: Limit input into numeric fields to 10 digits
 CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
 CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
 CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java

@@ -47,7 +47,7 @@
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
 import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.swing.components.LimitedJTextField;
+import org.apache.cayenne.swing.components.LimitedTextField;
 import org.apache.cayenne.swing.components.image.FilteredIconFactory;
 
 import javax.swing.Icon;
@@ -304,11 +304,11 @@ protected void rebuildTable(Procedure procedure) {
         directionColumn.setCellEditor(new CayenneCellEditor(directionEditor));
 
         TableColumn precisionColumn = table.getColumnModel().getColumn(ProcedureParameterTableModel.PARAMETER_PRECISION);
-        LimitedJTextField limitedPrecisionField = new LimitedJTextField(10);
+        LimitedTextField limitedPrecisionField = new LimitedTextField(10);
         precisionColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedPrecisionField));
 
         TableColumn lengthColumn = table.getColumnModel().getColumn(ProcedureParameterTableModel.PARAMETER_LENGTH);
-        LimitedJTextField limitedLengthField = new LimitedJTextField(10);
+        LimitedTextField limitedLengthField = new LimitedTextField(10);
         lengthColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedLengthField));
 
         moveUp.setEnabled(false);

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java

@@ -39,7 +39,7 @@
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
 import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.swing.components.LimitedJTextField;
+import org.apache.cayenne.swing.components.LimitedTextField;
 
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
@@ -182,11 +182,11 @@ protected void rebuildTable(DbEntity ent) {
         col.setCellEditor(Application.getWidgetFactory().createCellEditor(comboBox));
 
         TableColumn lengthColumn = table.getColumnModel().getColumn(model.lengthColumnId());
-        LimitedJTextField limitedLengthField = new LimitedJTextField(10);
+        LimitedTextField limitedLengthField = new LimitedTextField(10);
         lengthColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedLengthField));
 
         TableColumn scaleColumn = table.getColumnModel().getColumn(model.scaleColumnId());
-        LimitedJTextField limitedScaleField = new LimitedJTextField(10);
+        LimitedTextField limitedScaleField = new LimitedTextField(10);
         scaleColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedScaleField));
 
         tablePreferences.bind(table, null, null, null, model.nameColumnInd(), true);

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedDocument.java

@@ -0,0 +1,34 @@
+package org.apache.cayenne.swing.components;
+
+import javax.swing.JTextField;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
+
+public class LimitedTextField extends JTextField {
+
+    private static final long serialVersionUID = 5615520143950793884L;
+
+    public LimitedTextField(int limit) {
+        setDocument(new LimitedDocument(limit));
+    }
+
+    private static class LimitedDocument extends PlainDocument {
+
+        private static final long serialVersionUID = 2371422073526259311L;
+        private int limit;
+
+        LimitedDocument(int limit) {
+            super();
+            this.limit = limit;
+        }
+
+        public void insertString( int offset, String  str, AttributeSet attr ) throws BadLocationException {
+            if (str == null) return;
+
+            if ((getLength() + str.length()) <= limit) {
+                super.insertString(offset, str, attr);
+            }
+        }
+    }
+}