package jalview.io.cache;
+import jalview.bin.Cache;
import jalview.util.MessageManager;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
private static final long serialVersionUID = 5774610435079326695L;
- private String cacheKey;
+ private static final int INPUT_LIMIT = 2;
- private AppCache appCache;
+ private static final int LEFT_BOARDER_WIDTH = 2;
- JPanel pnlDefaultCache = new JPanel();
+ private String cacheKey;
- JLabel lblDefaultCacheSize = new JLabel();
+ private AppCache appCache;
- JTextField txtDefaultCacheSize = new JTextField();
+ private JPanel pnlDefaultCache = new JPanel();
- JPopupMenu popup = new JPopupMenu();
+ private JLabel lblDefaultCacheSize = new JLabel();
- JMenuItem menuItemClearCache = new JMenuItem();
+ private JTextField txtDefaultCacheSize = new JTextField();
- final static int INPUT_LIMIT = 2;
+ private JPopupMenu popup = new JPopupMenu();
+ private JMenuItem menuItemClearCache = new JMenuItem();
- public JvCacheableInputBox(String cacheKey)
+ public JvCacheableInputBox(String newCacheKey)
{
super();
- this.cacheKey = cacheKey;
+ this.cacheKey = newCacheKey;
setEditable(true);
setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
appCache = AppCache.getInstance();
initCachePopupMenu();
- appCache.initCache(cacheKey);
+ initCache(newCacheKey);
updateCache();
}
+ /**
+ * Method for initialising cache items for a given cache key and populating
+ * the in-memory cache with persisted cache items
+ *
+ * @param cacheKey
+ */
+ private void initCache(String cacheKey)
+ {
+ // obtain persisted cache items from properties file as a delimited string
+ String delimitedCacheStr = Cache.getProperty(cacheKey);
+ if (delimitedCacheStr == null || delimitedCacheStr.isEmpty())
+ {
+ return;
+ }
+ // convert delimited cache items to a list of strings
+ List<String> persistedCacheItems = Arrays.asList(delimitedCacheStr
+ .split(AppCache.CACHE_DELIMITER));
+
+ LinkedHashSet<String> foundCacheItems = appCache
+ .getAllCachedItemsFor(cacheKey);// cacheItems.get(cacheKey);
+ if (foundCacheItems == null)
+ {
+ foundCacheItems = new LinkedHashSet<String>();
+ }
+ // populate memory cache
+ for (String cacheItem : persistedCacheItems)
+ {
+ foundCacheItems.add(cacheItem);
+ }
+ appCache.putCache(cacheKey, foundCacheItems);
+ }
/**
* Initialise this cache's pop-up menu
{
pnlDefaultCache.setBackground(Color.WHITE);
// pad panel so as to align with other menu items
- pnlDefaultCache.setBorder(BorderFactory.createEmptyBorder(0, 19, 0, 0));
+ pnlDefaultCache.setBorder(BorderFactory.createEmptyBorder(0,
+ LEFT_BOARDER_WIDTH, 0, 0));
txtDefaultCacheSize.setPreferredSize(new Dimension(45, 20));
lblDefaultCacheSize.setText(MessageManager
.getString("label.default_cache_size"));
}
}
});
- txtDefaultCacheSize.setText(appCache.getCacheLmit(cacheKey));
+ txtDefaultCacheSize.setText(appCache.getCacheLimit(cacheKey));
pnlDefaultCache.add(lblDefaultCacheSize);
pnlDefaultCache.add(txtDefaultCacheSize);
menuItemClearCache.setText(MessageManager
@Override
public void run()
{
- int cacheLimit = appCache.updateCacheLimit(cacheKey,
- 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())
{
public void persistCache()
{
appCache.persistCache(cacheKey);
- appCache.updateCacheLimit(cacheKey, txtDefaultCacheSize.getText());
+ int userLimit = txtDefaultCacheSize.getText().trim().isEmpty() ? Integer
+ .valueOf(AppCache.DEFAULT_LIMIT) : Integer
+ .valueOf(txtDefaultCacheSize.getText());
+ appCache.updateCacheLimit(cacheKey, userLimit);
}
/**