org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.uicomponents;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-
-/**
-* FlowLayout subclass that fully supports wrapping of components.
-*
-* Originally written by Rob Camick
-* https://tips4java.wordpress.com/2008/11/06/wrap-layout/
-*/
-public class WrapLayout extends FlowLayout {
-
- private static final long serialVersionUID = 1L;
- /**
- * Constructs a new WrapLayout with a left alignment and a
- * default 5-unit horizontal and vertical gap.
- */
- public WrapLayout() {
- super();
- }
-
- /**
- * Constructs a new FlowLayout with the specified alignment
- * and a default 5-unit horizontal and vertical gap. The value of the
- * alignment argument must be one of WrapLayout,
- * WrapLayout, or WrapLayout.
- *
- * @param align the alignment value
- */
- public WrapLayout(int align) {
- super(align);
- }
-
- /**
- * Creates a new flow layout manager with the indicated alignment and
- * the indicated horizontal and vertical gaps.
- *
- * The value of the alignment argument must be one of
- * WrapLayout, WrapLayout, or
- * WrapLayout.
- *
- * @param align the alignment value
- * @param hgap the horizontal gap between components
- * @param vgap the vertical gap between components
- */
- public WrapLayout(int align, int hgap, int vgap) {
- super(align, hgap, vgap);
- }
-
- /**
- * Returns the preferred dimensions for this layout given the
- * visible components in the specified target container.
- *
- * @param target the component which needs to be laid out
- *
- * @return the preferred dimensions to lay out the subcomponents of the
- * specified container
- */
- @Override
- public Dimension preferredLayoutSize(Container target) {
- return layoutSize(target, true);
- }
-
- /**
- * Returns the minimum dimensions needed to layout the visible
- * components contained in the specified target container.
- *
- * @param target the component which needs to be laid out
- *
- * @return the minimum dimensions to lay out the subcomponents of the
- * specified container
- */
- @Override
- public Dimension minimumLayoutSize(Container target) {
- Dimension minimum = layoutSize(target, false);
- minimum.width -= (getHgap() + 1);
- return minimum;
- }
-
- /**
- * Returns the minimum or preferred dimension needed to layout the
- * target container.
- *
- * @param target target to get layout size for
- * @param preferred should preferred size be calculated
- *
- * @return the dimension to layout the target container
- */
- private Dimension layoutSize(Container target, boolean preferred) {
- synchronized (target.getTreeLock()) {
- // Each row must fit with the width allocated to the containter.
- // When the container width = 0, the preferred width of the container
- // has not yet been calculated so lets ask for the maximum.
-
- int targetWidth = target.getSize().width;
- Container container = target;
-
- while (container.getSize().width == 0 && container.getParent() != null) {
- container = container.getParent();
- }
-
- targetWidth = container.getSize().width;
-
- if (targetWidth == 0) {
- targetWidth = Integer.MAX_VALUE;
- }
-
- int hgap = getHgap();
- int vgap = getVgap();
- Insets insets = target.getInsets();
- int horizontalInsetsAndGap = insets.left + insets.right + (hgap * 2);
- int maxWidth = targetWidth - horizontalInsetsAndGap;
-
- // Fit components into the allowed width
- Dimension dim = new Dimension(0, 0);
- int rowWidth = 0;
- int rowHeight = 0;
-
- int nmembers = target.getComponentCount();
-
- for (int i = 0; i < nmembers; i++) {
- Component m = target.getComponent(i);
-
- if (m.isVisible()) {
- Dimension d = preferred ? m.getPreferredSize() : m.getMinimumSize();
-
- // Can't add the component to current row. Start a new row.
- if (rowWidth + d.width > maxWidth) {
- addRow(dim, rowWidth, rowHeight);
- rowWidth = 0;
- rowHeight = 0;
- }
-
- // Add a horizontal gap for all components after the first
- if (rowWidth != 0) {
- rowWidth += hgap;
- }
-
- rowWidth += d.width;
- rowHeight = Math.max(rowHeight, d.height);
- }
- }
-
- addRow(dim, rowWidth, rowHeight);
-
- dim.width += horizontalInsetsAndGap;
- dim.height += insets.top + insets.bottom + vgap * 2;
-
- // When using a scroll pane or the DecoratedLookAndFeel we need to
- // make sure the preferred size is less than the size of the
- // target containter so shrinking the container size works
- // correctly. Removing the horizontal gap is an easy way to do this.
- Container scrollPane = SwingUtilities.getAncestorOfClass(JScrollPane.class, target);
-
- if (scrollPane != null && target.isValid()) {
- dim.width -= (hgap + 1);
- }
-
- return dim;
- }
- }
-
- /*
- * A new row has been completed. Use the dimensions of this row to
- * update the preferred size for the container.
- *
- * @param dim update the width and height when appropriate @param
- * rowWidth the width of the row to add @param rowHeight the height of
- * the row to add
- */
- private void addRow(Dimension dim, int rowWidth, int rowHeight) {
- dim.width = Math.max(dim.width, rowWidth);
-
- if (dim.height > 0) {
- dim.height += getVgap();
- }
-
- dim.height += rowHeight;
- }
- }
\ No newline at end of file
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
index f3081bef89..2b25c96245 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
@@ -257,3 +257,8 @@ CasesDashboardTopComponent.refreshButton.text=Refresh
AutoIngestCasesDeletionDialog.jLabel1.text=Progress
CasesDashboardTopComponent.deleteOrphanCaseNodesButton.text=Delete Orphan Case Znodes
CasesDashboardTopComponent.deleteOrphanManifestNodesButton.text=Delete Orphan Manifest Znodes
+DeleteOrphanCaseNodesDialog.descriptionText.text=The following cases have orphaned znodes. Would you like to delete them?
+DeleteOrphanCaseNodesDialog.okButton.text=OK
+DeleteOrphanCaseNodesDialog.cancelButton.text=Cancel
+DeleteOrphanCaseNodesDialog.titleText.text=Delete The Following Znodes?
+DeleteOrphanCaseNodesDialog.lblNodeCount.text=
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
index 46c6d587fc..adb7693b48 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED
@@ -89,10 +89,6 @@ AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the c
AutoIngestControlPanel.SharedConfigurationDisabled=Shared configuration disabled
AutoIngestControlPanel.ShowLogFailed.Message=Case log file does not exist
AutoIngestControlPanel.ShowLogFailed.Title=Unable to display case log
-# {0} - case db status
-# {1} - search svc Status
-# {2} - coord svc Status
-# {3} - msg broker status
AutoIngestControlPanel.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3}
AutoIngestControlPanel.tbServicesStatusMessage.Message.Down=down
AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown=unknown
@@ -186,25 +182,23 @@ DeleteCaseTask.progress.acquiringManifestLocks=Acquiring exclusive manifest file
DeleteCaseTask.progress.connectingToCoordSvc=Connecting to the coordination service...
DeleteCaseTask.progress.deletingCaseDirCoordSvcNode=Deleting case directory znode...
DeleteCaseTask.progress.deletingCaseNameCoordSvcNode=Deleting case name znode...
-# {0} - data source path
DeleteCaseTask.progress.deletingDataSource=Deleting data source {0}...
DeleteCaseTask.progress.deletingJobLogLockNode=Deleting case auto ingest log znode...
-# {0} - manifest file path
DeleteCaseTask.progress.deletingManifest=Deleting manifest file {0}...
-# {0} - manifest file path
DeleteCaseTask.progress.deletingManifestFileNode=Deleting the manifest file znode for {0}...
DeleteCaseTask.progress.deletingResourcesLockNode=Deleting case resources znode...
DeleteCaseTask.progress.gettingManifestPaths=Getting manifest file paths...
-# {0} - manifest file path
DeleteCaseTask.progress.lockingManifest=Locking manifest file {0}...
DeleteCaseTask.progress.openingCaseDatabase=Opening the case database...
DeleteCaseTask.progress.openingCaseMetadataFile=Opening case metadata file...
-# {0} - manifest file path
DeleteCaseTask.progress.parsingManifest=Parsing manifest file {0}...
-# {0} - manifest file path
DeleteCaseTask.progress.releasingManifestLock=Releasing lock on the manifest file {0}...
DeleteCaseTask.progress.startMessage=Starting deletion...
DeleteOrphanCaseNodesAction.progressDisplayName=Cleanup Case Znodes
+# {0} - item count
+DeleteOrphanCaseNodesDialog.additionalInit.lblNodeCount.text=Znodes found: {0}
+# {0} - item count
+DeleteOrphanCaseNodesDialog.additionalInit.znodesTextArea.countMessage=ZNODES FOUND: {0}
DeleteOrphanCaseNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
# {0} - node path
DeleteOrphanCaseNodesTask.progress.deletingOrphanedCaseNode=Deleting orphaned case znode {0}
@@ -213,7 +207,6 @@ DeleteOrphanCaseNodesTask.progress.lookingForOrphanedCaseZnodes=Looking for orph
DeleteOrphanCaseNodesTask.progress.startMessage=Starting orphaned case znode cleanup
DeleteOrphanManifestNodesAction.progressDisplayName=Cleanup Manifest File Znodes
DeleteOrphanManifestNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
-# {0} - node path
DeleteOrphanManifestNodesTask.progress.deletingOrphanedManifestNode=Deleting orphaned manifest file znode {0}
DeleteOrphanManifestNodesTask.progress.gettingManifestNodes=Querying the coordination service for manifest file znodes
DeleteOrphanManifestNodesTask.progress.lookingForOrphanedManifestFileZnodes=Looking for orphaned manifest file znodes
@@ -222,7 +215,6 @@ HINT_CasesDashboardTopComponent=This is an adminstrative dashboard for multi-use
OpenAutoIngestLogAction.deletedLogErrorMsg=The case auto ingest log has been deleted.
OpenAutoIngestLogAction.logOpenFailedErrorMsg=Failed to open case auto ingest log. See application log for details.
OpenAutoIngestLogAction.menuItemText=Open Auto Ingest Log File
-# {0} - caseErrorMessage
OpenCaseAction.errorMsg=Failed to open case: {0}
OpenCaseAction.menuItemText=Open
OpenIDE-Module-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it.
@@ -456,3 +448,8 @@ CasesDashboardTopComponent.refreshButton.text=Refresh
AutoIngestCasesDeletionDialog.jLabel1.text=Progress
CasesDashboardTopComponent.deleteOrphanCaseNodesButton.text=Delete Orphan Case Znodes
CasesDashboardTopComponent.deleteOrphanManifestNodesButton.text=Delete Orphan Manifest Znodes
+DeleteOrphanCaseNodesDialog.descriptionText.text=The following cases have orphaned znodes. Would you like to delete them?
+DeleteOrphanCaseNodesDialog.okButton.text=OK
+DeleteOrphanCaseNodesDialog.cancelButton.text=Cancel
+DeleteOrphanCaseNodesDialog.titleText.text=Delete The Following Znodes?
+DeleteOrphanCaseNodesDialog.lblNodeCount.text=
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.form
new file mode 100644
index 0000000000..8b314a48d7
--- /dev/null
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.form
@@ -0,0 +1,135 @@
+
+
+
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.java
new file mode 100644
index 0000000000..3c8aacb86e
--- /dev/null
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesDialog.java
@@ -0,0 +1,181 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020-2020 Basis Technology Corp.
+ * Contact: carrier sleuthkit org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.experimental.autoingest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import javax.swing.JFrame;
+import org.openide.windows.WindowManager;
+import org.openide.util.NbBundle.Messages;
+
+/**
+ * This dialog shows the system administrator the orphaned znodes to be deleted.
+ * If 'OK' is selected, isOkSelected() will return true.
+ */
+class DeleteOrphanCaseNodesDialog extends javax.swing.JDialog {
+ private static final long serialVersionUID = 1L;
+
+ private static final String NEW_LINE = System.getProperty("line.separator");
+
+ private boolean okSelected = false;
+
+ /**
+ * Creates new form DeleteOrphanCaseNodesDialog
+ *
+ * @param zNodeCases The list of cases with nodes to be deleted
+ */
+ DeleteOrphanCaseNodesDialog(Collection zNodeCases) {
+ super((JFrame) WindowManager.getDefault().getMainWindow(), null, true);
+ initComponents();
+ additionalInit(zNodeCases);
+ }
+
+ /**
+ * displays this dialog as child of main window.
+ */
+ void display() {
+ this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
+ setVisible(true);
+ }
+
+ @Messages({
+ "# {0} - item count",
+ "DeleteOrphanCaseNodesDialog.additionalInit.lblNodeCount.text=Znodes found: {0}",
+ "# {0} - item count",
+ "DeleteOrphanCaseNodesDialog.additionalInit.znodesTextArea.countMessage=ZNODES FOUND: {0}"
+ })
+ private void additionalInit(Collection zNodeCases) {
+ List casesList = (zNodeCases == null) ? new ArrayList<>() : new ArrayList<>(zNodeCases);
+ int count = casesList.size();
+ casesList.sort(Comparator.comparing(String::toString));
+ String textAreaText = Bundle.DeleteOrphanCaseNodesDialog_additionalInit_znodesTextArea_countMessage(count)
+ + NEW_LINE
+ + NEW_LINE
+ + String.join(NEW_LINE, casesList);
+
+ znodesTextArea.setText(textAreaText);
+
+ lblNodeCount.setText(Bundle.DeleteOrphanCaseNodesDialog_additionalInit_lblNodeCount_text(count));
+ }
+
+ /**
+ * This method is called from within the constructor to initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ javax.swing.JLabel descriptionText = new javax.swing.JLabel();
+ javax.swing.JScrollPane jScrollPane = new javax.swing.JScrollPane();
+ znodesTextArea = new javax.swing.JTextArea();
+ javax.swing.JButton cancelButton = new javax.swing.JButton();
+ javax.swing.JButton okButton = new javax.swing.JButton();
+ lblNodeCount = new javax.swing.JLabel();
+
+ setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+ setTitle(org.openide.util.NbBundle.getMessage(DeleteOrphanCaseNodesDialog.class, "DeleteOrphanCaseNodesDialog.titleText.text")); // NOI18N
+ setMinimumSize(new java.awt.Dimension(535, 226));
+
+ org.openide.awt.Mnemonics.setLocalizedText(descriptionText, org.openide.util.NbBundle.getMessage(DeleteOrphanCaseNodesDialog.class, "DeleteOrphanCaseNodesDialog.descriptionText.text")); // NOI18N
+ descriptionText.setVerticalAlignment(javax.swing.SwingConstants.TOP);
+
+ znodesTextArea.setEditable(false);
+ znodesTextArea.setColumns(20);
+ znodesTextArea.setLineWrap(true);
+ znodesTextArea.setRows(5);
+ jScrollPane.setViewportView(znodesTextArea);
+
+ org.openide.awt.Mnemonics.setLocalizedText(cancelButton, org.openide.util.NbBundle.getMessage(DeleteOrphanCaseNodesDialog.class, "DeleteOrphanCaseNodesDialog.cancelButton.text")); // NOI18N
+ cancelButton.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ cancelButtonActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(okButton, org.openide.util.NbBundle.getMessage(DeleteOrphanCaseNodesDialog.class, "DeleteOrphanCaseNodesDialog.okButton.text")); // NOI18N
+ okButton.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ okButtonActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(lblNodeCount, org.openide.util.NbBundle.getMessage(DeleteOrphanCaseNodesDialog.class, "DeleteOrphanCaseNodesDialog.lblNodeCount.text")); // NOI18N
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+ getContentPane().setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jScrollPane, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(descriptionText, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(lblNodeCount, javax.swing.GroupLayout.PREFERRED_SIZE, 310, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(okButton)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(cancelButton)))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(descriptionText)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 252, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(cancelButton)
+ .addComponent(okButton)
+ .addComponent(lblNodeCount))
+ .addContainerGap())
+ );
+
+ pack();
+ }// //GEN-END:initComponents
+
+ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
+ okSelected = true;
+ dispose();
+ }//GEN-LAST:event_okButtonActionPerformed
+
+ private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
+ dispose();
+ }//GEN-LAST:event_cancelButtonActionPerformed
+
+ /**
+ * If the system administrator selected OK.
+ *
+ * @return Whether or not 'OK' was selected by the system administrator.
+ */
+ boolean isOkSelected() {
+ return okSelected;
+ }
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JLabel lblNodeCount;
+ private javax.swing.JTextArea znodesTextArea;
+ // End of variables declaration//GEN-END:variables
+}
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesTask.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesTask.java
index 16f0592548..63a3051d9b 100755
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesTask.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/DeleteOrphanCaseNodesTask.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2019-2019 Basis Technology Corp.
+ * Copyright 2019-2020 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,10 +19,17 @@
package org.sleuthkit.autopsy.experimental.autoingest;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.logging.Level;
+import javax.swing.SwingUtilities;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.multiusercases.CoordinationServiceUtils;
import static org.sleuthkit.autopsy.casemodule.multiusercases.CoordinationServiceUtils.isCaseAutoIngestLogNodePath;
@@ -40,8 +47,8 @@ final class DeleteOrphanCaseNodesTask implements Runnable {
private static final Logger logger = AutoIngestDashboardLogger.getLogger();
private final ProgressIndicator progress;
- private int nodesCount;
- private int casesCount;
+ private int nodesCount = 0;
+ private int casesCount = 0;
/**
* Constucts an instance of a task for deleting case coordination service
@@ -53,6 +60,130 @@ final class DeleteOrphanCaseNodesTask implements Runnable {
this.progress = progress;
}
+ /**
+ * Retrieves an instance of the coordination service in order to fetch
+ * znodes and potentially delete.
+ *
+ * @return The coordination service or null on error.
+ */
+ private CoordinationService getCoordinationService() {
+ progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_connectingToCoordSvc());
+ logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_connectingToCoordSvc());
+ CoordinationService coordinationService = null;
+ try {
+ coordinationService = CoordinationService.getInstance();
+ } catch (CoordinationService.CoordinationServiceException ex) {
+ logger.log(Level.SEVERE, "Error connecting to the coordination service", ex); //NON-NLS
+ }
+ return coordinationService;
+ }
+
+ /**
+ * Retrieves node paths for cases.
+ *
+ * @param coordinationService The coordination service to use in order to
+ * fetch the node paths.
+ *
+ * @return The list of node paths for cases.
+ */
+ private List getNodePaths(CoordinationService coordinationService) {
+ progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_gettingCaseZnodes());
+ logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_gettingCaseZnodes());
+ List nodePaths = null;
+ try {
+ nodePaths = coordinationService.getNodeList(CoordinationService.CategoryNode.CASES);
+ // in the event that getNodeList returns null (but still successful) return empty list
+ if (nodePaths == null) {
+ return new ArrayList();
+ }
+ } catch (CoordinationService.CoordinationServiceException ex) {
+ logger.log(Level.SEVERE, "Error getting case znode list", ex); //NON-NLS
+ } catch (InterruptedException unused) {
+ logger.log(Level.WARNING, "Task cancelled while getting case znode list"); //NON-NLS
+ }
+
+ return nodePaths;
+ }
+
+ private void addIfExists(List paths, String path) {
+ if (path != null && !path.isEmpty()) {
+ paths.add(path);
+ }
+ }
+
+ /**
+ * Determines orphaned znode paths.
+ *
+ * @param nodePaths The list of case node paths.
+ *
+ * @return The list of orphaned node paths.
+ */
+ private Map> getOrphanedNodes(List nodePaths) {
+ progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
+ logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
+ Map> nodePathsToDelete = new HashMap<>();
+ for (String caseNodePath : nodePaths) {
+ if (isCaseNameNodePath(caseNodePath) || isCaseResourcesNodePath(caseNodePath) || isCaseAutoIngestLogNodePath(caseNodePath)) {
+ continue;
+ }
+
+ final Path caseDirectoryPath = Paths.get(caseNodePath);
+ final File caseDirectory = caseDirectoryPath.toFile();
+ if (!caseDirectory.exists()) {
+ String caseName = CoordinationServiceUtils.getCaseNameNodePath(caseDirectoryPath);
+ List paths = new ArrayList<>();
+
+ addIfExists(paths, CoordinationServiceUtils.getCaseNameNodePath(caseDirectoryPath));
+ addIfExists(paths, CoordinationServiceUtils.getCaseResourcesNodePath(caseDirectoryPath));
+ addIfExists(paths, CoordinationServiceUtils.getCaseAutoIngestLogNodePath(caseDirectoryPath));
+ addIfExists(paths, CoordinationServiceUtils.getCaseDirectoryNodePath(caseDirectoryPath));
+ nodePathsToDelete.put(caseName, paths);
+ }
+ }
+ return nodePathsToDelete;
+ }
+
+ /**
+ * Boxed boolean so that promptUser method can set a value on a final object
+ * from custom jdialog message.
+ */
+ private class PromptResult {
+
+ private boolean value = false;
+
+ boolean isValue() {
+ return value;
+ }
+
+ void setValue(boolean value) {
+ this.value = value;
+ }
+
+ }
+
+ /**
+ * prompts the user with a list of orphaned znodes.
+ *
+ * @param orphanedNodes The orphaned znode cases.
+ *
+ * @return True if the user would like to proceed deleting the znodes.
+ */
+ private boolean promptUser(Collection orphanedNodes) {
+ final PromptResult dialogResult = new PromptResult();
+ try {
+ SwingUtilities.invokeAndWait(() -> {
+ DeleteOrphanCaseNodesDialog dialog = new DeleteOrphanCaseNodesDialog(orphanedNodes);
+ dialog.display();
+ dialogResult.setValue(dialog.isOkSelected());
+ });
+
+ return dialogResult.isValue();
+ } catch (InterruptedException | InvocationTargetException e) {
+ logger.log(Level.WARNING, "Task cancelled while confirming case znodes to delete"); //NON-NLS
+ return false;
+ }
+ }
+
@Override
@NbBundle.Messages({
"DeleteOrphanCaseNodesTask.progress.startMessage=Starting orphaned case znode cleanup",
@@ -63,67 +194,21 @@ final class DeleteOrphanCaseNodesTask implements Runnable {
public void run() {
progress.start(Bundle.DeleteOrphanCaseNodesTask_progress_startMessage());
try {
- progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_connectingToCoordSvc());
- logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_connectingToCoordSvc());
- CoordinationService coordinationService;
- try {
- coordinationService = CoordinationService.getInstance();
- } catch (CoordinationService.CoordinationServiceException ex) {
- logger.log(Level.SEVERE, "Error connecting to the coordination service", ex); //NON-NLS
+ CoordinationService coordinationService = getCoordinationService();
+ if (coordinationService == null) {
return;
}
- progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_gettingCaseZnodes());
- logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_gettingCaseZnodes());
- List nodePaths;
- try {
- nodePaths = coordinationService.getNodeList(CoordinationService.CategoryNode.CASES);
- } catch (CoordinationService.CoordinationServiceException ex) {
- logger.log(Level.SEVERE, "Error getting case znode list", ex); //NON-NLS
- return;
- } catch (InterruptedException unused) {
- logger.log(Level.WARNING, "Task cancelled while getting case znode list"); //NON-NLS
+ List nodePaths = getNodePaths(coordinationService);
+ if (nodePaths == null) {
return;
}
- progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
- logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
- for (String caseNodePath : nodePaths) {
- if (isCaseNameNodePath(caseNodePath) || isCaseResourcesNodePath(caseNodePath) || isCaseAutoIngestLogNodePath(caseNodePath)) {
- continue;
- }
+ Map> orphanedNodes = getOrphanedNodes(nodePaths);
+ boolean continueDelete = promptUser(orphanedNodes.keySet());
- final Path caseDirectoryPath = Paths.get(caseNodePath);
- final File caseDirectory = caseDirectoryPath.toFile();
- if (!caseDirectory.exists()) {
- String caseName = CoordinationServiceUtils.getCaseNameNodePath(caseDirectoryPath);
- String nodePath = ""; // NON-NLS
- try {
- nodePath = CoordinationServiceUtils.getCaseNameNodePath(caseDirectoryPath);
- deleteNode(coordinationService, caseName, nodePath);
-
- nodePath = CoordinationServiceUtils.getCaseResourcesNodePath(caseDirectoryPath);
- deleteNode(coordinationService, caseName, nodePath);
-
- nodePath = CoordinationServiceUtils.getCaseAutoIngestLogNodePath(caseDirectoryPath);
- deleteNode(coordinationService, caseName, nodePath);
-
- nodePath = CoordinationServiceUtils.getCaseDirectoryNodePath(caseDirectoryPath);
- deleteNode(coordinationService, caseName, nodePath);
-
- ++casesCount;
-
- /*
- * Back to looking for orphans...
- */
- progress.progress(Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
- logger.log(Level.INFO, Bundle.DeleteOrphanCaseNodesTask_progress_lookingForOrphanedCaseZnodes());
-
- } catch (InterruptedException unused) {
- logger.log(Level.WARNING, String.format("Task cancelled while deleting orphaned znode %s for %s", nodePath, caseName)); //NON-NLS
- return;
- }
- }
+ if (continueDelete) {
+ deleteNodes(coordinationService, orphanedNodes);
}
} catch (Exception ex) {
@@ -142,6 +227,32 @@ final class DeleteOrphanCaseNodesTask implements Runnable {
}
}
+ /**
+ * Deletes the orphaned znodes provided in the 'orphanedNodes' variable.
+ *
+ * @param coordinationService The coordination service to use for deletion.
+ * @param orphanedNodes A mapping of case to the orphaned znodes.
+ *
+ * @throws InterruptedException If the thread executing this task is
+ * interrupted during the delete operation.
+ */
+ private void deleteNodes(CoordinationService coordinationService, Map> orphanedNodes) {
+ String caseName = null;
+ String nodePath = null;
+ try {
+ for (Entry> caseNodePaths : orphanedNodes.entrySet()) {
+ caseName = caseNodePaths.getKey();
+ for (String path : caseNodePaths.getValue()) {
+ nodePath = path;
+ deleteNode(coordinationService, caseName, nodePath);
+ }
+ ++casesCount;
+ }
+ } catch (InterruptedException unused) {
+ logger.log(Level.WARNING, String.format("Task cancelled while deleting orphaned znode %s for %s", nodePath, caseName)); //NON-NLS
+ }
+ }
+
/**
* Attempts to delete a case coordination service node.
*
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
index 760f823543..7aa013e047 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.form
@@ -25,7 +25,7 @@
-
+
@@ -42,15 +42,15 @@
-
+
-
-
+
+
@@ -59,70 +59,68 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -177,7 +175,7 @@
-
+
@@ -192,7 +190,7 @@
-
+
@@ -225,6 +223,15 @@
+
+
+
+
+
+
+
+
+
@@ -235,6 +242,15 @@
+
+
+
+
+
+
+
+
+
@@ -245,6 +261,15 @@
+
+
+
+
+
+
+
+
+
@@ -332,13 +357,13 @@
-
+
-
+
-
+
@@ -373,6 +398,15 @@
+
+
+
+
+
+
+
+
+
@@ -383,6 +417,15 @@
+
+
+
+
+
+
+
+
+
@@ -423,6 +466,15 @@
+
+
+
+
+
+
+
+
+
@@ -478,19 +530,19 @@
-
+
-
-
+
+
-
+
-
+
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
index fcd21dd8f2..696c33ccb4 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestSettingsPanel.java
@@ -1,7 +1,7 @@
/*
* Autopsy Forensic Browser
*
- * Copyright 2015-2018 Basis Technology Corp.
+ * Copyright 2015-2020 Basis Technology Corp.
* Contact: carrier sleuthkit org
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,6 @@ import javax.swing.ImageIcon;
import org.openide.util.ImageUtilities;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
-import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.coreutils.FileUtil;
import org.openide.windows.WindowManager;
import org.sleuthkit.autopsy.coreutils.Logger;
@@ -644,7 +643,7 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
nodeScrollPane.setMinimumSize(new java.awt.Dimension(0, 0));
- nodePanel.setMinimumSize(new java.awt.Dimension(100, 100));
+ nodePanel.setMinimumSize(new java.awt.Dimension(0, 0));
tbOops.setEditable(false);
tbOops.setFont(tbOops.getFont().deriveFont(tbOops.getFont().getStyle() | java.awt.Font.BOLD, tbOops.getFont().getSize()+1));
@@ -654,6 +653,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
org.openide.awt.Mnemonics.setLocalizedText(bnEditIngestSettings, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.bnEditIngestSettings.text")); // NOI18N
bnEditIngestSettings.setToolTipText(org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.bnEditIngestSettings.toolTipText")); // NOI18N
+ bnEditIngestSettings.setMaximumSize(new java.awt.Dimension(200, 25));
+ bnEditIngestSettings.setMinimumSize(new java.awt.Dimension(170, 25));
+ bnEditIngestSettings.setPreferredSize(new java.awt.Dimension(170, 25));
bnEditIngestSettings.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
bnEditIngestSettingsActionPerformed(evt);
@@ -661,6 +663,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
});
org.openide.awt.Mnemonics.setLocalizedText(bnAdvancedSettings, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.bnAdvancedSettings.text")); // NOI18N
+ bnAdvancedSettings.setMaximumSize(new java.awt.Dimension(200, 25));
+ bnAdvancedSettings.setMinimumSize(new java.awt.Dimension(170, 25));
+ bnAdvancedSettings.setPreferredSize(new java.awt.Dimension(170, 25));
bnAdvancedSettings.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
bnAdvancedSettingsActionPerformed(evt);
@@ -668,6 +673,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
});
org.openide.awt.Mnemonics.setLocalizedText(bnFileExport, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.bnFileExport.text")); // NOI18N
+ bnFileExport.setMaximumSize(new java.awt.Dimension(200, 25));
+ bnFileExport.setMinimumSize(new java.awt.Dimension(170, 25));
+ bnFileExport.setPreferredSize(new java.awt.Dimension(170, 25));
bnFileExport.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
bnFileExportActionPerformed(evt);
@@ -707,9 +715,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
jLabelSelectOutputFolder.setVerticalAlignment(javax.swing.SwingConstants.BOTTOM);
org.openide.awt.Mnemonics.setLocalizedText(sharedConfigCheckbox, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.sharedConfigCheckbox.text")); // NOI18N
- sharedConfigCheckbox.setMaximumSize(new java.awt.Dimension(191, 14));
- sharedConfigCheckbox.setMinimumSize(new java.awt.Dimension(191, 14));
- sharedConfigCheckbox.setPreferredSize(new java.awt.Dimension(191, 14));
+ sharedConfigCheckbox.setMaximumSize(new java.awt.Dimension(191, 21));
+ sharedConfigCheckbox.setMinimumSize(new java.awt.Dimension(191, 21));
+ sharedConfigCheckbox.setPreferredSize(new java.awt.Dimension(191, 21));
sharedConfigCheckbox.addItemListener(new java.awt.event.ItemListener() {
public void itemStateChanged(java.awt.event.ItemEvent evt) {
sharedConfigCheckboxItemStateChanged(evt);
@@ -726,6 +734,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
org.openide.awt.Mnemonics.setLocalizedText(browseSharedSettingsButton, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.browseSharedSettingsButton.text")); // NOI18N
browseSharedSettingsButton.setEnabled(false);
+ browseSharedSettingsButton.setMaximumSize(new java.awt.Dimension(200, 25));
+ browseSharedSettingsButton.setMinimumSize(new java.awt.Dimension(170, 25));
+ browseSharedSettingsButton.setPreferredSize(new java.awt.Dimension(170, 25));
browseSharedSettingsButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
browseSharedSettingsButtonActionPerformed(evt);
@@ -733,6 +744,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
});
org.openide.awt.Mnemonics.setLocalizedText(downloadButton, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.downloadButton.text")); // NOI18N
+ downloadButton.setMaximumSize(new java.awt.Dimension(200, 25));
+ downloadButton.setMinimumSize(new java.awt.Dimension(170, 25));
+ downloadButton.setPreferredSize(new java.awt.Dimension(170, 25));
downloadButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
downloadButtonActionPerformed(evt);
@@ -749,6 +763,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
org.openide.awt.Mnemonics.setLocalizedText(jLabelCurrentTask, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.jLabelCurrentTask.text")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(uploadButton, org.openide.util.NbBundle.getMessage(AutoIngestSettingsPanel.class, "AutoIngestSettingsPanel.uploadButton.text")); // NOI18N
+ uploadButton.setMaximumSize(new java.awt.Dimension(200, 25));
+ uploadButton.setMinimumSize(new java.awt.Dimension(170, 25));
+ uploadButton.setPreferredSize(new java.awt.Dimension(170, 25));
uploadButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
uploadButtonActionPerformed(evt);
@@ -805,8 +822,8 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
.addGroup(pnTestMultiUserLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lbTestResultText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(pnTestMultiUserLayout.createSequentialGroup()
- .addComponent(lbTestMultiUserText)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 236, Short.MAX_VALUE)
+ .addComponent(lbTestMultiUserText, javax.swing.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE)
+ .addGap(236, 236, 236)
.addComponent(bnTestMultiUser, javax.swing.GroupLayout.PREFERRED_SIZE, 83, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(lbMultiUserResult, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -840,57 +857,63 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
.addComponent(jLabelInvalidImageFolder, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(nodePanelLayout.createSequentialGroup()
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(pbTaskInProgress, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addGroup(nodePanelLayout.createSequentialGroup()
- .addComponent(jLabelCurrentTask)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, nodePanelLayout.createSequentialGroup()
+ .addComponent(sharedConfigCheckbox, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(jLabelTaskDescription, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(sharedSettingsErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 445, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(30, 30, 30))
.addGroup(nodePanelLayout.createSequentialGroup()
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(nodePanelLayout.createSequentialGroup()
- .addComponent(outputPathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 630, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(browseOutputFolderButton))
+ .addComponent(jLabelCurrentTask)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jLabelTaskDescription, javax.swing.GroupLayout.PREFERRED_SIZE, 626, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(nodePanelLayout.createSequentialGroup()
.addComponent(inputPathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 630, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(browseInputFolderButton))
- .addComponent(uploadButton, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(masterNodeCheckBox)
+ .addComponent(uploadButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(nodePanelLayout.createSequentialGroup()
- .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(bnAdvancedSettings, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(bnAdvancedSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(bnFileExport, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(bnFileExport, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(nodePanelLayout.createSequentialGroup()
.addComponent(jLabelSelectOutputFolder)
.addGap(18, 18, 18)
.addComponent(jLabelInvalidResultsFolder, javax.swing.GroupLayout.PREFERRED_SIZE, 544, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(nodePanelLayout.createSequentialGroup()
- .addComponent(sharedConfigCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(sharedSettingsErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(nodePanelLayout.createSequentialGroup()
.addComponent(sharedSettingsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(browseSharedSettingsButton, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGroup(nodePanelLayout.createSequentialGroup()
- .addComponent(downloadButton, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(configButtonErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 396, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(browseSharedSettingsButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(nodePanelLayout.createSequentialGroup()
.addComponent(examinerModeRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(tbOops, javax.swing.GroupLayout.PREFERRED_SIZE, 561, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(tbOops, javax.swing.GroupLayout.PREFERRED_SIZE, 561, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(downloadButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(autoIngestModeRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE)))
.addGap(10, 10, 10))
.addGroup(nodePanelLayout.createSequentialGroup()
- .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(autoIngestModeRadioButton, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(pnTestMultiUser, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(0, 0, Short.MAX_VALUE))))
+ .addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(pnTestMultiUser, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(configButtonErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 531, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(masterNodeCheckBox, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, nodePanelLayout.createSequentialGroup()
+ .addComponent(outputPathTextField)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(browseOutputFolderButton))
+ .addComponent(pbTaskInProgress, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
);
+
+ nodePanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {bnAdvancedSettings, bnEditIngestSettings, bnFileExport, browseSharedSettingsButton, downloadButton, uploadButton});
+
+ nodePanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {inputPathTextField, outputPathTextField});
+
+ nodePanelLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {browseInputFolderButton, browseOutputFolderButton});
+
nodePanelLayout.setVerticalGroup(
nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(nodePanelLayout.createSequentialGroup()
@@ -918,9 +941,9 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
.addComponent(outputPathTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(25, 25, 25)
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(bnEditIngestSettings)
- .addComponent(bnFileExport)
- .addComponent(bnAdvancedSettings))
+ .addComponent(bnEditIngestSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(bnFileExport, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(bnAdvancedSettings, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(sharedConfigCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -928,15 +951,15 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(sharedSettingsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(browseSharedSettingsButton))
+ .addComponent(browseSharedSettingsButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(downloadButton)
- .addComponent(configButtonErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 21, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(downloadButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(configButtonErrorTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(masterNodeCheckBox, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(uploadButton)
+ .addComponent(uploadButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(8, 8, 8)
.addGroup(nodePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabelCurrentTask)
@@ -945,7 +968,7 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
.addComponent(pbTaskInProgress, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(pnTestMultiUser, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(82, Short.MAX_VALUE))
+ .addContainerGap(20, Short.MAX_VALUE))
);
nodeScrollPane.setViewportView(nodePanel);
@@ -958,193 +981,10 @@ public class AutoIngestSettingsPanel extends javax.swing.JPanel {
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(nodeScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 656, Short.MAX_VALUE)
+ .addComponent(nodeScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
}//