You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/08/29 11:49:11 UTC
cayenne git commit: CAY-2320 Modeler: Limit input into numeric fields
to 10 digits
Repository: cayenne
Updated Branches:
refs/heads/master 5361c9f56 -> 399fc83ce
CAY-2320 Modeler: Limit input into numeric fields to 10 digits
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/399fc83c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/399fc83c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/399fc83c
Branch: refs/heads/master
Commit: 399fc83ce20116ac3c271e69b30e33d1ee482e1e
Parents: 5361c9f
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Aug 29 14:49:03 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Aug 29 14:49:03 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../modeler/editor/ProcedureParameterTab.java | 6 ++--
.../editor/dbentity/DbEntityAttributePanel.java | 6 ++--
.../swing/components/LimitedDocument.java | 22 -------------
.../swing/components/LimitedJTextField.java | 9 ------
.../swing/components/LimitedTextField.java | 34 ++++++++++++++++++++
6 files changed, 41 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index daf059b..f3f65af 100644
--- a/RELEASE-NOTES.txt
+++ b/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
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java
index 653d88d..f9d61fe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureParameterTab.java
@@ -47,7 +47,7 @@ import org.apache.cayenne.modeler.util.ModelerUtil;
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 @@ public class ProcedureParameterTab extends JPanel implements ProcedureParameterL
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);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
index 1a66661..6989f24 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.modeler.util.CayenneTable;
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 @@ public class DbEntityAttributePanel extends JPanel implements DbEntityDisplayLis
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);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedDocument.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedDocument.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedDocument.java
deleted file mode 100644
index 18efc0c..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedDocument.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.apache.cayenne.swing.components;
-
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.PlainDocument;
-
-public class LimitedDocument extends PlainDocument {
- 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);
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedJTextField.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedJTextField.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedJTextField.java
deleted file mode 100644
index 5769738..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedJTextField.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.apache.cayenne.swing.components;
-
-import javax.swing.JTextField;
-
-public class LimitedJTextField extends JTextField {
- public LimitedJTextField(int limit) {
- setDocument(new LimitedDocument(limit));
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/399fc83c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java
new file mode 100644
index 0000000..2d210fa
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.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);
+ }
+ }
+ }
+}