mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
TSK-279 Make markup extracted text be default for keyword hit
This commit is contained in:
parent
41ed4ccbc6
commit
681c136f12
@ -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);
|
||||
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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() {
|
||||
|
@ -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() {
|
||||
|
@ -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() {
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user