This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 5a00d44eb CAY-2934 Modeler: dropdown data trunction
5a00d44eb is described below
commit 5a00d44ebb0e23b44aa15dd9960b050554bf8101
Author: Andrus Adamchik <[email protected]>
AuthorDate: Thu May 7 09:55:17 2026 -0400
CAY-2934 Modeler: dropdown data trunction
cleanup
---
.../cayenne/modeler/toolkit/combobox/AutoCompletion.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
index b21669905..4bc660168 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
@@ -21,9 +21,7 @@ package org.apache.cayenne.modeler.toolkit.combobox;
import org.apache.cayenne.map.MappingNamespace;
-import javax.swing.JComboBox;
-import javax.swing.JList;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import javax.swing.text.JTextComponent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
@@ -41,11 +39,11 @@ public class AutoCompletion implements FocusListener,
KeyListener, Runnable {
private final SuggestionList suggestions;
- private final JComboBox comboBox;
+ private final JComboBox<?> comboBox;
private final JTextComponent textEditor;
private final boolean allowsUserValues;
- protected AutoCompletion(JComboBox comboBox, boolean strict, boolean
allowsUserValues, Supplier<MappingNamespace> namespaceSupplier) {
+ protected AutoCompletion(JComboBox<?> comboBox, boolean strict, boolean
allowsUserValues, Supplier<MappingNamespace> namespaceSupplier) {
this.comboBox = comboBox;
this.textEditor = ((JTextComponent)
comboBox.getEditor().getEditorComponent());
this.allowsUserValues = allowsUserValues;
@@ -57,7 +55,7 @@ public class AutoCompletion implements FocusListener,
KeyListener, Runnable {
/**
* Enables auto-completion for specified combobox
*/
- public static void enable(JComboBox comboBox, boolean strict, boolean
allowsUserValues, Supplier<MappingNamespace> namespaceSupplier) {
+ public static void enable(JComboBox<?> comboBox, boolean strict, boolean
allowsUserValues, Supplier<MappingNamespace> namespaceSupplier) {
comboBox.setEditable(true);
KeyListener[] listeners =
comboBox.getEditor().getEditorComponent().getListeners(KeyListener.class);
comboBox.setEditor(new CustomTypeComboBoxEditor(comboBox,
allowsUserValues, namespaceSupplier));
@@ -77,7 +75,7 @@ public class AutoCompletion implements FocusListener,
KeyListener, Runnable {
/**
* Enables auto-completion for specified combobox
*/
- public static void enable(JComboBox comboBox, Supplier<MappingNamespace>
namespaceSupplier) {
+ public static void enable(JComboBox<?> comboBox,
Supplier<MappingNamespace> namespaceSupplier) {
enable(comboBox, true, false, namespaceSupplier);
}
@@ -110,6 +108,7 @@ public class AutoCompletion implements FocusListener,
KeyListener, Runnable {
public void keyTyped(KeyEvent e) {
}
+ @Override
public void run() {
String text = textEditor.getText();
@@ -261,9 +260,8 @@ public class AutoCompletion implements FocusListener,
KeyListener, Runnable {
}
private void suggestionListScrolling() {
- JList list = suggestions.getList();
int selectedIndex = suggestions.getSelectedIndex();
- list.ensureIndexIsVisible(selectedIndex);
+ suggestions.getList().ensureIndexIsVisible(selectedIndex);
}
}