codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Ingest inbox: fixed custom initial size and resizing of layered pane

Browse Source
This commit is contained in:
adam-m
2012-02-23 21:32:43 -05:00
parent 0c3578f1ba
commit e494cad25b
6 changed files with 95 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
View File

@@ -18,24 +18,26 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="backButton" min="-2" pref="23" max="-2" attributes="0"/>
<EmptySpace pref="86" max="32767" attributes="0"/>
<EmptySpace pref="153" max="32767" attributes="0"/>
<Component id="viewArtifactButton" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="viewContentButton" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jScrollPane1" alignment="0" pref="309" max="32767" attributes="0"/>
<Component id="jScrollPane1" alignment="0" pref="328" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="backButton" alignment="3" min="-2" pref="23" max="-2" attributes="0"/>
<Component id="viewContentButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="viewArtifactButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="backButton" alignment="0" min="-2" pref="23" max="-2" attributes="0"/>
<Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="viewContentButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="viewArtifactButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="149" max="32767" attributes="0"/>
<Component id="jScrollPane1" pref="194" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -49,6 +51,11 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.backButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 2, 2, 2]"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[23, 23]"/>
</Property>
@@ -63,30 +70,21 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="backButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="viewArtifactButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.viewArtifactButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewArtifactButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="viewContentButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.viewContentButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 2, 2, 2]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewContentButtonActionPerformed"/>
</Events>
</Component>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
@@ -95,13 +93,33 @@
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="eb" green="dd" red="dd" type="rgb"/>
</Property>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/>
</Property>
<Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.messageDetailsPane.contentType" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="editable" type="boolean" value="false"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[1, 1, 1, 1]"/>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JButton" name="viewArtifactButton">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessageDetailsPanel.viewArtifactButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="alignmentY" type="float" value="0.0"/>
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
<Insets value="[2, 2, 2, 2]"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewArtifactButtonActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>

39
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
View File

@@ -52,13 +52,16 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
private void initComponents() {
backButton = new javax.swing.JButton();
viewArtifactButton = new javax.swing.JButton();
viewContentButton = new javax.swing.JButton();
jScrollPane1 = new javax.swing.JScrollPane();
messageDetailsPane = new javax.swing.JEditorPane();
viewArtifactButton = new javax.swing.JButton();
backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/arrow_left.gif"))); // NOI18N
backButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.backButton.text")); // NOI18N
backButton.setAlignmentY(0.0F);
backButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
backButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
backButton.setMaximumSize(new java.awt.Dimension(23, 23));
backButton.setMinimumSize(new java.awt.Dimension(23, 23));
backButton.setPreferredSize(new java.awt.Dimension(23, 23));
@@ -68,14 +71,9 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
}
});
viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N
viewArtifactButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
viewArtifactButtonActionPerformed(evt);
}
});
viewContentButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewContentButton.text")); // NOI18N
viewContentButton.setAlignmentY(0.0F);
viewContentButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
viewContentButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
viewContentButtonActionPerformed(evt);
@@ -83,31 +81,43 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
});
messageDetailsPane.setBackground(new java.awt.Color(221, 221, 235));
messageDetailsPane.setBorder(null);
messageDetailsPane.setContentType(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.messageDetailsPane.contentType")); // NOI18N
messageDetailsPane.setEditable(false);
messageDetailsPane.setMargin(new java.awt.Insets(1, 1, 1, 1));
jScrollPane1.setViewportView(messageDetailsPane);
viewArtifactButton.setText(org.openide.util.NbBundle.getMessage(IngestMessageDetailsPanel.class, "IngestMessageDetailsPanel.viewArtifactButton.text")); // NOI18N
viewArtifactButton.setAlignmentY(0.0F);
viewArtifactButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
viewArtifactButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
viewArtifactButtonActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 86, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 153, Short.MAX_VALUE)
.addComponent(viewArtifactButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(viewContentButton))
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 328, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(viewContentButton)
.addComponent(viewArtifactButton))
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(viewContentButton)
.addComponent(viewArtifactButton)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 149, Short.MAX_VALUE))
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -122,6 +132,7 @@ class IngestMessageDetailsPanel extends javax.swing.JPanel {
private void backButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backButtonActionPerformed
mainPanel.showMessages();
}//GEN-LAST:event_backButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton backButton;
private javax.swing.JScrollPane jScrollPane1;

34
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.form
View File

@@ -1,34 +0,0 @@
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="layeredPane" alignment="0" pref="454" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="layeredPane" alignment="0" pref="309" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JLayeredPane" name="layeredPane">
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
</Container>
</SubComponents>
</Form>

73
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java
View File

