X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fcache%2FJvCacheableInputBox.java;h=9ec3a9f6658beb7e3554495317ab64961c935788;hb=48e68905336d8ee17ee6b3903d80b36bac8c56cf;hp=3d0daed971ba09814fe63a8497bb0b88c7f4186f;hpb=f6123f656fa387e11f506dedd09672a0d0ff5ac5;p=jalview.git diff --git a/src/jalview/io/cache/JvCacheableInputBox.java b/src/jalview/io/cache/JvCacheableInputBox.java index 3d0daed..9ec3a9f 100644 --- a/src/jalview/io/cache/JvCacheableInputBox.java +++ b/src/jalview/io/cache/JvCacheableInputBox.java @@ -22,12 +22,14 @@ package jalview.io.cache; import jalview.bin.Cache; import jalview.util.MessageManager; +import jalview.util.Platform; -import java.awt.Color; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusListener; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -35,49 +37,104 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import javax.swing.BorderFactory; import javax.swing.JComboBox; -import javax.swing.JLabel; +import javax.swing.JComponent; import javax.swing.JMenuItem; -import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JTextField; import javax.swing.SwingUtilities; -import javax.swing.text.AttributeSet; -import javax.swing.text.BadLocationException; -import javax.swing.text.PlainDocument; +import javax.swing.event.CaretListener; +import javax.swing.event.DocumentListener; +import javax.swing.text.JTextComponent; -public class JvCacheableInputBox extends JComboBox +/** + * A class that provides an editable combobox with a memory of previous entries + * that may be persisted + * + * @author tcofoegbu + * + * @param + */ +/* + * (temporary?) patches to wrap a JTextField instead when running as Javascript + */ +public class JvCacheableInputBox { + protected JComboBox comboBox; // used for Jalview - private static final long serialVersionUID = 5774610435079326695L; + protected JTextField textField; // used for JalviewJS - private static final int INPUT_LIMIT = 2; + protected JTextComponent textComponent; // used for both - private static final int LEFT_BOARDER_WIDTH = 16; + protected String cacheKey; - private String cacheKey; + protected AppCache appCache; - private AppCache appCache; + private JPopupMenu popup = new JPopupMenu(); - private JPanel pnlDefaultCache = new JPanel(); + private JMenuItem menuItemClearCache = new JMenuItem(); - private JLabel lblDefaultCacheSize = new JLabel(); + volatile boolean enterWasPressed = false; - private JTextField txtDefaultCacheSize = new JTextField(); + private String prototypeDisplayValue; - private JPopupMenu popup = new JPopupMenu(); - - private JMenuItem menuItemClearCache = new JMenuItem(); + /** + * @return flag indicating if the most recent keypress was enter + */ + public boolean wasEnterPressed() + { + return enterWasPressed; + } + /** + * Constructor + * + * @param newCacheKey + */ public JvCacheableInputBox(String newCacheKey) { - super(); - this.cacheKey = newCacheKey; - setEditable(true); - setPrototypeDisplayValue( - "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - appCache = AppCache.getInstance(); + // super(); + cacheKey = newCacheKey; + prototypeDisplayValue = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; + boolean useTextField = Platform.isJS(); + // BH 2019.03 only switch for JavaScript here + // SwingJS TODO implement editable combo box + if (useTextField) + { + appCache = null; + textComponent = textField = new JTextField(); + // { + // @Override + // public Dimension getPreferredSize() { + // return super.getPreferredSize(); + //// FontMetrics fm = getFontMetrics(getFont()); + //// return new Dimension(fm.stringWidth(prototypeDisplayValue), + // fm.getHeight()); + // } + // }; + } + else + { + appCache = AppCache.getInstance(); + comboBox = new JComboBox<>(); + textComponent = (JTextComponent) comboBox.getEditor() + .getEditorComponent(); + comboBox.setEditable(true); + comboBox.addKeyListener(new KeyAdapter() + { + @Override + public void keyTyped(KeyEvent e) + { + enterWasPressed = false; + if (e.getKeyCode() == KeyEvent.VK_ENTER) + { + enterWasPressed = true; + } + // let event bubble up + } + }); + comboBox.setPrototypeDisplayValue(prototypeDisplayValue); + } initCachePopupMenu(); initCache(newCacheKey); updateCache(); @@ -91,6 +148,10 @@ public class JvCacheableInputBox extends JComboBox */ private void initCache(String cacheKey) { + if (appCache == null) + { + return; + } // obtain persisted cache items from properties file as a delimited string String delimitedCacheStr = Cache.getProperty(cacheKey); if (delimitedCacheStr == null || delimitedCacheStr.isEmpty()) @@ -105,7 +166,7 @@ public class JvCacheableInputBox extends JComboBox .getAllCachedItemsFor(cacheKey); if (foundCacheItems == null) { - foundCacheItems = new LinkedHashSet(); + foundCacheItems = new LinkedHashSet<>(); } // populate memory cache for (String cacheItem : persistedCacheItems) @@ -120,48 +181,11 @@ public class JvCacheableInputBox extends JComboBox */ private void initCachePopupMenu() { - pnlDefaultCache.setBackground(Color.WHITE); - // pad panel so as to align with other menu items - pnlDefaultCache.setBorder( - BorderFactory.createEmptyBorder(0, LEFT_BOARDER_WIDTH, 0, 0)); - txtDefaultCacheSize.setPreferredSize(new Dimension(45, 20)); - txtDefaultCacheSize.setFont(new java.awt.Font("Verdana", 0, 12)); - lblDefaultCacheSize - .setText(MessageManager.getString("label.default_cache_size")); - lblDefaultCacheSize.setFont(new java.awt.Font("Verdana", 0, 12)); - // Force input to accept only Integer entries up to length - INPUT_LIMIT - txtDefaultCacheSize.setDocument(new PlainDocument() + if (appCache == null) { - private static final long serialVersionUID = 1L; - - @Override - public void insertString(int offs, String str, AttributeSet a) - throws BadLocationException - { - if (getLength() + str.length() <= INPUT_LIMIT && isInteger(str)) - { - super.insertString(offs, str, a); - } - } - }); - txtDefaultCacheSize.addKeyListener(new java.awt.event.KeyAdapter() - { - @Override - public void keyPressed(KeyEvent e) - { - if (e.getKeyCode() == KeyEvent.VK_ENTER) - { - e.consume(); - updateCache(); - closePopup(); - } - } - }); - - txtDefaultCacheSize.setText(appCache.getCacheLimit(cacheKey)); - pnlDefaultCache.add(lblDefaultCacheSize); + return; + } menuItemClearCache.setFont(new java.awt.Font("Verdana", 0, 12)); - pnlDefaultCache.add(txtDefaultCacheSize); menuItemClearCache .setText(MessageManager.getString("action.clear_cached_items")); menuItemClearCache.addActionListener(new ActionListener() @@ -176,16 +200,9 @@ public class JvCacheableInputBox extends JComboBox } }); - popup.insert(pnlDefaultCache, 0); popup.add(menuItemClearCache); - setComponentPopupMenu(popup); - add(popup); - } - - private void closePopup() - { - popup.setVisible(false); - popup.transferFocus(); + comboBox.setComponentPopupMenu(popup); + comboBox.add(popup); } /** @@ -211,15 +228,16 @@ public class JvCacheableInputBox extends JComboBox */ public void updateCache() { + if (appCache == null) + { + return; + } SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - int userLimit = txtDefaultCacheSize.getText().trim().isEmpty() - ? Integer.valueOf(AppCache.DEFAULT_LIMIT) - : Integer.valueOf(txtDefaultCacheSize.getText()); - int cacheLimit = appCache.updateCacheLimit(cacheKey, userLimit); + int cacheLimit = Integer.parseInt(appCache.getCacheLimit(cacheKey)); String userInput = getUserInput(); if (userInput != null && !userInput.isEmpty()) { @@ -233,18 +251,18 @@ public class JvCacheableInputBox extends JComboBox } String lastSearch = userInput; - if (getItemCount() > 0) + if (comboBox.getItemCount() > 0) { - removeAllItems(); + comboBox.removeAllItems(); } Set cacheItems = appCache.getAllCachedItemsFor(cacheKey); - List reversedCacheItems = new ArrayList(); + List reversedCacheItems = new ArrayList<>(); reversedCacheItems.addAll(cacheItems); cacheItems = null; Collections.reverse(reversedCacheItems); if (lastSearch.isEmpty()) { - addItem(""); + comboBox.addItem(""); } if (reversedCacheItems != null && !reversedCacheItems.isEmpty()) @@ -265,12 +283,12 @@ public class JvCacheableInputBox extends JComboBox } else { - addItem(cacheItem); + comboBox.addItem(cacheItem); } } else { - addItem(cacheItem); + comboBox.addItem(cacheItem); } } appCache.putCache(cacheKey, foundCache); @@ -286,22 +304,101 @@ public class JvCacheableInputBox extends JComboBox */ public void persistCache() { + if (appCache == null) + { + return; + } appCache.persistCache(cacheKey); - int userLimit = txtDefaultCacheSize.getText().trim().isEmpty() - ? Integer.valueOf(AppCache.DEFAULT_LIMIT) - : Integer.valueOf(txtDefaultCacheSize.getText()); - appCache.updateCacheLimit(cacheKey, userLimit); } /** - * Method to obtain input text from the cache box + * Returns the trimmed text in the input field * * @return */ public String getUserInput() { - return getEditor().getItem() == null ? "" - : getEditor().getItem().toString().trim(); + if (comboBox == null) + { + return textField.getText().trim(); + } + Object item = comboBox.getEditor().getItem(); + return item == null ? "" : item.toString().trim(); + } + + public JComponent getComponent() + { + return (comboBox == null ? textField : comboBox); + } + + public void addActionListener(ActionListener actionListener) + { + if (comboBox == null) + { + textField.addActionListener(actionListener); + } + else + { + comboBox.addActionListener(actionListener); + } + } + + public void addDocumentListener(DocumentListener listener) + { + textComponent.getDocument().addDocumentListener(listener); + } + + public void addFocusListener(FocusListener focusListener) + { + textComponent.addFocusListener(focusListener); + } + + public void addKeyListener(KeyListener kl) + { + textComponent.addKeyListener(kl); + } + + public void addCaretListener(CaretListener caretListener) + { + textComponent.addCaretListener(caretListener); + } + + public void setEditable(boolean b) + { + if (comboBox != null) + { + comboBox.setEditable(b); + } + } + + public void setPrototypeDisplayValue(String string) + { + prototypeDisplayValue = string; + if (comboBox != null) + { + comboBox.setPrototypeDisplayValue(string); + } + } + + public void setSelectedItem(String userInput) + { + if (comboBox != null) + { + comboBox.setSelectedItem(userInput); + } + } + + public boolean isPopupVisible() + { + return (comboBox != null && comboBox.isPopupVisible()); + } + + public void addItem(String item) + { + if (comboBox != null) + { + comboBox.addItem(item); + } } }