From a96d29e59fd67333bbd6619af49ab84a06bec4c2 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Fri, 28 Feb 2014 16:07:39 -0500 Subject: [PATCH] Pulled strings into Bundle. Created _ja. Added org.openide.util as a dependency for this module in project.xml. --- CoreLibs/nbproject/project.xml | 11 ++++++++++- .../org/sleuthkit/autopsy/corelibs/Bundle.properties | 1 + .../sleuthkit/autopsy/corelibs/Bundle_ja.properties | 0 .../org/sleuthkit/autopsy/corelibs/SigarLoader.java | 5 +++-- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle_ja.properties diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 102da52f87..9fbf15e50c 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -5,7 +5,16 @@ org.sleuthkit.autopsy.corelibs - + + + org.openide.util + + + + 8.25.1 + + + unit diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties index 7290d81803..c38a3ae87a 100644 --- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties +++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties @@ -4,3 +4,4 @@ OpenIDE-Module-Long-Description=\ The libraries can also be imported by other modules. OpenIDE-Module-Name=Autopsy-CoreLibs OpenIDE-Module-Short-Description=Autopsy Core module external libraries +SigarLoader.linkErr.msg=Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable. diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle_ja.properties b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle_ja.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java index f0f0859478..8c2878bf16 100644 --- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java +++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java @@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.corelibs; import com.sun.javafx.PlatformUtil; import org.hyperic.sigar.Sigar; +import org.openide.util.NbBundle; /** * Wrapper over Sigar instrumentation class to facilitate dll loading. Our setup @@ -51,10 +52,10 @@ public class SigarLoader { sigar.enableLogging(false); //forces a test } catch (UnsatisfiedLinkError ex) { - String msg = "Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable. "; + String msg = NbBundle.getMessage(SigarLoader.class, "SigarLoader.linkErr.msg"); System.out.println(msg + ex.toString()); } catch (Exception ex) { - String msg = "Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable. "; + String msg = NbBundle.getMessage(SigarLoader.class, "SigarLoader.linkErr.msg"); System.out.println(msg + ex.toString()); } }