diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java index 1970853c20..901f901446 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java @@ -46,7 +46,7 @@ import org.sleuthkit.datamodel.TskException; /** * Viewer displays Artifacts associated with Contents */ -@ServiceProvider(service = DataContentViewer.class) +@ServiceProvider(service = DataContentViewer.class, position=3) public class DataContentViewerArtifact extends javax.swing.JPanel implements DataContentViewer{ private static int currentPage = 1; @@ -319,10 +319,8 @@ public class DataContentViewerArtifact extends javax.swing.JPanel implements Dat if(isSupported) { if(art == null) { return 3; - } else if(art.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) { - return 3; } else { - return 4; + return 5; } } else { return 0; diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java index 00e916e373..9ec3b8d1e0 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java @@ -39,7 +39,7 @@ import org.sleuthkit.datamodel.TskException; /** * Hex view of file contents. */ -@ServiceProvider(service = DataContentViewer.class) +@ServiceProvider(service = DataContentViewer.class, position=1) public class DataContentViewerHex extends javax.swing.JPanel implements DataContentViewer { private static long currentOffset = 0; diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java index 1f7e508d80..c92deeca35 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.TskData; * * @author dfickling */ -@ServiceProvider(service = DataContentViewer.class) +@ServiceProvider(service = DataContentViewer.class, position=5) public class DataContentViewerMedia extends javax.swing.JPanel implements DataContentViewer { private static final String[] IMAGES = new String[]{ ".jpg", ".jpeg", ".png", ".gif", ".jpe", ".bmp"}; @@ -303,7 +303,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo @Override public int isPreferred(Node node, boolean isSupported) { if(isSupported) { - return 5; + return 7; } else { return 0; } diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java index c2abad99f9..8b526600e7 100644 --- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java +++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java @@ -40,7 +40,7 @@ import org.sleuthkit.datamodel.TskException; /** * Viewer displays strings extracted from contents. */ -@ServiceProvider(service = DataContentViewer.class) +@ServiceProvider(service = DataContentViewer.class, position=2) public class DataContentViewerString extends javax.swing.JPanel implements DataContentViewer { private static long currentOffset = 0; @@ -429,14 +429,10 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC @Override public int isPreferred(Node node, boolean isSupported) { if(node != null && isSupported){ - StringContent scontent = node.getLookup().lookup(StringContent.class); - if(scontent != null){ - return 3; - } else { - return 2; - } + return 2; + } else { + return 0; } - return 0; } @Override