From cac861ec162a6beff14238a9b14df08dd62f53e3 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 2 Apr 2019 17:03:22 -0400 Subject: [PATCH] 4792 make initial empty details panel visible --- .../CorrelationDataSourceWrapper.java | 14 +++++++++++ .../CorrelationOccurrenceWrapper.java | 14 +++++++++++ .../DataContentViewerOtherCases.form | 24 ++----------------- .../DataContentViewerOtherCases.java | 21 +++------------- .../contentviewer/OccurrencePanel.form | 2 +- .../contentviewer/OccurrencePanel.java | 2 +- 6 files changed, 35 insertions(+), 42 deletions(-) create mode 100644 Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationDataSourceWrapper.java create mode 100644 Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationOccurrenceWrapper.java diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationDataSourceWrapper.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationDataSourceWrapper.java new file mode 100644 index 0000000000..d8fb1854db --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationDataSourceWrapper.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.sleuthkit.autopsy.centralrepository.contentviewer; + +/** + * + * @author wschaefer + */ +public class CorrelationDataSourceWrapper { + +} diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationOccurrenceWrapper.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationOccurrenceWrapper.java new file mode 100644 index 0000000000..21d907e062 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/CorrelationOccurrenceWrapper.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.sleuthkit.autopsy.centralrepository.contentviewer; + +/** + * + * @author wschaefer + */ +public class CorrelationOccurrenceWrapper { + +} diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form index 943ce90db3..d67931f19e 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form @@ -88,10 +88,10 @@ - + - + @@ -305,26 +305,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java index 3d2d43e977..be09a57627 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java @@ -117,7 +117,7 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi initComponents(); customizeComponents(); - this.viewerPanel.add(occurrencePanel); + tablesViewerSplitPane.setRightComponent(occurrencePanel); reset(); } @@ -911,7 +911,6 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi dataSourcesTable = new javax.swing.JTable(); propertiesTableScrollPane = new javax.swing.JScrollPane(); filesTable = new javax.swing.JTable(); - viewerPanel = new javax.swing.JPanel(); rightClickPopupMenu.addPopupMenuListener(new javax.swing.event.PopupMenuListener() { public void popupMenuCanceled(javax.swing.event.PopupMenuEvent evt) { @@ -999,19 +998,6 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi tablesViewerSplitPane.setLeftComponent(caseDatasourceFileSplitPane); - javax.swing.GroupLayout viewerPanelLayout = new javax.swing.GroupLayout(viewerPanel); - viewerPanel.setLayout(viewerPanelLayout); - viewerPanelLayout.setHorizontalGroup( - viewerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 5239, Short.MAX_VALUE) - ); - viewerPanelLayout.setVerticalGroup( - viewerPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 431, Short.MAX_VALUE) - ); - - tablesViewerSplitPane.setRightComponent(viewerPanel); - javax.swing.GroupLayout tableContainerPanelLayout = new javax.swing.GroupLayout(tableContainerPanel); tableContainerPanel.setLayout(tableContainerPanelLayout); tableContainerPanelLayout.setHorizontalGroup( @@ -1049,10 +1035,10 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi otherCasesPanel.setLayout(otherCasesPanelLayout); otherCasesPanelLayout.setHorizontalGroup( otherCasesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 1500, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) .addGroup(otherCasesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(otherCasesPanelLayout.createSequentialGroup() - .addComponent(tableContainerPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(tableContainerPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 2014, Short.MAX_VALUE) .addGap(0, 0, 0))) ); otherCasesPanelLayout.setVerticalGroup( @@ -1112,7 +1098,6 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi private javax.swing.JMenuItem showCommonalityMenuItem; private javax.swing.JPanel tableContainerPanel; private javax.swing.JSplitPane tablesViewerSplitPane; - private javax.swing.JPanel viewerPanel; // End of variables declaration//GEN-END:variables /** diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.form b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.form index 7d49061d72..bfaa36ecd7 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.form @@ -21,7 +21,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.java index 328ed2636b..ec8d632243 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OccurrencePanel.java @@ -249,7 +249,7 @@ public class OccurrencePanel extends javax.swing.JPanel { ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane1) ); }// //GEN-END:initComponents