From b1e75f31e22b52bb0bf8e615634f891ad287e32b Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 13 Jun 2012 10:10:52 -0400 Subject: [PATCH 1/3] Minor alignment --- .../autopsy/casemodule/AddImageVisualPanel1.form | 8 ++++---- .../autopsy/casemodule/AddImageVisualPanel1.java | 8 ++++---- .../org/sleuthkit/autopsy/casemodule/Bundle.properties | 1 - .../org/sleuthkit/autopsy/ingest/IngestDialogPanel.form | 9 +++++---- .../org/sleuthkit/autopsy/ingest/IngestDialogPanel.java | 9 +++++---- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form index ad0dac6c21..809858410c 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.form @@ -89,7 +89,7 @@ - + @@ -98,12 +98,12 @@ - - + + - + diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java index bd3303275b..e554e7ec62 100644 --- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java +++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageVisualPanel1.java @@ -329,7 +329,7 @@ final class AddImageVisualPanel1 extends JPanel implements DocumentListener { .addComponent(imgPathBrowserButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(multipleSelectLabel) - .addGap(17, 17, 17) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(timeZoneLabel) .addComponent(timeZoneComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) @@ -337,11 +337,11 @@ final class AddImageVisualPanel1 extends JPanel implements DocumentListener { .addComponent(optionsLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(noFatOrphansCheckbox) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 28, Short.MAX_VALUE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 18, Short.MAX_VALUE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(jLabel1) .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) + .addGap(25, 25, 25)) ); }// //GEN-END:initComponents diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties index 36defd4ee3..a29fc26e87 100755 --- a/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties +++ b/Case/src/org/sleuthkit/autopsy/casemodule/Bundle.properties @@ -126,5 +126,4 @@ NewCaseVisualPanel2.examinerTextField.text= NewCaseVisualPanel2.optionalLabel.text=Optional: Set Case Number and Examiner AddImageVisualPanel1.noFatOrphansCheckbox.toolTipText= AddImageVisualPanel1.noFatOrphansCheckbox.text=Ignore orphan files in FAT file systems -AddImageVisualPanel1.noProcessUnallocSpace.text=Ignore unallocated space AddImageVisualPanel1.optionsLabel1.text=Options to produce results faster (although some data will not be searched): diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form index 08ac98beba..e7a5f01004 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form @@ -28,7 +28,7 @@ - + @@ -177,10 +177,10 @@ - + - + @@ -189,8 +189,9 @@ + - + diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java index ef58b866fd..6d01ec2337 100644 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java @@ -291,17 +291,18 @@ public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfi .addGroup(timePanelLayout.createSequentialGroup() .addContainerGap() .addComponent(timeLabel) - .addContainerGap(72, Short.MAX_VALUE)) + .addContainerGap(68, Short.MAX_VALUE)) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, timePanelLayout.createSequentialGroup() - .addContainerGap(10, Short.MAX_VALUE) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(timePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(timeRadioButton3) .addComponent(timeRadioButton2) .addComponent(timeRadioButton1)) .addContainerGap()) .addGroup(timePanelLayout.createSequentialGroup() + .addContainerGap() .addComponent(processUnallocCheckbox) - .addContainerGap(20, Short.MAX_VALUE)) + .addContainerGap(10, Short.MAX_VALUE)) ); timePanelLayout.setVerticalGroup( timePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -326,7 +327,7 @@ public class IngestDialogPanel extends javax.swing.JPanel implements IngestConfi .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(servicesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE) + .addComponent(servicesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 169, Short.MAX_VALUE) .addComponent(timePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) From 553d421327fb4e7b5044f16f7c5329891ad2e108 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Wed, 13 Jun 2012 10:31:00 -0400 Subject: [PATCH 2/3] Updated doxygen config --- docs/doxygen/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index 8691e42e5d..0736d38863 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -883,7 +883,7 @@ GENERATE_HTML = YES # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = +HTML_OUTPUT = api-docs # The HTML_FILE_EXTENSION tag can be used to specify the file extension for # each generated HTML page (for example: .htm,.php,.asp). If it is left blank From 097e03bc60ca5c97705a3e8df225d64a88877711 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 13 Jun 2012 10:59:42 -0400 Subject: [PATCH 3/3] Extracted text viewer: deactivate for directories (they have no text content) --- .../keywordsearch/ExtractedContentViewer.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java index 3e55f8d194..87f6436f76 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java @@ -37,6 +37,8 @@ import org.apache.commons.lang.StringEscapeUtils; import org.sleuthkit.autopsy.datamodel.HighlightLookup; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.Content; +import org.sleuthkit.datamodel.ContentVisitor; +import org.sleuthkit.datamodel.Directory; /** * Displays marked-up (HTML) content for a Node. The sources are all the @@ -312,6 +314,19 @@ public class ExtractedContentViewer implements DataContentViewer { panel.setSources(sources); } } + + private class IsDirVisitor extends ContentVisitor.Default { + + @Override + protected Boolean defaultVisit(Content cntnt) { + return false; + } + + @Override + public Boolean visit(Directory d) { + return true; + } + } /** * Check if Solr has extracted content for a given node @@ -323,10 +338,17 @@ public class ExtractedContentViewer implements DataContentViewer { if (content == null) { return false; } + final Server solrServer = KeywordSearch.getServer(); + + boolean isDir = content.accept(new IsDirVisitor()); + if (isDir) + return false; final long contentID = content.getId(); + + try { return solrServer.queryIsIndexed(contentID);