From bbd2b847a3af6076dc366bb44329632a34640b49 Mon Sep 17 00:00:00 2001
From: Brian Sweeney <bsweeney@ciphertechsolutions.com>
Date: Mon, 12 Mar 2018 15:08:24 -0600
Subject: [PATCH] messages implemented using message Attribute

---
 .../sleuthkit/autopsy/commonfilesearch/Bundle.properties  | 8 +-------
 .../autopsy/commonfilesearch/CommonFilesAction.java       | 4 +++-
 .../autopsy/commonfilesearch/CommonFilesDialog.java       | 7 +++++--
 .../autopsy/commonfilesearch/CommonFilesNode.java         | 4 +++-
 .../autopsy/commonfilesearch/CommonFilesPanel.java        | 8 +++++---
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
index e02855438c..008339c8e0 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
@@ -1,7 +1 @@
-CommonFilesNode.getName.text=Common Files
-CommonFilesDialog.frame.title=Find Common Files
-CommonFilesDialog.frame.msg=Find Common Files
-CommonFilesPanel.searchButton.text=Search
-CommonFilesPanel.search.results.title=Common Files
-CommonFilesPanel.search.results.pathText=Common Files Search Results\:
-CommonFilesAction.getName.text=Common Files Search
\ No newline at end of file
+CommonFilesPanel.searchButton.text=Search
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesAction.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesAction.java
index 23bbcdc97f..3164dd230b 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesAction.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesAction.java
@@ -62,9 +62,11 @@ final class CommonFilesAction extends CallableSystemAction implements FileSearch
         new CommonFilesDialog().setVisible(true);
     }
 
+    @NbBundle.Messages({
+        "CommonFilesAction.getName.text=Common Files Search"})
     @Override
     public String getName() {
-        return NbBundle.getMessage(this.getClass(), "CommonFilesAction.getName.text");
+        return Bundle.CommonFilesAction_getName_text();
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
index f19c2e5ecb..bdc32cdaac 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
@@ -34,9 +34,12 @@ public final class CommonFilesDialog extends javax.swing.JDialog {
     /**
      * Creates new form CommonFilesDialog
      */
+    @NbBundle.Messages({
+        "CommonFilesDialog.frame.title=Find Common Files",
+        "CommonFilesDialog.frame.msg=Find Common Files"})
     public CommonFilesDialog() {
-        super(new JFrame(NbBundle.getMessage(CommonFilesDialog.class, "CommonFilesDialog.frame.title")),
-                NbBundle.getMessage(CommonFilesDialog.class, "CommonFilesDialog.frame.msg"), true);
+        super(new JFrame(Bundle.CommonFilesDialog_frame_title()),
+                Bundle.CommonFilesDialog_frame_msg(), true);
         initComponents();
 
         this.setResizable(false);
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
index 2e3cb839ef..d12358a287 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
@@ -35,8 +35,10 @@ final class CommonFilesNode extends AbstractNode {
         this.children = (CommonFilesChildren) this.getChildren();
     }
 
+    @NbBundle.Messages({
+        "CommonFilesNode.getName.text=CommonFiles"})
     @Override
     public String getName() {
-        return NbBundle.getMessage(this.getClass(), "CommonFilesNode.getName.text");
+        return Bundle.CommonFilesNode_getName_text();
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index 965932ec86..b5646d0145 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
 import org.openide.windows.WindowManager;
@@ -70,10 +69,13 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
         this.searchButton.addActionListener(l);
     }
 
+    @NbBundle.Messages({
+        "CommonFilesPanel.search.results.title=Common Files",
+        "CommonFilesPanel.search.results.pathText=Common Files Search Results\\:"})
     private void search() {
 
-        String title = NbBundle.getMessage(this.getClass(), "CommonFilesPanel.search.results.title");
-        String pathText = NbBundle.getMessage(this.getClass(), "CommonFilesPanel.search.results.pathText");
+        String title = Bundle.CommonFilesPanel_search_results_title();
+        String pathText = Bundle.CommonFilesPanel_search_results_pathText();
 
         new SwingWorker<Void, Void>() {