git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2418 source formatting
[jalview.git]
/
src
/
jalview
/
io
/
cache
/
JvCacheableInputBox.java
diff --git
a/src/jalview/io/cache/JvCacheableInputBox.java
b/src/jalview/io/cache/JvCacheableInputBox.java
index
06302c3
..
1949ef0
100644
(file)
--- a/
src/jalview/io/cache/JvCacheableInputBox.java
+++ b/
src/jalview/io/cache/JvCacheableInputBox.java
@@
-7,6
+7,7
@@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@
-33,7
+34,7
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
private static final int INPUT_LIMIT = 2;
private static final int INPUT_LIMIT = 2;
- private static final int LEFT_BOARDER_WIDTH = 2;
+ private static final int LEFT_BOARDER_WIDTH = 16;
private String cacheKey;
private String cacheKey;
@@
-54,7
+55,8
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
super();
this.cacheKey = newCacheKey;
setEditable(true);
super();
this.cacheKey = newCacheKey;
setEditable(true);
- setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+ setPrototypeDisplayValue(
+ "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
appCache = AppCache.getInstance();
initCachePopupMenu();
initCache(newCacheKey);
appCache = AppCache.getInstance();
initCachePopupMenu();
initCache(newCacheKey);
@@
-76,11
+78,11
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
return;
}
// convert delimited cache items to a list of strings
return;
}
// convert delimited cache items to a list of strings
- List<String> persistedCacheItems = Arrays.asList(delimitedCacheStr
- .split(AppCache.CACHE_DELIMITER));
+ List<String> persistedCacheItems = Arrays
+ .asList(delimitedCacheStr.split(AppCache.CACHE_DELIMITER));
LinkedHashSet<String> foundCacheItems = appCache
LinkedHashSet<String> foundCacheItems = appCache
- .getAllCachedItemsFor(cacheKey);// cacheItems.get(cacheKey);
+ .getAllCachedItemsFor(cacheKey);
if (foundCacheItems == null)
{
foundCacheItems = new LinkedHashSet<String>();
if (foundCacheItems == null)
{
foundCacheItems = new LinkedHashSet<String>();
@@
-100,11
+102,13
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
{
pnlDefaultCache.setBackground(Color.WHITE);
// pad panel so as to align with other menu items
{
pnlDefaultCache.setBackground(Color.WHITE);
// pad panel so as to align with other menu items
- pnlDefaultCache.setBorder(BorderFactory.createEmptyBorder(0,
- LEFT_BOARDER_WIDTH, 0, 0));
+ pnlDefaultCache.setBorder(
+ BorderFactory.createEmptyBorder(0, LEFT_BOARDER_WIDTH, 0, 0));
txtDefaultCacheSize.setPreferredSize(new Dimension(45, 20));
txtDefaultCacheSize.setPreferredSize(new Dimension(45, 20));
- lblDefaultCacheSize.setText(MessageManager
- .getString("label.default_cache_size"));
+ 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()
{
// Force input to accept only Integer entries up to length - INPUT_LIMIT
txtDefaultCacheSize.setDocument(new PlainDocument()
{
@@
-120,11
+124,26
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
}
}
});
}
}
});
+ 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);
txtDefaultCacheSize.setText(appCache.getCacheLimit(cacheKey));
pnlDefaultCache.add(lblDefaultCacheSize);
+ menuItemClearCache.setFont(new java.awt.Font("Verdana", 0, 12));
pnlDefaultCache.add(txtDefaultCacheSize);
pnlDefaultCache.add(txtDefaultCacheSize);
- menuItemClearCache.setText(MessageManager
- .getString("action.clear_cached_items"));
+ menuItemClearCache
+ .setText(MessageManager.getString("action.clear_cached_items"));
menuItemClearCache.addActionListener(new ActionListener()
{
@Override
menuItemClearCache.addActionListener(new ActionListener()
{
@Override
@@
-143,6
+162,12
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
add(popup);
}
add(popup);
}
+ private void closePopup()
+ {
+ popup.setVisible(false);
+ popup.transferFocus();
+ }
+
/**
* Answers true if input text is an integer
*
/**
* Answers true if input text is an integer
*
@@
-171,9
+196,9
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
@Override
public void run()
{
@Override
public void run()
{
- int userLimit = txtDefaultCacheSize.getText().trim().isEmpty() ? Integer
- .valueOf(AppCache.DEFAULT_LIMIT) : Integer
- .valueOf(txtDefaultCacheSize.getText());
+ int userLimit = txtDefaultCacheSize.getText().trim().isEmpty()
+ ? Integer.valueOf(AppCache.DEFAULT_LIMIT)
+ : Integer.valueOf(txtDefaultCacheSize.getText());
int cacheLimit = appCache.updateCacheLimit(cacheKey, userLimit);
String userInput = getUserInput();
if (userInput != null && !userInput.isEmpty())
int cacheLimit = appCache.updateCacheLimit(cacheKey, userLimit);
String userInput = getUserInput();
if (userInput != null && !userInput.isEmpty())
@@
-235,7
+260,6
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
});
}
});
}
-
/**
* This method should be called to persist the in-memory cache when this
* components parent frame is closed / exited
/**
* This method should be called to persist the in-memory cache when this
* components parent frame is closed / exited
@@
-243,9
+267,9
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
public void persistCache()
{
appCache.persistCache(cacheKey);
public void persistCache()
{
appCache.persistCache(cacheKey);
- int userLimit = txtDefaultCacheSize.getText().trim().isEmpty() ? Integer
- .valueOf(AppCache.DEFAULT_LIMIT) : Integer
- .valueOf(txtDefaultCacheSize.getText());
+ int userLimit = txtDefaultCacheSize.getText().trim().isEmpty()
+ ? Integer.valueOf(AppCache.DEFAULT_LIMIT)
+ : Integer.valueOf(txtDefaultCacheSize.getText());
appCache.updateCacheLimit(cacheKey, userLimit);
}
appCache.updateCacheLimit(cacheKey, userLimit);
}
@@
-256,8
+280,8
@@
public class JvCacheableInputBox<E> extends JComboBox<String>
*/
public String getUserInput()
{
*/
public String getUserInput()
{
- return getEditor().getItem() == null ? "" : getEditor().getItem()
- .toString().trim();
+ return getEditor().getItem() == null ? ""
+ : getEditor().getItem().toString().trim();
}
}
}
}