@@ -18,23 +18,25 @@
*/
package org.sleuthkit.autopsy.ingest;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.BoxLayout;
import javax.swing.JLayeredPane;
/**
* the main layered pane container for messages table (IngestMessagePanel)
* and details view (IngestMessageDetailsPanel)
*/
public class IngestMessageMainPanel extends javax.swing.JPanel {
public class IngestMessageMainPanel extends JLayeredPane {
private IngestMessagePanel messagePanel;
private IngestMessageDetailsPanel detailsPanel;
private Logger logger = Logger.getLogger(IngestMessageMainPanel.class.getName());
//private JLayeredPane layeredPane;
/** Creates new form IngestMessageMainPanel */
public IngestMessageMainPanel() {
@@ -60,45 +62,27 @@ public class IngestMessageMainPanel extends javax.swing.JPanel {
@Override
public void componentShown(ComponentEvent e) {
}
@Override
public void componentResized(ComponentEvent e) {
setSize();
//we need to handle resizing ourselves due to absence of layout manager
//in layered layout
Dimension dim = getSize();
messagePanel.setPreferredSize(dim);
detailsPanel.setPreferredSize(dim);
messagePanel.setBounds(0, 0, dim.width, dim.height);
detailsPanel.setBounds(0, 0, dim.width, dim.height);
revalidate();
}
});
layeredPane.add(messagePanel, JLayeredPane.PALETTE_LAYER);
layeredPane.add(detailsPanel, JLayeredPane.DEFAULT_LAYER);
//TODO handle the initial size better so it resizes to current tc size
//(somehow the initial tc size is not set correctly)
//setBackground(Color.red);
//layeredPane.setBackground(Color.GREEN);
//messagePanel.setBackground(Color.blue);
Dimension dim = getPreferredSize();
messagePanel.setSize(dim);
detailsPanel.setSize(dim);
//messagePanel.setBounds(0, 0, dim.width, dim.height);
// detailsPanel.setBounds(0, 0, dim.width, dim.height);
add(messagePanel, JLayeredPane.PALETTE_LAYER);
add(detailsPanel, JLayeredPane.DEFAULT_LAYER);
this.setOpaque(true);
}
private void setSize() {
//we need to handle resizing ourselves due to absence of layout manager
//in layered layout
Dimension dim = getSize();
messagePanel.setPreferredSize(dim);
detailsPanel.setPreferredSize(dim);
messagePanel.setBounds(0, 0, dim.width, dim.height);
detailsPanel.setBounds(0, 0, dim.width, dim.height);
}
IngestMessagePanel getMessagePanel() {
return messagePanel;
}
@@ -108,15 +92,15 @@ public class IngestMessageMainPanel extends javax.swing.JPanel {
}
void showMessages() {
layeredPane.setLayer(detailsPanel, JLayeredPane.DEFAULT_LAYER);
layeredPane.setLayer(messagePanel, JLayeredPane.PALETTE_LAYER);
setLayer(detailsPanel, JLayeredPane.DEFAULT_LAYER);
setLayer(messagePanel, JLayeredPane.PALETTE_LAYER);
}
void showDetails(int rowNumber) {
detailsPanel.showDetails(rowNumber);
layeredPane.setLayer(detailsPanel, JLayeredPane.PALETTE_LAYER);
layeredPane.setLayer(messagePanel, JLayeredPane.DEFAULT_LAYER);
setLayer(detailsPanel, JLayeredPane.PALETTE_LAYER);
setLayer(messagePanel, JLayeredPane.DEFAULT_LAYER);
}
@@ -134,23 +118,16 @@ public class IngestMessageMainPanel extends javax.swing.JPanel {
* always regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
// <editor-fold defaultstate="collapsed" desc="Generated Code">
private void initComponents() {
layeredPane = new javax.swing.JLayeredPane();
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(layeredPane, javax.swing.GroupLayout.DEFAULT_SIZE, 454, Short.MAX_VALUE)
);
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 454, Short.MAX_VALUE));
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(layeredPane, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLayeredPane layeredPane;
// End of variables declaration//GEN-END:variables
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 309, Short.MAX_VALUE));
}// </editor-fold>
// Variables declaration - do not modify
// End of variables declaration
}

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

@@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.ingest;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.util.ArrayList;
import java.util.List;
@@ -153,11 +152,6 @@ class IngestMessagePanel extends javax.swing.JPanel {
messageTable.getSelectionModel().addListSelectionListener(new MessageVisitedSelection());
}
@Override
public void setSize(Dimension d) {
super.setSize(d);
messageTable.setSize(d);
}
public void addMessage(IngestMessage m) {
tableModel.addMessage(m);

18
Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
View File

@@ -18,13 +18,13 @@
*/
package org.sleuthkit.autopsy.ingest;
import java.awt.BorderLayout;
import java.awt.Color;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.BoxLayout;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import org.openide.util.ImageUtilities;
@@ -104,8 +104,6 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing
if (manager == null) {
manager = IngestManager.getDefault();
}
//messagePanel.setSize(this.getSize());
}
@Override
@@ -133,9 +131,7 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing
}
mode.dockInto(this);
this.open();
}
//messagePanel.setSize(this.getSize());
}
}
@Override
@@ -149,6 +145,7 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing
protected void componentActivated() {
//logger.log(Level.INFO, "ACTIVATED");
super.componentActivated();
}
@Override
@@ -223,10 +220,9 @@ public final class IngestMessageTopComponent extends TopComponent implements Ing
//custom GUI setup not done by builder
messagePanel = new IngestMessageMainPanel();
messagePanel.setOpaque(true);
setLayout(new BorderLayout());
add(messagePanel, BorderLayout.CENTER);
//this.setBackground(Color.yellow);
//setLayout(new BorderLayout());
setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
add(messagePanel);
}
/**