diff --git a/Core/src/org/sleuthkit/autopsy/rejview/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/rejview/Bundle.properties-MERGED new file mode 100644 index 0000000000..aabc24d2e9 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/rejview/Bundle.properties-MERGED @@ -0,0 +1,2 @@ +RejTreeValueNode.defaultValueName.text=(Default) +RejTreeValueNode.failureValueName.text=PARSE FAILED diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RegeditExeValueFormatter.java b/Core/src/org/sleuthkit/autopsy/rejview/RegeditExeValueFormatter.java index f0aaa5a201..fcf2c97adc 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RegeditExeValueFormatter.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RegeditExeValueFormatter.java @@ -95,4 +95,8 @@ class RegeditExeValueFormatter { } return sb.toString(); } + + private RegeditExeValueFormatter() { + //contrsuctor intentially left blank + } } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyNode.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyNode.java index e6e19c6a15..101779f9e1 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyNode.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyNode.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -class RejTreeKeyNode implements RejTreeNode { +public class RejTreeKeyNode implements RejTreeNode { private static final Logger logger = Logger.getLogger(RejTreeKeyNode.class.getName()); private final RegistryKey _key; - RejTreeKeyNode(RegistryKey key) { + public RejTreeKeyNode(RegistryKey key) { this._key = key; } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyView.java index 83dce9c5a4..b92ef084ce 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeKeyView.java @@ -35,12 +35,12 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.SwingConstants; -class RejTreeKeyView extends RejTreeNodeView { +public class RejTreeKeyView extends RejTreeNodeView { private static final long serialVersionUID = 1L; private final RejTreeKeyNode _node; - RejTreeKeyView(RejTreeKeyNode node) { + public RejTreeKeyView(RejTreeKeyNode node) { super(new BorderLayout()); this._node = node; @@ -98,12 +98,10 @@ class RejTreeKeyView extends RejTreeNodeView { data[i][2] = RegeditExeValueFormatter.format(val.getValue()); i++; } - } catch (RegistryParseException e) { + } catch (RegistryParseException | UnsupportedEncodingException e) { // TODO(wb): need to add some warning here... // not sure how to do it, though, since some data may have already been added // but not necessarily all of it - } catch (UnsupportedEncodingException e) { - // TODO(wb): need to add some warning here... } JTable table = new JTable(data, columnNames); diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNode.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNode.java index 9a557f0929..33b379ace5 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNode.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNode.java @@ -28,14 +28,14 @@ import java.util.List; * model. It may describe both the contents of the node, and how it should be * displayed. */ -interface RejTreeNode { +public interface RejTreeNode { @Override - abstract String toString(); + public abstract String toString(); - abstract boolean hasChildren(); + public abstract boolean hasChildren(); - abstract List getChildren(); + public abstract List getChildren(); - abstract RejTreeNodeView getView(); + public abstract RejTreeNodeView getView(); } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeSelectionEvent.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeSelectionEvent.java index d4470ab103..3409e0998d 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeSelectionEvent.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeSelectionEvent.java @@ -21,15 +21,15 @@ */ package org.sleuthkit.autopsy.rejview; -class RejTreeNodeSelectionEvent { +public class RejTreeNodeSelectionEvent { private final RejTreeNode _node; - RejTreeNodeSelectionEvent(RejTreeNode n) { + public RejTreeNodeSelectionEvent(RejTreeNode n) { this._node = n; } - RejTreeNode getNode() { + public RejTreeNode getNode() { return this._node; } } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeView.java index 415f27b969..d1eaf06a5c 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeNodeView.java @@ -24,15 +24,15 @@ package org.sleuthkit.autopsy.rejview; import java.awt.LayoutManager; import javax.swing.JPanel; -class RejTreeNodeView extends JPanel { +public class RejTreeNodeView extends JPanel { private static final long serialVersionUID = 1L; - RejTreeNodeView() { + public RejTreeNodeView() { super(); } - RejTreeNodeView(LayoutManager lm) { + public RejTreeNodeView(LayoutManager lm) { super(lm); } } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueNode.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueNode.java index 958788d2bb..a51e11bbca 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueNode.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueNode.java @@ -30,12 +30,12 @@ import org.openide.util.NbBundle.Messages; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -class RejTreeValueNode implements RejTreeNode { +public class RejTreeValueNode implements RejTreeNode { private static final Logger logger = Logger.getLogger(RejTreeValueNode.class.getName()); private final RegistryValue _value; - RejTreeValueNode(RegistryValue value) { + public RejTreeValueNode(RegistryValue value) { this._value = value; } diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java index b108302a3b..6b003dbe94 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java @@ -31,12 +31,12 @@ import javax.swing.JLabel; import javax.swing.JScrollPane; import javax.swing.SwingConstants; -class RejTreeValueView extends RejTreeNodeView { +public class RejTreeValueView extends RejTreeNodeView { private static final long serialVersionUID = 1L; private final RejTreeValueNode _node; - RejTreeValueView(RejTreeValueNode node) { + public RejTreeValueView(RejTreeValueNode node) { super(new BorderLayout()); this._node = node;