Merge remote-tracking branch 'upstream/develop' into collaborative

2026-10-02 15:29:54 +00:00 · 2015-04-29 09:22:53 -04:00
parent 5db7a98dbf 288b6723f0
commit 2d73282bf4
5 changed files with 63 additions and 19 deletions
@@ -29,7 +29,7 @@ FilesSetRulePanel.nameRegexCheckbox.text=Regex
 FilesSetRulePanel.ruleNameTextField.text=
 FilesSetRulePanel.nameTextField.text=
 FilesSetRulePanel.ruleNameLabel.text=Rule Name:
-FilesSetRulePanel.messages.emptyNameFilter=Interesting files sets rules must have a Name Pattern for which to search.
+FilesSetRulePanel.messages.emptyNameFilter=You must specify a name pattern for this rule.
 FilesSetRulePanel.messages.invalidNameRegex=The name regular expression is not valid:\n\n{0}
 FilesSetRulePanel.messages.invalidCharInName=The name cannot contain \\, /, :, *, ?, \", <, or > unless it is a regular expression.
 FilesSetRulePanel.messages.invalidCharInPath=The path cannot contain \\, :, *, ?, \", <, or > unless it is a regular expression.
@@ -56,7 +56,9 @@ InterestingItemDefsPanel.jLabel3.text=Name Pattern
 InterestingItemDefsPanel.jLabel4.text=Path Pattern: 
 InterestingItemDefsPanel.jLabel5.text=Description:
 InterestingItemDefsPanel.jLabel6.text=Set Details
-FilesSetRulePanel.jLabel1.text=File Type: 
-FilesSetRulePanel.jLabel2.text=Name Pattern:
+FilesSetRulePanel.jLabel1.text=Type*:
+FilesSetRulePanel.jLabel2.text=Name Pattern*:
 FilesSetRulePanel.jLabel3.text=Path Pattern:
 InterestingItemDefsPanel.jTextArea1.text=This module allows you to find files that match specified criteria. Each set has a list of rules, which will match on file name and parent path patterns. 
+FilesSetRulePanel.jLabel4.text=* Required
+FilesSetRulePanel.jLabel5.text=Enter information about files that you want to find.
@@ -74,6 +74,8 @@
                          <Component id="nameRegexCheckbox" min="-2" max="-2" attributes="0"/>
                      </Group>
                  </Group>
+                  <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel5" alignment="0" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="32767" attributes="0"/>
          </Group>
@@ -82,12 +84,8 @@
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="ruleNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="ruleNameLabel" alignment="3" max="32767" attributes="0"/>
-              </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" pref="19" max="32767" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="dirsRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -110,12 +108,18 @@
                  <Component id="pathTextField" alignment="3" min="-2" pref="20" max="-2" attributes="0"/>
                  <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
-              <EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="pathSeparatorInfoLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="pathRegexCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="ruleNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="ruleNameLabel" alignment="3" max="32767" attributes="0"/>
+              </Group>
              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
@@ -253,5 +257,19 @@
        </Property>
      </Properties>
    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel4">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="FilesSetRulePanel.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel5">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties" key="FilesSetRulePanel.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
  </SubComponents>
 </Form>
@@ -349,6 +349,8 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
        pathTextField = new javax.swing.JTextField();
        pathRegexCheckBox = new javax.swing.JCheckBox();
        pathSeparatorInfoLabel = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        jLabel5 = new javax.swing.JLabel();

        org.openide.awt.Mnemonics.setLocalizedText(ruleNameLabel, org.openide.util.NbBundle.getMessage(FilesSetRulePanel.class, "FilesSetRulePanel.ruleNameLabel.text")); // NOI18N

@@ -401,6 +403,10 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
        pathSeparatorInfoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/info-icon-16.png"))); // NOI18N
        org.openide.awt.Mnemonics.setLocalizedText(pathSeparatorInfoLabel, org.openide.util.NbBundle.getMessage(FilesSetRulePanel.class, "FilesSetRulePanel.pathSeparatorInfoLabel.text")); // NOI18N

+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(FilesSetRulePanel.class, "FilesSetRulePanel.jLabel4.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel5, org.openide.util.NbBundle.getMessage(FilesSetRulePanel.class, "FilesSetRulePanel.jLabel5.text")); // NOI18N
+
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
@@ -444,17 +450,16 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                            .addComponent(extensionRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                            .addComponent(nameRegexCheckbox))))
+                            .addComponent(nameRegexCheckbox)))
+                    .addComponent(jLabel4)
+                    .addComponent(jLabel5))
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 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(ruleNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(ruleNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(jLabel5)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, 19, Short.MAX_VALUE)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(jLabel1)
                    .addComponent(dirsRadioButton)
@@ -473,11 +478,16 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(pathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE)
                    .addComponent(jLabel3))
-                .addGap(4, 4, 4)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                    .addComponent(pathSeparatorInfoLabel)
                    .addComponent(pathRegexCheckBox))
-                .addContainerGap())
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(ruleNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(ruleNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel4))
        );
    }// </editor-fold>//GEN-END:initComponents

@@ -502,6 +512,8 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel2;
    private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel4;
+    private javax.swing.JLabel jLabel5;
    private javax.swing.ButtonGroup nameButtonGroup;
    private javax.swing.JCheckBox nameRegexCheckbox;
    private javax.swing.JTextField nameTextField;
@@ -54,7 +54,7 @@ public class ImageGalleryModule {
    private static final Set<String> supportedExtensions = Sets.union(imageExtensions, videoExtensions);

    /** mime types of images we can display */
-    private static final Set<String> imageMimes = Sets.newHashSet("image/jpeg", "image/bmp", "image/gif", "image/png");
+    private static final Set<String> imageMimes = Sets.newHashSet("image/jpeg", "image/bmp", "image/gif", "image/png", "image/x-ms-bmp");
    /** mime types of videos we can display */
    private static final Set<String> videoMimes = Sets.newHashSet("video/mp4", "video/x-flv", "video/x-javafx");
    /** mime types of files we can display */
@@ -682,6 +682,18 @@ public class GroupManager implements FileUpdateEvent.FileUpdateListener {

                    for (GroupKey<?> gk : groupsForFile) {
                        removeFromGroup(gk, fileId);
+                        
+                        DrawableGroup g = getGroupForKey(gk);
+
+                        if (g == null){
+                            // It may be that this was the last unanalyzed file in the group, so test
+                            // whether the group is now fully analyzed.
+                            //TODO: use method in groupmanager ?
+                            List<Long> checkAnalyzed = checkAnalyzed(gk);
+                            if (checkAnalyzed != null) { // => the group is analyzed, so add it to the ui
+                                populateAnalyzedGroup(gk, checkAnalyzed);
+                            }
+                        }                        
                    }
                }