This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new d64ae47c8 cleanup
d64ae47c8 is described below
commit d64ae47c8f387be63ddd7ba4df6f16e4e3ff26f8
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Apr 12 14:37:58 2026 -0400
cleanup
---
.../apache/cayenne/modeler/util/TextAdapter.java | 49 +++++++---------------
.../cayenne/modeler/util/ValidatorTextAdapter.java | 30 ++++---------
2 files changed, 23 insertions(+), 56 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
index 53177955d..c7750b23f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
@@ -19,22 +19,16 @@
package org.apache.cayenne.modeler.util;
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.undo.JTextFieldUndoListener;
+import org.apache.cayenne.validation.ValidationException;
-import javax.swing.InputVerifier;
-import javax.swing.JComponent;
-import javax.swing.JTextField;
+import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.UndoableEditListener;
-import javax.swing.SwingUtilities;
import javax.swing.text.JTextComponent;
-
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
-import org.apache.cayenne.modeler.undo.JTextFieldUndoListener;
-import org.apache.cayenne.validation.ValidationException;
+import java.awt.*;
/**
* A validating adapter for JTextComponent. Implement {@link
#updateModel(String)} initialize model on text change.
@@ -51,22 +45,13 @@ public abstract class TextAdapter {
protected JTextComponent textComponent;
public TextAdapter(JTextField textField) {
- this(textField, true, false, true);
+ this(textField, true);
}
- public TextAdapter(JTextField textField, boolean checkOnFocusLost,
- boolean checkOnTyping, boolean checkOnEnter) {
-
+ public TextAdapter(JTextField textField, boolean checkOnEnter) {
this(textField, true, false);
-
if (checkOnEnter) {
-
- textField.addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent e) {
- updateModel();
- }
- });
+ textField.addActionListener(e -> updateModel());
}
}
@@ -74,8 +59,7 @@ public abstract class TextAdapter {
this(textField, false, true);
}
- public TextAdapter(JTextComponent textComponent, boolean checkOnFocusLost,
- boolean checkOnTyping) {
+ public TextAdapter(JTextComponent textComponent, boolean checkOnFocusLost,
boolean checkOnTyping) {
this.errorColor = ValidatorDialog.WARNING_COLOR;
this.defaultBGColor = textComponent.getBackground();
@@ -89,12 +73,7 @@ public abstract class TextAdapter {
textComponent.setInputVerifier(new InputVerifier() {
public boolean verify(JComponent c) {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- updateModel();
- }
- });
+ SwingUtilities.invokeLater(() -> updateModel());
// release focus after coloring the field...
return true;
}
@@ -105,18 +84,18 @@ public abstract class TextAdapter {
textComponent.getDocument().addDocumentListener(new
DocumentListener() {
public void insertUpdate(DocumentEvent e) {
- verifyTextChange(e);
+ verifyTextChange();
}
public void changedUpdate(DocumentEvent e) {
- verifyTextChange(e);
+ verifyTextChange();
}
public void removeUpdate(DocumentEvent e) {
- verifyTextChange(e);
+ verifyTextChange();
}
- void verifyTextChange(DocumentEvent e) {
+ void verifyTextChange() {
if (!modelUpdateDisabled) {
updateModel();
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
index ba612e2d7..84ba50ff0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
@@ -18,18 +18,16 @@
****************************************************************/
package org.apache.cayenne.modeler.util;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.util.Timer;
-import java.util.TimerTask;
+import org.apache.cayenne.validation.ValidationException;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
+import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
-
-import org.apache.cayenne.validation.ValidationException;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* Text adapter with live validation, which is fired in VALIDATION_DELAY time.
@@ -50,21 +48,11 @@ public abstract class ValidatorTextAdapter extends
TextAdapter {
}
public ValidatorTextAdapter(JTextField textField, boolean
liveCheckEnabled) {
- super(textField, true, false, true);
+ super(textField, true);
setLiveCheckEnabled(liveCheckEnabled);
install(textField);
}
- public ValidatorTextAdapter(JTextArea textArea) {
- this(textArea, true);
- }
-
- public ValidatorTextAdapter(JTextArea textArea, boolean liveCheckEnabled) {
- super(textArea, true, false);
- setLiveCheckEnabled(liveCheckEnabled);
- install(textArea);
- }
-
protected void install(JTextComponent textComponent) {
TimerScheduler ts = new TimerScheduler();
@@ -124,7 +112,7 @@ public abstract class ValidatorTextAdapter extends
TextAdapter {
*/
protected String wrapTooltip(String tooltip) {
tooltip = encodeHTMLAttribute(tooltip);
- tooltip = tooltip.replaceAll(System.getProperty("line.separator"),
"<br>");
+ tooltip = tooltip.replaceAll(System.lineSeparator(), "<br>");
return "<html>" + tooltip + "</html>";
}
@@ -207,6 +195,6 @@ public abstract class ValidatorTextAdapter extends
TextAdapter {
if (validationTimer != null) {
validationTimer.cancel();
}
- };
+ }
}
}
