Integrate BundleHelper with SystemHelper

trixon · Apr 9, 2017 · ea11a0f · ea11a0f
1 parent d6d9c48
commit ea11a0f
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 38 deletions.
diff --git a/src/main/java/se/trixon/jota/client/Client.java b/src/main/java/se/trixon/jota/client/Client.java
@@ -37,7 +37,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import se.trixon.almond.util.AlmondUI;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Xlog;
@@ -60,7 +60,7 @@
  */
 public final class Client extends UnicastRemoteObject implements ClientCallbacks {
 
-    private final ResourceBundle mBundle = BundleHelper.getBundle(Jota.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(Jota.class, "Bundle");
     private VMID mClientVmid;
     private Job mCurrentJob;
     private boolean mExitOnException;

diff --git a/src/main/java/se/trixon/jota/client/Main.java b/src/main/java/se/trixon/jota/client/Main.java
@@ -24,7 +24,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.PomInfo;
 import se.trixon.almond.util.SystemHelper;
@@ -37,7 +37,7 @@
  */
 public class Main {
 
-    private static final ResourceBundle sBundle = BundleHelper.getBundle(Jota.class, "Bundle");
+    private static final ResourceBundle sBundle = SystemHelper.getBundle(Jota.class, "Bundle");
 
     static final String OPT_CLIENT_PORT = "client-port";
     static final String OPT_CRON = "cron";

diff --git a/src/main/java/se/trixon/jota/client/ui/MainFrame.java b/src/main/java/se/trixon/jota/client/ui/MainFrame.java
@@ -54,7 +54,7 @@
 import se.trixon.almond.util.AlmondOptions;
 import se.trixon.almond.util.AlmondOptionsPanel;
 import se.trixon.almond.util.AlmondUI;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.PomInfo;
 import se.trixon.almond.util.SystemHelper;
@@ -90,7 +90,7 @@ public class MainFrame extends JFrame implements ConnectionListener, ServerEvent
     private boolean mServerShutdownRequested;
     private final ClientOptions mOptions = ClientOptions.INSTANCE;
     private final Client mClient;
-    private final ResourceBundle mBundle = BundleHelper.getBundle(MainFrame.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(MainFrame.class, "Bundle");
     private final LinkedList<AlmondAction> mServerActions = new LinkedList<>();
     private final LinkedList<AlmondAction> mAllActions = new LinkedList<>();
     private final Manager mManager = Manager.getInstance();
@@ -691,7 +691,7 @@ public void actionPerformed(ActionEvent e) {
             //about
             keyStroke = null;
             PomInfo pomInfo = new PomInfo(MainFrame.class, "se.trixon", "jotasync");
-            AboutModel aboutModel = new AboutModel(BundleHelper.getBundle(MainFrame.class, "about"), SystemHelper.getResourceAsImageIcon(MainFrame.class, "sync-256px.png"));
+            AboutModel aboutModel = new AboutModel(SystemHelper.getBundle(MainFrame.class, "about"), SystemHelper.getResourceAsImageIcon(MainFrame.class, "sync-256px.png"));
             aboutModel.setAppVersion(pomInfo.getVersion());
             AboutPanel aboutPanel = new AboutPanel(aboutModel);
             action = AboutPanel.getAction(MainFrame.this, aboutPanel);

diff --git a/src/main/java/se/trixon/jota/client/ui/OptionsPanel.java b/src/main/java/se/trixon/jota/client/ui/OptionsPanel.java
@@ -21,7 +21,7 @@
 import java.util.logging.Logger;
 import javax.swing.JFileChooser;
 import javax.swing.JSpinner;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.jota.client.ClientOptions;
 import se.trixon.jota.client.Manager;
@@ -36,7 +36,7 @@ public class OptionsPanel extends javax.swing.JPanel {
     private final Manager mManager = Manager.getInstance();
     private final ServerCommander mServerCommander;
     private final ClientOptions mOptions = ClientOptions.INSTANCE;
-    private final ResourceBundle mBundle = BundleHelper.getBundle(MainFrame.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(MainFrame.class, "Bundle");
 
     /**
      * Creates new form OptionsPanel

diff --git a/src/main/java/se/trixon/jota/client/ui/SpeedDialPanel.java b/src/main/java/se/trixon/jota/client/ui/SpeedDialPanel.java
@@ -38,7 +38,7 @@
 import javax.swing.UnsupportedLookAndFeelException;
 import se.trixon.almond.util.AlmondOptions;
 import se.trixon.almond.util.AlmondUI;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.icons.material.MaterialIcon;
 import se.trixon.almond.util.swing.SwingHelper;
@@ -68,7 +68,7 @@ public final class SpeedDialPanel extends JPanel implements ConnectionListener,
     private final HashSet<SpeedDialListener> mSpeedDialListeners = new HashSet<>();
     private final ClientOptions mOptions = ClientOptions.INSTANCE;
     private final Manager mManager = Manager.getInstance();
-    private final ResourceBundle mBundle = BundleHelper.getBundle(MainFrame.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(MainFrame.class, "Bundle");
     private final AlmondOptions mAlmondOptions = AlmondOptions.getInstance();
 
     /**

diff --git a/src/main/java/se/trixon/jota/client/ui/editor/JobsPanel.java b/src/main/java/se/trixon/jota/client/ui/editor/JobsPanel.java
@@ -31,7 +31,7 @@
 import org.apache.commons.lang3.SerializationUtils;
 import se.trixon.jota.client.Manager;
 import se.trixon.jota.shared.job.Job;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.swing.SwingHelper;
 import se.trixon.almond.util.swing.dialogs.Message;
@@ -42,7 +42,7 @@
  */
 public final class JobsPanel extends EditPanel {
 
-    private final ResourceBundle mBundle = BundleHelper.getBundle(JobsPanel.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(JobsPanel.class, "Bundle");
     private final HashSet<JobsListener> mJobsListeners = new HashSet<>();
     private final Manager mManager = Manager.getInstance();
 

diff --git a/src/main/java/se/trixon/jota/client/ui/editor/TasksPanel.java b/src/main/java/se/trixon/jota/client/ui/editor/TasksPanel.java
@@ -29,7 +29,7 @@
 import org.apache.commons.lang3.SerializationUtils;
 import se.trixon.jota.client.Manager;
 import se.trixon.jota.shared.task.Task;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.swing.SwingHelper;
 import se.trixon.almond.util.swing.dialogs.Message;
@@ -40,7 +40,7 @@
  */
 public class TasksPanel extends EditPanel {
 
-    private final ResourceBundle mBundle = BundleHelper.getBundle(TasksPanel.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(TasksPanel.class, "Bundle");
     private final Manager mManager = Manager.getInstance();
     private final HashSet<TasksListener> mTaskListeners = new HashSet<>();
 

diff --git a/src/main/java/se/trixon/jota/client/ui/editor/module/job/CronEditorPanel.java b/src/main/java/se/trixon/jota/client/ui/editor/module/job/CronEditorPanel.java
@@ -23,7 +23,7 @@
 import javax.swing.ListSelectionModel;
 import org.apache.commons.lang3.StringUtils;
 import se.trixon.jota.client.ui.editor.EditPanel;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.swing.SwingHelper;
 import se.trixon.almond.util.swing.dialogs.Message;
@@ -36,7 +36,7 @@
 public class CronEditorPanel extends EditPanel {
 
     private static final String CRON_ITEM_SEPARATOR = "|";
-    private final ResourceBundle mBundle = BundleHelper.getBundle(CronEditorPanel.class, "Bundle");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(CronEditorPanel.class, "Bundle");
 
     /**
      * Creates new form CronPanel

diff --git a/src/main/java/se/trixon/jota/client/ui/editor/module/task/ExcludeOption.java b/src/main/java/se/trixon/jota/client/ui/editor/module/task/ExcludeOption.java
@@ -17,7 +17,7 @@
 
 import java.util.ResourceBundle;
 import org.apache.commons.lang3.SystemUtils;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import static se.trixon.jota.shared.task.TaskSection.OPT_SEPARATOR;
 
 /**
@@ -36,7 +36,7 @@ public enum ExcludeOption implements OptionHandler {
     GVFS("--exclude=**/.gvfs/", SystemUtils.IS_OS_LINUX);
     private final boolean mActive;
     private final String mArg;
-    private final ResourceBundle mBundle = BundleHelper.getBundle(ExcludeOption.class, "ExcludeOption");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(ExcludeOption.class, "ExcludeOption");
     private final String mTitle;
 
     private ExcludeOption(String arg, boolean active) {

diff --git a/src/main/java/se/trixon/jota/client/ui/editor/module/task/RsyncOption.java b/src/main/java/se/trixon/jota/client/ui/editor/module/task/RsyncOption.java
@@ -17,7 +17,7 @@
 
 import java.util.ResourceBundle;
 import org.apache.commons.lang3.StringUtils;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 
 /**
  *
@@ -143,7 +143,7 @@ public enum RsyncOption implements OptionHandler {
     WRITE_BATCH(null, "write-batch=FILE"),
     _8_BIT_OUTPUT("8", "8-bit-output");
 
-    private final ResourceBundle mBundle = BundleHelper.getBundle(RsyncOption.class, "RsyncOption");
+    private final ResourceBundle mBundle = SystemHelper.getBundle(RsyncOption.class, "RsyncOption");
     private final String mLongArg;
     private final String mShortArg;
     private final String mTitle;

diff --git a/src/main/java/se/trixon/jota/server/JobExecutor.java b/src/main/java/se/trixon/jota/server/JobExecutor.java
@@ -28,7 +28,7 @@
 import java.util.logging.Logger;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Xlog;
@@ -70,8 +70,8 @@ class JobExecutor extends Thread {
         mErrBuffer = new StringBuffer();
         mOutBuffer = new StringBuffer();
 
-        mJobExecBundle = BundleHelper.getBundle(JobExecutePanel.class, "Bundle");
-        mTaskExecBundle = BundleHelper.getBundle(TaskExecutePanel.class, "Bundle");
+        mJobExecBundle = SystemHelper.getBundle(JobExecutePanel.class, "Bundle");
+        mTaskExecBundle = SystemHelper.getBundle(TaskExecutePanel.class, "Bundle");
     }
 
     @Override
@@ -165,7 +165,7 @@ public void stopJob() {
     }
 
     private String getRsyncErrorCode(int exitValue) {
-        ResourceBundle bundle = BundleHelper.getBundle(getClass(), "ExitValues");
+        ResourceBundle bundle = SystemHelper.getBundle(getClass(), "ExitValues");
         String key = String.valueOf(exitValue);
 
         return bundle.containsKey(key) ? bundle.getString(key) : String.format((Dict.SYSTEM_CODE.toString()), key);

diff --git a/src/main/java/se/trixon/jota/server/JobValidator.java b/src/main/java/se/trixon/jota/server/JobValidator.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ResourceBundle;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.jota.client.ui.editor.module.job.JobExecutePanel;
 import se.trixon.jota.shared.job.Job;
@@ -73,7 +73,7 @@ private void addSummary(String header, String message) {
     }
 
     private void validateExecutor(boolean active, String command, String key) {
-        ResourceBundle bundle = BundleHelper.getBundle(JobExecutePanel.class, "Bundle");
+        ResourceBundle bundle = SystemHelper.getBundle(JobExecutePanel.class, "Bundle");
         File file = new File(command);
         if (active && !file.exists()) {
             mInvalid = true;

diff --git a/src/main/java/se/trixon/jota/server/Main.java b/src/main/java/se/trixon/jota/server/Main.java
@@ -25,7 +25,7 @@
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.almond.util.PomInfo;
 import se.trixon.almond.util.SystemHelper;
@@ -38,7 +38,7 @@
  */
 public class Main {
 
-    private static final ResourceBundle sBundle = BundleHelper.getBundle(Jota.class, "Bundle");
+    private static final ResourceBundle sBundle = SystemHelper.getBundle(Jota.class, "Bundle");
 
     /**
      * @param args the command line arguments

diff --git a/src/main/java/se/trixon/jota/shared/Jota.java b/src/main/java/se/trixon/jota/shared/Jota.java
@@ -18,7 +18,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ResourceBundle;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 
 /**
  *
@@ -29,7 +29,7 @@ public class Jota {
     public static final int DEFAULT_PORT_CLIENT = 1199;
     public static final int DEFAULT_PORT_HOST = 1099;
     public static final String TASK_SEPARATOR = ",";
-    private static final ResourceBundle sBundle = BundleHelper.getBundle(Jota.class, "Bundle");
+    private static final ResourceBundle sBundle = SystemHelper.getBundle(Jota.class, "Bundle");
 
     public static void exit() {
         exit(0);

diff --git a/src/main/java/se/trixon/jota/shared/job/Job.java b/src/main/java/se/trixon/jota/shared/job/Job.java
@@ -26,7 +26,7 @@
 import se.trixon.jota.client.ui.editor.module.job.JobExecutePanel;
 import se.trixon.jota.shared.Jota;
 import se.trixon.jota.shared.task.Task;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 
 /**
@@ -174,7 +174,7 @@ public String getName() {
     public String getSummaryAsHtml() {
         mSummaryBuilder = new StringBuilder("<html><body>");
         mSummaryBuilder.append("<h1>").append(getName()).append("</h1>");
-        ResourceBundle bundle = BundleHelper.getBundle(JobExecutePanel.class, "Bundle");
+        ResourceBundle bundle = SystemHelper.getBundle(JobExecutePanel.class, "Bundle");
 
         addOptionalToSummary(mExecuteSection.isBefore(), mExecuteSection.getBeforeCommand(), bundle.getString("JobPanel.beforePanel.header"));
         if (mExecuteSection.isBefore() && mExecuteSection.isBeforeHaltOnError()) {

diff --git a/src/main/java/se/trixon/jota/shared/task/Task.java b/src/main/java/se/trixon/jota/shared/task/Task.java
@@ -22,7 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import se.trixon.jota.client.ui.editor.module.task.TaskExecutePanel;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 
 /**
@@ -143,7 +143,7 @@ public String getSummaryAsHtml() {
         addOptionalToSummary(true, getSource(), Dict.SOURCE.toString());
         addOptionalToSummary(true, getDestination(), Dict.DESTINATION.toString());
 
-        ResourceBundle bundle = BundleHelper.getBundle(TaskExecutePanel.class, "Bundle");
+        ResourceBundle bundle = SystemHelper.getBundle(TaskExecutePanel.class, "Bundle");
 
         addOptionalToSummary(mExecuteSection.isBefore(), mExecuteSection.getBeforeCommand(), bundle.getString("TaskExecutePanel.beforePanel.header"));
         if (mExecuteSection.isBefore() && mExecuteSection.isBeforeHaltOnError()) {

diff --git a/src/main/java/se/trixon/jota/shared/task/TaskValidator.java b/src/main/java/se/trixon/jota/shared/task/TaskValidator.java
@@ -18,7 +18,7 @@
 import java.io.File;
 import java.io.Serializable;
 import java.util.ResourceBundle;
-import se.trixon.almond.util.BundleHelper;
+import se.trixon.almond.util.SystemHelper;
 import se.trixon.almond.util.Dict;
 import se.trixon.jota.client.ui.editor.module.task.TaskExcludePanel;
 import se.trixon.jota.client.ui.editor.module.task.TaskExecutePanel;
@@ -76,14 +76,14 @@ private void validateDirs() {
 
     private void validateExclusion() {
         ExcludeSection excludeSection = mTask.getExcludeSection();
-        ResourceBundle bundle = BundleHelper.getBundle(TaskExcludePanel.class, "Bundle");
+        ResourceBundle bundle = SystemHelper.getBundle(TaskExcludePanel.class, "Bundle");
 
         validateFile(excludeSection.isManualFileUsed(), excludeSection.getManualFilePath(), bundle.getString("TaskExcludePanel.externalFilePanel.header"));
     }
 
     private void validateExecutors() {
         TaskExecuteSection executeSection = mTask.getExecuteSection();
-        ResourceBundle bundle = BundleHelper.getBundle(TaskExecutePanel.class, "Bundle");
+        ResourceBundle bundle = SystemHelper.getBundle(TaskExecutePanel.class, "Bundle");
 
         validateFile(executeSection.isBefore(), executeSection.getBeforeCommand(), bundle.getString("TaskExecutePanel.beforePanel.header"));
         validateFile(executeSection.isAfterFailure(), executeSection.getAfterFailureCommand(), bundle.getString("TaskExecutePanel.afterFailurePanel.header"));