Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2367-DisableEditProfile

This commit is contained in:
William Schaefer 2017-03-07 17:26:52 -05:00
commit e9027d0c9e

View File

@ -155,26 +155,50 @@ class DropdownToolbar extends javax.swing.JPanel {
@Override @Override
public void propertyChange(PropertyChangeEvent evt) { public void propertyChange(PropertyChangeEvent evt) {
String changed = evt.getPropertyName(); if (RuntimeProperties.runningWithGUI()) {
if (changed.equals(Case.Events.CURRENT_CASE.toString())) { String changed = evt.getPropertyName();
dropPanel.clearSearchBox(); if (changed.equals(Case.Events.CURRENT_CASE.toString())) {
if (RuntimeProperties.runningWithGUI() || null == evt.getNewValue()) { if (null != evt.getNewValue()) {
try { /*
Server server = KeywordSearch.getServer(); * A case has been opened.
Index indexInfo = server.getIndexInfo(); */
if (server.coreIsOpen() && IndexFinder.getCurrentSolrVersion().equals(indexInfo.getSolrVersion())) { try {
boolean schemaIsCurrent = IndexFinder.getCurrentSchemaVersion().equals(indexInfo.getSchemaVersion()); Server server = KeywordSearch.getServer();
listsButton.setEnabled(schemaIsCurrent); Index indexInfo = server.getIndexInfo();
searchDropButton.setEnabled(true); if (server.coreIsOpen() && IndexFinder.getCurrentSolrVersion().equals(indexInfo.getSolrVersion())) {
dropPanel.setRegexSearchEnabled(schemaIsCurrent); /*
active = true; * Solr version is current, so check the Solr
} else { * schema version and selectively enable the ad
* hoc search UI components.
*/
boolean schemaIsCurrent = IndexFinder.getCurrentSchemaVersion().equals(indexInfo.getSchemaVersion());
listsButton.setEnabled(schemaIsCurrent);
searchDropButton.setEnabled(true);
dropPanel.setRegexSearchEnabled(schemaIsCurrent);
active = true;
} else {
/*
* Unsupported Solr version, disable the ad hoc
* search UI components.
*/
searchDropButton.setEnabled(false);
listsButton.setEnabled(false);
active = false;
}
} catch (KeywordSearchModuleException ex) {
/*
* Error, disable the ad hoc search UI components.
*/
logger.log(Level.SEVERE, "Error getting text index info", ex); //NON-NLS
searchDropButton.setEnabled(false); searchDropButton.setEnabled(false);
listsButton.setEnabled(false); listsButton.setEnabled(false);
active = false; active = false;
} }
} catch (KeywordSearchModuleException ex) { } else {
logger.log(Level.SEVERE, "Error getting text index info", ex); //NON-NLS /*
* A case has been closed.
*/
dropPanel.clearSearchBox();
searchDropButton.setEnabled(false); searchDropButton.setEnabled(false);
listsButton.setEnabled(false); listsButton.setEnabled(false);
active = false; active = false;