From bed9161e05cb2500d388776ffd81a3472fc5c892 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Mon, 18 Apr 2016 09:57:23 -0400 Subject: [PATCH 1/9] Fixed button alignment and header text. --- .../modules/fileextmismatch/Bundle.properties | 4 +- .../FileExtMismatchSettingsPanel.form | 64 ++++++++------- .../FileExtMismatchSettingsPanel.java | 80 +++++++------------ .../autopsy/keywordsearch/Bundle.properties | 2 +- .../keywordsearch/GlobalEditListPanel.form | 26 +++--- .../keywordsearch/GlobalEditListPanel.java | 33 ++++---- 6 files changed, 101 insertions(+), 108 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties index 1b8dd3acc7..903cfb39a8 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties @@ -42,11 +42,11 @@ FileExtMismatchSettingsPanel.saveMsgLabel.text=\ FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text=\ FileExtMismatchSettingsPanel.extRemoveErrLabel.text=\ FileExtMismatchSettingsPanel.mimeErrLabel.text=\ -FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Selected Type +FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Type FileExtMismatchSettingsPanel.jLabel1.text=File Types: FileExtMismatchSettingsPanel.userExtTextField.text= FileExtMismatchSettingsPanel.addExtButton.text=Add Extension -FileExtMismatchSettingsPanel.removeExtButton.text=Remove Selected Extension +FileExtMismatchSettingsPanel.removeExtButton.text=Remove Extension FileExtMismatchSettingsPanel.userTypeTextField.text= FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form index 3b5f5d7758..e4660f8184 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form @@ -16,7 +16,7 @@ - + @@ -52,7 +52,6 @@ - @@ -90,6 +89,8 @@ + + @@ -97,13 +98,12 @@ + + - - + - - @@ -120,14 +120,13 @@ + - + - - - + - + @@ -165,6 +164,9 @@ + + + @@ -175,6 +177,9 @@ + + + @@ -213,25 +218,21 @@ - + - - - - - - - - - - - + + + + + + + - + @@ -246,14 +247,13 @@ + - + - - - + - + @@ -271,6 +271,9 @@ + + + @@ -294,6 +297,9 @@ + + + diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java index 56883ef119..0dc00da5f1 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java @@ -29,10 +29,10 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; -import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; import org.openide.util.NbBundle; -import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; +import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector; /** @@ -180,6 +180,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel } }); + addTypeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N addTypeButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.addTypeButton.text")); // NOI18N addTypeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -187,6 +188,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel } }); + removeTypeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N removeTypeButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.removeTypeButton.text")); // NOI18N removeTypeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -207,17 +209,18 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(mimeRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(mimePanelLayout.createSequentialGroup() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1) .addGroup(mimePanelLayout.createSequentialGroup() .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(addTypeButton)) - .addComponent(removeTypeButton)) - .addGap(0, 196, Short.MAX_VALUE)) - .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(mimeRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(addTypeButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(removeTypeButton))) + .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); mimePanelLayout.setVerticalGroup( @@ -230,14 +233,13 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addTypeButton)) - .addGap(3, 3, 3) + .addComponent(addTypeButton) + .addComponent(removeTypeButton)) + .addGap(2, 2, 2) .addComponent(mimeErrLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(removeTypeButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(37, 37, 37) .addComponent(mimeRemoveErrLabel) - .addContainerGap(83, Short.MAX_VALUE)) + .addContainerGap(80, Short.MAX_VALUE)) ); jSplitPane1.setLeftComponent(mimePanel); @@ -249,6 +251,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel } }); + addExtButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/add16.png"))); // NOI18N addExtButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.addExtButton.text")); // NOI18N addExtButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -259,6 +262,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel extTable.setModel(extTableModel); jScrollPane3.setViewportView(extTable); + removeExtButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/delete16.png"))); // NOI18N removeExtButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.removeExtButton.text")); // NOI18N removeExtButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -282,16 +286,14 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addComponent(extHeaderLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(extensionPanelLayout.createSequentialGroup() - .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(removeExtButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(extensionPanelLayout.createSequentialGroup() - .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(addExtButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - .addGap(0, 46, Short.MAX_VALUE)) .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(extensionPanelLayout.createSequentialGroup() + .addComponent(userExtTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 48, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(addExtButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(removeExtButton))) .addContainerGap()) ); extensionPanelLayout.setVerticalGroup( @@ -304,14 +306,13 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addExtButton)) - .addGap(2, 2, 2) + .addComponent(addExtButton) + .addComponent(removeExtButton)) + .addGap(1, 1, 1) .addComponent(extErrorLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(removeExtButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGap(37, 37, 37) .addComponent(extRemoveErrLabel) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(46, Short.MAX_VALUE)) ); jSplitPane1.setRightComponent(extensionPanel); @@ -329,8 +330,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addComponent(jSplitPane1) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) - .addComponent(saveMsgLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addContainerGap()) + .addComponent(saveMsgLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE)))) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -348,7 +348,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 747, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -620,15 +620,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel @Override public String getColumnName(int column) { String colName = null; - - switch (column) { - case 0: - colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.mimeTableModel.colName"); - break; - default: - ; - - } return colName; } @@ -684,15 +675,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel @Override public String getColumnName(int column) { String colName = null; - - switch (column) { - case 0: - colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.extTableModel.colName"); - break; - default: - ; - - } return colName; } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties index d500c116ec..c190f625f9 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties @@ -22,7 +22,7 @@ KeywordSearchEditListPanel.saveListButton.text=Copy List KeywordSearchEditListPanel.addWordField.text= KeywordSearchEditListPanel.addWordButton.text=Add KeywordSearchEditListPanel.chRegex.text=Regular Expression -KeywordSearchEditListPanel.deleteWordButton.text=Remove Selected +KeywordSearchEditListPanel.deleteWordButton.text=Remove KeywordSearchEditListPanel.cutMenuItem.text=Cut KeywordSearchEditListPanel.selectAllMenuItem.text=Select All KeywordSearchEditListPanel.pasteMenuItem.text=Paste diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form index 366415f49d..df0173a112 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.form @@ -190,16 +190,15 @@ - - - - - - - + + + + + + @@ -211,12 +210,11 @@ + - + - - - + @@ -224,6 +222,9 @@ + + + @@ -251,6 +252,9 @@ + + + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java index f4f2596956..2af3f77da7 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java @@ -28,8 +28,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.logging.Level; -import org.openide.util.NbBundle; -import org.sleuthkit.autopsy.coreutils.Logger; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import javax.swing.JFileChooser; @@ -41,7 +39,9 @@ import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; +import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; /** @@ -227,6 +227,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis keywordTable.getTableHeader().setReorderingAllowed(false); jScrollPane1.setViewportView(keywordTable); + addWordButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/new16.png"))); // NOI18N addWordButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.addWordButton.text")); // NOI18N addWordButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -243,6 +244,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis chRegex.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.chRegex.text")); // NOI18N + deleteWordButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N deleteWordButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.deleteWordButton.text")); // NOI18N deleteWordButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -256,13 +258,13 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(addKeywordPanelLayout.createSequentialGroup() .addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(addKeywordPanelLayout.createSequentialGroup() - .addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, 216, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(addWordButton)) - .addComponent(deleteWordButton)) + .addGroup(addKeywordPanelLayout.createSequentialGroup() + .addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, 216, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(addWordButton)) .addComponent(chRegex, javax.swing.GroupLayout.Alignment.LEADING)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(deleteWordButton) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); addKeywordPanelLayout.setVerticalGroup( @@ -271,12 +273,11 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis .addGap(0, 0, 0) .addGroup(addKeywordPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(addWordField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addWordButton)) - .addGap(7, 7, 7) + .addComponent(addWordButton) + .addComponent(deleteWordButton)) + .addGap(6, 6, 6) .addComponent(chRegex) - .addGap(7, 7, 7) - .addComponent(deleteWordButton) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(43, Short.MAX_VALUE)) ); ingestMessagesCheckbox.setSelected(true); @@ -294,13 +295,13 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis listOptionsLabel.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.listOptionsLabel.text")); // NOI18N - deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N NON-NLS + deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N deleteListButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.deleteListButton.text")); // NOI18N - saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N NON-NLS + saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N saveListButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.saveListButton.text")); // NOI18N - exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N NON-NLS + exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N exportButton.setText(org.openide.util.NbBundle.getMessage(GlobalEditListPanel.class, "KeywordSearchEditListPanel.exportButton.text")); // NOI18N exportButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { From 8e5be698b48c6d83663547fa154cbed487c50e72 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Mon, 18 Apr 2016 12:02:25 -0400 Subject: [PATCH 2/9] Updated file ext mismatch ui. --- .../modules/fileextmismatch/Bundle.properties | 2 +- .../FileExtMismatchSettingsPanel.form | 13 +++++-------- .../FileExtMismatchSettingsPanel.java | 10 ++++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties index 903cfb39a8..8e29a9c518 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties @@ -3,7 +3,7 @@ OptionsCategory_Name_FileExtMismatchOptions=File Extension Mismatch OptionsCategory_FileExtMismatch=File Extension Mismatch AddFileExtensionAction.msgDlg.msg=Writing XML configuration file failed. AddFileExtensionAction.msgDlg.title=Add Mismatch Extension Error -AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for +AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for FileExtMismatchConfigPanel.addExtButton.errLabel.empty=Extension text is empty\! FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=No MIME type selected\! FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=Extension already exists\! diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form index e4660f8184..874b83aee2 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form @@ -16,15 +16,12 @@ - + - - - - + @@ -221,14 +218,14 @@ - + - + - + diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java index 0dc00da5f1..1b32adb59f 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java @@ -285,11 +285,11 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addComponent(extHeaderLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(extHeaderLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(extensionPanelLayout.createSequentialGroup() - .addComponent(userExtTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 48, Short.MAX_VALUE) + .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(addExtButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -348,13 +348,11 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 747, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 792, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 482, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 8, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 482, javax.swing.GroupLayout.PREFERRED_SIZE) ); }// //GEN-END:initComponents From dad5ce969675c63a7cc0f1fb2e3620b1d33228ac Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Mon, 18 Apr 2016 15:11:59 -0400 Subject: [PATCH 3/9] Working towards expanding extension mismatch panel downwards. --- .../FileExtMismatchSettingsPanel.form | 59 +++++++++++-------- .../FileExtMismatchSettingsPanel.java | 47 ++++++++------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form index 874b83aee2..1614c35388 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form @@ -27,6 +27,11 @@ + + + + + @@ -85,9 +90,9 @@ - - + + @@ -112,18 +117,17 @@ - + + + + + - - - - - @@ -215,42 +219,49 @@ - + - - - - + + + + + + + + + + + - + - + - + - - - + + + + + + + + - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java index 1b32adb59f..6c986225e2 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java @@ -164,6 +164,8 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel extRemoveErrLabel = new javax.swing.JLabel(); saveMsgLabel = new javax.swing.JLabel(); + jScrollPane1.setBorder(null); + jPanel1.setPreferredSize(new java.awt.Dimension(687, 450)); jSplitPane1.setDividerLocation(430); @@ -208,9 +210,9 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addGroup(mimePanelLayout.createSequentialGroup() .addContainerGap() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 409, Short.MAX_VALUE) .addComponent(mimeRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(mimeErrLabel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(mimePanelLayout.createSequentialGroup() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1) @@ -229,17 +231,16 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 360, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(mimeRemoveErrLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(mimeErrLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(addTypeButton) - .addComponent(removeTypeButton)) - .addGap(2, 2, 2) - .addComponent(mimeErrLabel) - .addGap(37, 37, 37) - .addComponent(mimeRemoveErrLabel) - .addContainerGap(80, Short.MAX_VALUE)) + .addComponent(removeTypeButton))) ); jSplitPane1.setLeftComponent(mimePanel); @@ -284,11 +285,16 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addGroup(extensionPanelLayout.createSequentialGroup() .addContainerGap() .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addComponent(extHeaderLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 326, Short.MAX_VALUE) .addGroup(extensionPanelLayout.createSequentialGroup() + .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(extensionPanelLayout.createSequentialGroup() + .addComponent(extHeaderLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, extensionPanelLayout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(addExtButton) @@ -302,17 +308,16 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addComponent(extHeaderLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 285, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 373, Short.MAX_VALUE) + .addGap(15, 15, 15) + .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(extErrorLabel) + .addComponent(extRemoveErrLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(addExtButton) - .addComponent(removeExtButton)) - .addGap(1, 1, 1) - .addComponent(extErrorLabel) - .addGap(37, 37, 37) - .addComponent(extRemoveErrLabel) - .addContainerGap(46, Short.MAX_VALUE)) + .addComponent(removeExtButton))) ); jSplitPane1.setRightComponent(extensionPanel); From 80bf23d8b12a20a6853ae67086ad45ef488209ee Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Mon, 18 Apr 2016 16:27:30 -0400 Subject: [PATCH 4/9] Fixed up ui to only show error messages, disables buttons. --- .../modules/fileextmismatch/Bundle.properties | 6 - .../FileExtMismatchSettingsPanel.form | 67 ++++------- .../FileExtMismatchSettingsPanel.java | 111 ++++++------------ 3 files changed, 60 insertions(+), 124 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties index 8e29a9c518..f061636031 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties @@ -7,17 +7,13 @@ AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for FileExtMismatchConfigPanel.addExtButton.errLabel.empty=Extension text is empty\! FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=No MIME type selected\! FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=Extension already exists\! -FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=Extension {0} added. FileExtMismatchConfigPanel.addTypeButton.empty=MIME type text is empty\! FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME type not supported\! FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME type already exists\! FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME type is not detectable by this module. -FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME type {0} added. FileExtMismatchConfigPanel.removeTypeButton.noneSelected=No MIME type selected\! -FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME type {0} deleted. FileExtMismatchConfigPanel.removeExtButton.noneSelected=No extension selected\! FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=No MIME type selected\! -FileExtMismatchConfigPanel.removeExtButton.deleted=Extension {0} deleted. FileExtMismatchConfigPanel.store.msg=Saved. FileExtMismatchConfigPanel.store.msgDlg.msg=Writing XML configuration file failed. FileExtMismatchConfigPanel.save.msgDlg.title=Save Error @@ -39,8 +35,6 @@ FileExtMismatchSettingsPanel.addTypeButton.text=Add Type FileExtMismatchSettingsPanel.extErrorLabel.text=\ FileExtMismatchSettingsPanel.extHeaderLabel.text=Allowed Extensions: FileExtMismatchSettingsPanel.saveMsgLabel.text=\ -FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text=\ -FileExtMismatchSettingsPanel.extRemoveErrLabel.text=\ FileExtMismatchSettingsPanel.mimeErrLabel.text=\ FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Type FileExtMismatchSettingsPanel.jLabel1.text=File Types: diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form index 1614c35388..884dd1b6e5 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form @@ -16,12 +16,15 @@ - + - + + + + @@ -90,9 +93,7 @@ - - - + @@ -106,6 +107,7 @@ + @@ -117,17 +119,16 @@ - + - - - - - + + + + @@ -199,13 +200,6 @@ - - - - - - - @@ -221,26 +215,20 @@ - - - - - - - + + + - - + - + - @@ -249,19 +237,17 @@ - - - - - - - - + + + + + + @@ -333,13 +319,6 @@ - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java index 6c986225e2..5cd5282f8c 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java @@ -92,10 +92,14 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel updateExtList(); extTableModel.resync(); + removeTypeButton.setEnabled(true); + addExtButton.setEnabled(true); //initButtons(); } else { selectedMime = ""; currentExtensions = null; + removeTypeButton.setEnabled(false); + addExtButton.setEnabled(false); extTableModel.resync(); } @@ -114,21 +118,21 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel listSelectionModel.setSelectionInterval(index, index); selectedExt = currentExtensions.get(index); + removeExtButton.setEnabled(true); } else { selectedExt = ""; + removeExtButton.setEnabled(false); } - extRemoveErrLabel.setText(" "); - } }); - + removeExtButton.setEnabled(false); + removeTypeButton.setEnabled(false); + addExtButton.setEnabled(false); } private void clearErrLabels() { mimeErrLabel.setText(" "); - mimeRemoveErrLabel.setText(" "); - extRemoveErrLabel.setText(" "); extErrorLabel.setText(" "); saveMsgLabel.setText(" "); } @@ -152,7 +156,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel addTypeButton = new javax.swing.JButton(); removeTypeButton = new javax.swing.JButton(); mimeErrLabel = new javax.swing.JLabel(); - mimeRemoveErrLabel = new javax.swing.JLabel(); extensionPanel = new javax.swing.JPanel(); userExtTextField = new javax.swing.JTextField(); addExtButton = new javax.swing.JButton(); @@ -161,7 +164,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel removeExtButton = new javax.swing.JButton(); extHeaderLabel = new javax.swing.JLabel(); extErrorLabel = new javax.swing.JLabel(); - extRemoveErrLabel = new javax.swing.JLabel(); saveMsgLabel = new javax.swing.JLabel(); jScrollPane1.setBorder(null); @@ -201,8 +203,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel mimeErrLabel.setForeground(new java.awt.Color(255, 0, 0)); mimeErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.mimeErrLabel.text")); // NOI18N - mimeRemoveErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text")); // NOI18N - javax.swing.GroupLayout mimePanelLayout = new javax.swing.GroupLayout(mimePanel); mimePanel.setLayout(mimePanelLayout); mimePanelLayout.setHorizontalGroup( @@ -210,9 +210,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addGroup(mimePanelLayout.createSequentialGroup() .addContainerGap() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 409, Short.MAX_VALUE) - .addComponent(mimeRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(mimeErrLabel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(mimePanelLayout.createSequentialGroup() .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1) @@ -222,7 +220,8 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addComponent(addTypeButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(removeTypeButton))) - .addGap(0, 0, Short.MAX_VALUE))) + .addGap(0, 0, Short.MAX_VALUE)) + .addComponent(mimeErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) ); mimePanelLayout.setVerticalGroup( @@ -231,16 +230,15 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 360, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 374, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(mimeRemoveErrLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(mimeErrLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(mimePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userTypeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(addTypeButton) - .addComponent(removeTypeButton))) + .addComponent(removeTypeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(mimeErrLabel) + .addContainerGap()) ); jSplitPane1.setLeftComponent(mimePanel); @@ -276,8 +274,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel extErrorLabel.setForeground(new java.awt.Color(255, 0, 0)); extErrorLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.extErrorLabel.text")); // NOI18N - extRemoveErrLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.extRemoveErrLabel.text")); // NOI18N - javax.swing.GroupLayout extensionPanelLayout = new javax.swing.GroupLayout(extensionPanel); extensionPanel.setLayout(extensionPanelLayout); extensionPanelLayout.setHorizontalGroup( @@ -285,22 +281,17 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addGroup(extensionPanelLayout.createSequentialGroup() .addContainerGap() .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 326, Short.MAX_VALUE) - .addGroup(extensionPanelLayout.createSequentialGroup() - .addComponent(extRemoveErrLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(extensionPanelLayout.createSequentialGroup() .addComponent(extHeaderLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) + .addContainerGap(37, Short.MAX_VALUE)) + .addComponent(extErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, extensionPanelLayout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(userExtTextField) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(addExtButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(removeExtButton))) - .addContainerGap()) + .addGap(4, 4, 4) + .addComponent(removeExtButton)))) ); extensionPanelLayout.setVerticalGroup( extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -308,16 +299,15 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel .addContainerGap() .addComponent(extHeaderLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 373, Short.MAX_VALUE) - .addGap(15, 15, 15) - .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(extErrorLabel) - .addComponent(extRemoveErrLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(extensionPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(userExtTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(addExtButton) - .addComponent(removeExtButton))) + .addComponent(removeExtButton)) + .addGap(5, 5, 5) + .addComponent(extErrorLabel) + .addContainerGap()) ); jSplitPane1.setRightComponent(extensionPanel); @@ -353,11 +343,13 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 792, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 838, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 482, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 482, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(18, Short.MAX_VALUE)) ); }// //GEN-END:initComponents @@ -394,14 +386,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh table updateExtList(); extTableModel.resync(); - - // user feedback for successful add - extErrorLabel.setForeground(Color.blue); - extErrorLabel.setText( - NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded", - newExt)); - extRemoveErrLabel.setText(" "); - userExtTextField.setText(""); setIsModified(); }//GEN-LAST:event_addExtButtonActionPerformed @@ -438,13 +422,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh table updateMimeList(); mimeTableModel.resync(); - - // user feedback for successful add - //selectByMimeString(newMime); - mimeErrLabel.setForeground(Color.blue); - mimeErrLabel.setText( - NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded", newMime)); - mimeRemoveErrLabel.setText(" "); userTypeTextField.setText(""); setIsModified(); }//GEN-LAST:event_addTypeButtonActionPerformed @@ -459,8 +436,8 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel private void removeTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeTypeButtonActionPerformed if (selectedMime.isEmpty()) { - mimeRemoveErrLabel.setForeground(Color.red); - mimeRemoveErrLabel.setText( + mimeErrLabel.setForeground(Color.red); + mimeErrLabel.setText( NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeTypeButton.noneSelected")); return; } @@ -471,18 +448,13 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh table updateMimeList(); mimeTableModel.resync(); - - // user feedback for successful add - mimeRemoveErrLabel.setForeground(Color.blue); - mimeRemoveErrLabel.setText( - NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.remoteTypeButton.deleted", deadMime)); setIsModified(); }//GEN-LAST:event_removeTypeButtonActionPerformed private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed if (selectedExt.isEmpty()) { - extRemoveErrLabel.setForeground(Color.red); - extRemoveErrLabel.setText( + extErrorLabel.setForeground(Color.red); + extErrorLabel.setText( NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.noneSelected")); return; } @@ -504,11 +476,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh tables updateExtList(); extTableModel.resync(); - - // user feedback for successful add - extRemoveErrLabel.setForeground(Color.blue); - extRemoveErrLabel.setText( - NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.deleted", deadExt)); setIsModified(); }//GEN-LAST:event_removeExtButtonActionPerformed @@ -535,8 +502,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel public void saveSettings() { if (FileExtMismatchXML.getDefault().save(editableMap)) { mimeErrLabel.setText(" "); - mimeRemoveErrLabel.setText(" "); - extRemoveErrLabel.setText(" "); extErrorLabel.setText(" "); saveMsgLabel.setText(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.store.msg")); @@ -588,7 +553,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel private javax.swing.JButton addTypeButton; private javax.swing.JLabel extErrorLabel; private javax.swing.JLabel extHeaderLabel; - private javax.swing.JLabel extRemoveErrLabel; private javax.swing.JTable extTable; private javax.swing.JPanel extensionPanel; private javax.swing.JLabel jLabel1; @@ -599,7 +563,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel private javax.swing.JSplitPane jSplitPane1; private javax.swing.JLabel mimeErrLabel; private javax.swing.JPanel mimePanel; - private javax.swing.JLabel mimeRemoveErrLabel; private javax.swing.JTable mimeTable; private javax.swing.JButton removeExtButton; private javax.swing.JButton removeTypeButton; From 7663ebc7fe24808886e40de1f83368e8ee137e46 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Tue, 19 Apr 2016 08:47:20 -0400 Subject: [PATCH 5/9] Made text field clear when extension is added. --- .../modules/fileextmismatch/Bundle.properties | 1 - .../FileExtMismatchSettingsPanel.form | 22 ++------------- .../FileExtMismatchSettingsPanel.java | 27 +++---------------- 3 files changed, 5 insertions(+), 45 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties index f061636031..ccfa686227 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties @@ -34,7 +34,6 @@ FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=Skip files without ext FileExtMismatchSettingsPanel.addTypeButton.text=Add Type FileExtMismatchSettingsPanel.extErrorLabel.text=\ FileExtMismatchSettingsPanel.extHeaderLabel.text=Allowed Extensions: -FileExtMismatchSettingsPanel.saveMsgLabel.text=\ FileExtMismatchSettingsPanel.mimeErrLabel.text=\ FileExtMismatchSettingsPanel.removeTypeButton.text=Remove Type FileExtMismatchSettingsPanel.jLabel1.text=File Types: diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form index 884dd1b6e5..e23aeec1d9 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form @@ -50,13 +50,7 @@ - - - - - - - + @@ -65,9 +59,7 @@ - - - + @@ -323,16 +315,6 @@ - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java index 5cd5282f8c..ab597e74bb 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java @@ -134,7 +134,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel private void clearErrLabels() { mimeErrLabel.setText(" "); extErrorLabel.setText(" "); - saveMsgLabel.setText(" "); } /** @@ -164,7 +163,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel removeExtButton = new javax.swing.JButton(); extHeaderLabel = new javax.swing.JLabel(); extErrorLabel = new javax.swing.JLabel(); - saveMsgLabel = new javax.swing.JLabel(); jScrollPane1.setBorder(null); @@ -312,29 +310,20 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel jSplitPane1.setRightComponent(extensionPanel); - saveMsgLabel.setForeground(new java.awt.Color(0, 0, 255)); - saveMsgLabel.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.saveMsgLabel.text")); // NOI18N - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSplitPane1) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(saveMsgLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addComponent(jSplitPane1)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() .addContainerGap() .addComponent(jSplitPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 466, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(saveMsgLabel) - .addContainerGap()) + .addGap(31, 31, 31)) ); jScrollPane1.setViewportView(jPanel1); @@ -386,7 +375,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh table updateExtList(); extTableModel.resync(); - setIsModified(); + this.userExtTextField.setText(""); }//GEN-LAST:event_addExtButtonActionPerformed private void addTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addTypeButtonActionPerformed @@ -423,7 +412,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel updateMimeList(); mimeTableModel.resync(); userTypeTextField.setText(""); - setIsModified(); }//GEN-LAST:event_addTypeButtonActionPerformed private void userExtTextFieldFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_userExtTextFieldFocusGained @@ -448,7 +436,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh table updateMimeList(); mimeTableModel.resync(); - setIsModified(); }//GEN-LAST:event_removeTypeButtonActionPerformed private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed @@ -476,7 +463,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel // Refresh tables updateExtList(); extTableModel.resync(); - setIsModified(); }//GEN-LAST:event_removeExtButtonActionPerformed private void updateMimeList() { @@ -503,8 +489,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel if (FileExtMismatchXML.getDefault().save(editableMap)) { mimeErrLabel.setText(" "); extErrorLabel.setText(" "); - - saveMsgLabel.setText(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.store.msg")); } else { //error JOptionPane.showMessageDialog(this, @@ -530,10 +514,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel saveSettings(); } - private void setIsModified() { - saveMsgLabel.setText(" "); - } - public void cancel() { clearErrLabels(); load(); // The next time this panel is opened, we want it to be fresh @@ -566,7 +546,6 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel private javax.swing.JTable mimeTable; private javax.swing.JButton removeExtButton; private javax.swing.JButton removeTypeButton; - private javax.swing.JLabel saveMsgLabel; private javax.swing.JTextField userExtTextField; private javax.swing.JTextField userTypeTextField; // End of variables declaration//GEN-END:variables From d9b055e5ee2ca2d2106410a697bdbd2d14a2aca7 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 20 Apr 2016 10:01:10 -0400 Subject: [PATCH 6/9] Change Autopsy3 to Autopsy4 in build.xml --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index f7e71af51e..6b8895bdbb 100755 --- a/build.xml +++ b/build.xml @@ -2,8 +2,8 @@ - - Builds the module suite Autopsy3. + + Builds the module suite Autopsy 4. From 85b436cf08bf9aca15d61520ba0828be6396460e Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 20 Apr 2016 10:01:10 -0400 Subject: [PATCH 7/9] Change Autopsy3 to Autopsy4 in build.xml --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index f7e71af51e..6b8895bdbb 100755 --- a/build.xml +++ b/build.xml @@ -2,8 +2,8 @@ - - Builds the module suite Autopsy3. + + Builds the module suite Autopsy 4. From ab4b1ef8fb74ea5726d4f87210693ecc85b8d455 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 20 Apr 2016 10:21:29 -0400 Subject: [PATCH 8/9] Fix typo in build.xml for Autopsy suite --- build.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/build.xml b/build.xml index 6b8895bdbb..7385c8ac8a 100755 --- a/build.xml +++ b/build.xml @@ -11,7 +11,6 @@ correct version of the platform. These are used for other reasons. We should merge the two. --> - From 7e8894ee0333ba0b315c42cf4d9643c819b0fe89 Mon Sep 17 00:00:00 2001 From: Oliver Spohngellert Date: Wed, 20 Apr 2016 13:52:23 -0400 Subject: [PATCH 9/9] Updated UI for File types. --- .../modules/filetypeid/Bundle.properties | 2 - .../modules/filetypeid/Bundle_ja.properties | 1 - .../FileTypeIdGlobalSettingsPanel.form | 52 +++++-------------- .../FileTypeIdGlobalSettingsPanel.java | 42 +++++---------- 4 files changed, 24 insertions(+), 73 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties index bcb6bccac0..74ee1eaa4d 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties @@ -11,7 +11,6 @@ FileTypeIdModuleFactory.createFileIngestModule.exception.msg=Expected settings a FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText=Depending on how many files have known hashes, checking this box will improve the speed of file type identification. FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text=Skip known files (NSRL) FileTypeIdGlobalSettingsPanel.deleteTypeButton.text=Delete Type -FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text=MIME Type: FileTypeIdGlobalSettingsPanel.signatureComboBox.rawItem=Bytes (Hex) FileTypeIdGlobalSettingsPanel.signatureComboBox.asciiItem=String (ASCII) FileTypeIdGlobalSettingsPanel.offsetComboBox.startItem=Start @@ -52,4 +51,3 @@ AddFileTypePanel.deleteSigButton.text=Delete Signature AddFileTypePanel.jLabel1.text=Signatures AddFileTypePanel.editSigButton.text=Edit Signature AddFileTypePanel.addSigButton.text=Add Signature -FileTypeIdGlobalSettingsPanel.mimeTypeNameLabel.text= diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties index ce6e516f44..d14cbd65a3 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties @@ -21,7 +21,6 @@ FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignature.title=\u30b7\u30b0\u3 FileTypeIdGlobalSettingsPanel.JOptionPane.invalidSignatureBytes.title=\u30b7\u30b0\u30cd\u30c1\u30e3\u304c\u7121\u52b9\u3067\u3059 FileTypeIdGlobalSettingsPanel.JOptionPane.loadFailed.title=\u8aad\u307f\u8fbc\u307f\u304c\u5931\u6557\u3057\u307e\u3057\u305f FileTypeIdGlobalSettingsPanel.JOptionPane.storeFailed.title=\u4fdd\u5b58\u304c\u5931\u6557\u3057\u307e\u3057\u305f -FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text=MIME\u30bf\u30a4\u30d7 FileTypeIdGlobalSettingsPanel.newTypeButton.text=\u65b0\u898f\u30bf\u30a4\u30d7 FileTypeIdGlobalSettingsPanel.signatureComboBox.asciiItem=\u30b9\u30c8\u30ea\u30f3\u30b0\uff08ASCII\uff09 FileTypeIdGlobalSettingsPanel.signatureComboBox.rawItem=\u30d0\u30a4\u30c8\uff08HEX\uff09 diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form index c020d6017a..42e8e8ebce 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.form @@ -31,7 +31,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -115,16 +115,17 @@ + - - - + + + - + @@ -236,16 +237,11 @@ - - - - - - + @@ -253,34 +249,17 @@ - - - - - - - + + - - + + - - - - - - - - - - - - @@ -307,13 +286,6 @@ - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java index 40850063fb..43dfc31fa0 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java @@ -18,7 +18,7 @@ */ package org.sleuthkit.autopsy.modules.filetypeid; -import java.awt.*; +import java.awt.EventQueue; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collections; @@ -228,7 +228,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane FileType fileType = typesList.getSelectedValue(); this.signatureList.setEnabled(false); if (null != fileType) { - mimeTypeNameLabel.setText(fileType.getMimeType()); List signatures = fileType.getSignatures(); this.signaturesListModel.clear(); for (Signature sig : signatures) { @@ -244,7 +243,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane */ private void clearTypeDetailsComponents() { typesList.clearSelection(); - mimeTypeNameLabel.setText(""); //NON-NLS this.signaturesListModel.clear(); enableButtons(); } @@ -297,16 +295,14 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane jPanel1 = new javax.swing.JPanel(); jLabel2 = new javax.swing.JLabel(); typesScrollPane = new javax.swing.JScrollPane(); - typesList = new javax.swing.JList<>(); + typesList = new javax.swing.JList(); deleteTypeButton = new javax.swing.JButton(); newTypeButton = new javax.swing.JButton(); editTypeButton = new javax.swing.JButton(); jPanel2 = new javax.swing.JPanel(); - mimeTypeLabel = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); - signatureList = new javax.swing.JList<>(); - mimeTypeNameLabel = new javax.swing.JLabel(); + signatureList = new javax.swing.JList(); setMaximumSize(new java.awt.Dimension(552, 297)); setPreferredSize(new java.awt.Dimension(552, 297)); @@ -372,9 +368,10 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(12, 12, 12) .addComponent(jLabel2) - .addGap(1, 1, 1) - .addComponent(typesScrollPane) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(typesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(newTypeButton) @@ -387,9 +384,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane jSplitPane1.setLeftComponent(jPanel1); - mimeTypeLabel.setFont(mimeTypeLabel.getFont().deriveFont(mimeTypeLabel.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - org.openide.awt.Mnemonics.setLocalizedText(mimeTypeLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.mimeTypeLabel.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.jLabel1.text")); // NOI18N signatureList.setModel(new javax.swing.AbstractListModel() { @@ -399,8 +393,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane }); jScrollPane1.setViewportView(signatureList); - org.openide.awt.Mnemonics.setLocalizedText(mimeTypeNameLabel, org.openide.util.NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.mimeTypeNameLabel.text")); // NOI18N - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( @@ -408,28 +400,20 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() .addGap(18, 18, 18) .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addComponent(mimeTypeLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(mimeTypeNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel2Layout.createSequentialGroup() .addComponent(jLabel1) .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 387, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)) .addContainerGap()) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel2Layout.createSequentialGroup() - .addGap(6, 6, 6) - .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(mimeTypeLabel) - .addComponent(mimeTypeNameLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addContainerGap() .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE) - .addGap(20, 20, 20)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 370, Short.MAX_VALUE) + .addGap(40, 40, 40)) ); jSplitPane1.setRightComponent(jPanel2); @@ -445,7 +429,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING)) + .addComponent(jSplitPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 782, Short.MAX_VALUE)) .addContainerGap()))) ); layout.setVerticalGroup( @@ -454,7 +438,7 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane .addGap(6, 6, 6) .addComponent(jLabel3) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jSplitPane1) + .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 443, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(ingestRunningWarningLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) @@ -502,8 +486,6 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JSplitPane jSplitPane1; - private javax.swing.JLabel mimeTypeLabel; - private javax.swing.JLabel mimeTypeNameLabel; private javax.swing.JButton newTypeButton; private javax.swing.JList signatureList; private javax.swing.JList typesList;