mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 08:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sleuthkit/autopsy

Browse Source
This commit is contained in:
Dick Fickling 2012-03-27 17:30:35 -04:00
commit 5f8abeaff9
6 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
View File

@ -332,6 +332,8 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
for (int i = 0; i < maxRows; i++) {
PropertySet[] props = node.getChildren().getNodeAt(i).getPropertySets();
if (props.length == 0) //rare special case
continue;
Property[] property = props[0].getProperties();
objs[i] = new Object[property.length];

2
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java
View File

@ -179,7 +179,7 @@ public class HashDbIngestService implements IngestServiceFsContent {
detailsSb.append("</table>");
managerProxy.postMessage(IngestMessage.createDataMessage(++messageId, this, "Found notable file: " + name, detailsSb.toString(), name+md5Hash, badFile));
managerProxy.postMessage(IngestMessage.createDataMessage(++messageId, this, "Notable: " + name, detailsSb.toString(), name+md5Hash, badFile));
IngestManager.fireServiceDataEvent(new ServiceDataEvent(MODULE_NAME, ARTIFACT_TYPE.TSK_HASHSET_HIT, Collections.singletonList(badFile)));
ret = ProcessResult.OK;
} else if (status.equals(TskData.FileKnown.KNOWN)) {

22
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.form
View File

@ -26,11 +26,11 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="notableLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="notableValLabel" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="18" max="32767" attributes="0"/>
<EmptySpace pref="42" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -39,15 +39,15 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="knownValLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="knownLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="knownValLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="notableValLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="notableLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="18" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -55,9 +55,6 @@
<SubComponents>
<Component class="javax.swing.JLabel" name="knownLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="1"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbSimplePanel.knownLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
@ -65,9 +62,6 @@
</Component>
<Component class="javax.swing.JLabel" name="notableLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="1"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbSimplePanel.notableLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
@ -75,9 +69,6 @@
</Component>
<Component class="javax.swing.JLabel" name="knownValLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbSimplePanel.knownValLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
@ -85,9 +76,6 @@
</Component>
<Component class="javax.swing.JLabel" name="notableValLabel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="12" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbSimplePanel.notableValLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>

16
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.java
View File

@ -87,16 +87,12 @@ public class HashDbSimplePanel extends javax.swing.JPanel {
knownValLabel = new javax.swing.JLabel();
notableValLabel = new javax.swing.JLabel();
knownLabel.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
knownLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.knownLabel.text")); // NOI18N
notableLabel.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
notableLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.notableLabel.text")); // NOI18N
knownValLabel.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
knownValLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.knownValLabel.text")); // NOI18N
notableValLabel.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
notableValLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.notableValLabel.text")); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@ -112,22 +108,22 @@ public class HashDbSimplePanel extends javax.swing.JPanel {
.addComponent(knownValLabel))
.addGroup(layout.createSequentialGroup()
.addComponent(notableLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(notableValLabel)))
.addContainerGap(18, Short.MAX_VALUE))
.addContainerGap(42, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(knownValLabel)
.addComponent(knownLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(knownLabel)
.addComponent(knownValLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(notableValLabel)
.addComponent(notableLabel))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(18, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables

4
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
View File

@ -228,9 +228,9 @@ class IngestMessagePanel extends javax.swing.JPanel {
if (i == 0) {
column.setPreferredWidth(((int) (d.width * 0.23)));
} else if (i == 1) {
column.setPreferredWidth(((int) (d.width * 0.14)));
column.setPreferredWidth(((int) (d.width * 0.07)));
} else {
column.setPreferredWidth(((int) (d.width * 0.62)));
column.setPreferredWidth(((int) (d.width * 0.69)));
}
}
}

4
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
View File

@ -648,7 +648,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
} else {
subjectSb.append("Keyword hit: ");
}
subjectSb.append("<");
//subjectSb.append("<");
String uniqueKey = null;
BlackboardAttribute attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID());
if (attr != null) {
@ -657,7 +657,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
uniqueKey = keyword.toLowerCase();
}
subjectSb.append(">");
//subjectSb.append(">");
//String uniqueKey = queryStr;
//details