TSK-279 Make markup extracted text be default for keyword hit

This commit is contained in:
adam-m 2011-12-09 12:27:04 -05:00
parent 41ed4ccbc6
commit 681c136f12
6 changed files with 38 additions and 1 deletions

View File

@ -63,5 +63,12 @@ public interface DataContentViewer {
* @return True if supported, else false
*/
public boolean isSupported(ContentNode node);
/**
* Checks whether the given viewer is preferred for the Node
* @param node Node to check for preference
* @return True if viewer preferred, else false
*/
public boolean isPreferred(ContentNode node);
}

View File

@ -22,6 +22,7 @@ import java.awt.Cursor;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
@ -95,6 +96,10 @@ public final class DataContentTopComponent extends TopComponent implements DataC
boolean isSupported(ContentNode node) {
return this.wrapped.isSupported(node);
}
boolean isPreferred(ContentNode node) {
return this.wrapped.isPreferred(node);
}
}
/**
@ -289,7 +294,7 @@ public final class DataContentTopComponent extends TopComponent implements DataC
int tempIndex = dataContentTabbedPane.getSelectedIndex();
for (int i = 0; i < totalTabs; i++) {
UpdateWrapper dcv = viewers.get(i);
dcv.resetComponent();
dcv.resetComponent();
// disable an unsupported tab (ex: picture viewer)
if (!dcv.isSupported(selectedNode)) {
@ -305,6 +310,9 @@ public final class DataContentTopComponent extends TopComponent implements DataC
}
} else {
dataContentTabbedPane.setEnabledAt(i, true);
if (dcv.isPreferred(currentNode))
dataContentTabbedPane.setSelectedIndex(i);
}
}
int newIndex = dataContentTabbedPane.getSelectedIndex();

View File

@ -320,6 +320,11 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
public boolean isSupported(ContentNode node) {
return true;
}
@Override
public boolean isPreferred(ContentNode node) {
return false;
}
@Override
public Component getComponent() {

View File

@ -148,6 +148,11 @@ public class DataContentViewerPicture extends javax.swing.JPanel implements Data
return false;
}
}
@Override
public boolean isPreferred(ContentNode node) {
return false;
}
@Override
public Component getComponent() {

View File

@ -299,6 +299,11 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
public boolean isSupported(ContentNode node) {
return true;
}
@Override
public boolean isPreferred(ContentNode node) {
return false;
}
@Override
public Component getComponent() {

View File

@ -64,6 +64,7 @@ public class ExtractedContentViewer implements DataContentViewer {
if (solrHasContent(selectedNode)) {
sources.add(new MarkupSource() {
@Override
@ -82,6 +83,7 @@ public class ExtractedContentViewer implements DataContentViewer {
return "Extracted Content";
}
});
}
// first source will be the default displayed
@ -121,6 +123,11 @@ public class ExtractedContentViewer implements DataContentViewer {
return !sources.isEmpty() || solrHasContent(node);
}
@Override
public boolean isPreferred(ContentNode node) {
return isSupported(node);
}
/**
* Set the MarkupSources for the panel to display (safe to call even if the