Some typos and javadoc.

2 files changed, 14 insertions, 7 deletions

diff --git a/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java b/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
index ce019b2..ade8dff 100644
--- a/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/loggingutils/LoggingConfigForm.java
@@ -246,7 +246,7 @@ public class LoggingConfigForm
      * from default settings.
      * @return the upload location.
      */
-    private String getUploadLocation()
+    static String getUploadLocation()
     {
         // check first in configuration it can be manually set
         // or by provisioning
@@ -623,6 +623,8 @@ public class LoggingConfigForm
                         public void run()
                         {
                             uploadLogs(
+                                getUploadLocation(),
+                                LogsCollector.getDefaultFileName(),
                                 paramNames.toArray(new String[]{}),
                                 paramValues.toArray(new String[]{}));
                         }
@@ -649,15 +651,22 @@ public class LoggingConfigForm
 
     /**
      * Upload files to pre-configured url.
+     * @param uploadLocation the location we are uploading to.
+     * @param fileName the filename we use for the resulting filename we upload.
+     * @param params the optional parameter names.
+     * @param values the optional parameter values.
      */
-    private void uploadLogs(String[] params, String[] values)
+    static void uploadLogs(
+        String uploadLocation,
+        String fileName,
+        String[] params,
+        String[] values)
     {
         try
         {
             File tempDir = LoggingUtilsActivator.getFileAccessService()
                 .getTemporaryDirectory();
-            File newDest = new File(
-                    tempDir, LogsCollector.getDefaultFileName());
+            File newDest = new File(tempDir, fileName);
 
             File optionalFile = null;
 
@@ -685,8 +694,6 @@ public class LoggingConfigForm
             if(optionalFile != null)
                 optionalFile.delete();
 
-            String uploadLocation = getUploadLocation();
-
             if(uploadLocation == null)
                 return;
 
diff --git a/src/net/java/sip/communicator/plugin/loggingutils/LoggingUtilsActivator.java b/src/net/java/sip/communicator/plugin/loggingutils/LoggingUtilsActivator.java
index f7e0ef5..d0a1449 100644
--- a/src/net/java/sip/communicator/plugin/loggingutils/LoggingUtilsActivator.java
+++ b/src/net/java/sip/communicator/plugin/loggingutils/LoggingUtilsActivator.java
@@ -34,7 +34,7 @@ public class LoggingUtilsActivator
     /**
      * The OSGI bundle context.
      */
-    private static BundleContext        bundleContext         = null;
+    static BundleContext        bundleContext         = null;
 
     /**
      * The resource service.